Skip to content

Commit 866441a

Browse files
PrinsINTPrinsINT
committed
Refactor
1 parent b3e7493 commit 866441a

137 files changed

Lines changed: 1525 additions & 2033 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎server/Dockerfile‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gradle:8.12.1-jdk21-alpine AS build
1+
FROM gradle:8.13.0-jdk23-alpine AS build
22
# Note: the gradle version must match the version in build.gradle.kts
33
COPY --chown=gradle:gradle . /home/gradle/src
44
WORKDIR /home/gradle/src
@@ -8,10 +8,7 @@ RUN echo "Contents of workdir:" && ls -l . \
88
&& rm build/libs/*-plain.jar \
99
&& echo "Contents of build/libs after removing plain jars:" && ls -l build/libs
1010

11-
FROM eclipse-temurin:23.0.1_11-jre-alpine
12-
13-
# FIX CVE-2023-52425
14-
RUN apk --no-cache add --upgrade expat
11+
FROM eclipse-temurin:23.0.2_7-jre-alpine-3.21
1512

1613
EXPOSE 8010:8080
1714
COPY --from=build /home/gradle/src/build/libs/*.jar galahad-server.jar

‎server/build.gradle.kts‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
plugins {
2-
kotlin("jvm") version "2.1.10"
3-
kotlin("plugin.spring") version "2.1.10"
4-
id("org.springframework.boot") version "3.4.2"
5-
id("io.spring.dependency-management") version "1.1.7"
2+
kotlin("jvm") version "2.1.10"
3+
kotlin("plugin.spring") version "2.1.10"
4+
id("org.springframework.boot") version "3.4.2"
5+
id("io.spring.dependency-management") version "1.1.7"
66
}
77

88
group = "org.ivdnt"
99

1010
java {
11-
toolchain {
12-
languageVersion = JavaLanguageVersion.of(21)
13-
}
11+
toolchain {
12+
languageVersion = JavaLanguageVersion.of(23)
13+
}
1414
}
1515

1616
repositories {
17-
mavenCentral()
18-
gradlePluginPortal()
17+
mavenCentral()
18+
gradlePluginPortal()
1919
}
2020

2121
dependencies {
22-
// Spring
23-
// Versions controlled by Spring Boot plygin
24-
implementation("org.springframework.boot:spring-boot-starter-web")
25-
implementation("org.springframework.boot:spring-boot-devtools")
26-
testImplementation("org.springframework.boot:spring-boot-starter-test")
22+
// Spring
23+
// Versions controlled by Spring Boot plygin
24+
implementation("org.springframework.boot:spring-boot-starter-web")
25+
implementation("org.springframework.boot:spring-boot-devtools")
26+
testImplementation("org.springframework.boot:spring-boot-starter-test")
2727

28-
// kotlin
29-
// Versions controlled by Kotlin jvm plugin
30-
implementation("org.jetbrains.kotlin:kotlin-reflect")
31-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
28+
// kotlin
29+
// Versions controlled by Kotlin jvm plugin
30+
implementation("org.jetbrains.kotlin:kotlin-reflect")
31+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
3232

33-
// swagger
34-
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5")
33+
// swagger
34+
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5")
3535

36-
// logging
37-
implementation("org.apache.logging.log4j:log4j-api-kotlin:1.5.0")
36+
// logging
37+
implementation("org.apache.logging.log4j:log4j-api-kotlin:1.5.0")
3838

39-
// yaml
40-
implementation("org.yaml:snakeyaml:2.4")
39+
// yaml
40+
implementation("org.yaml:snakeyaml:2.4")
4141

42-
// json
43-
implementation("com.beust:klaxon:5.6")
42+
// json
43+
implementation("com.beust:klaxon:5.6")
4444

45-
// cache
46-
implementation("com.github.ben-manes.caffeine:caffeine:3.2.0")
45+
// cache
46+
implementation("com.github.ben-manes.caffeine:caffeine:3.2.0")
4747
}
4848

4949
tasks.withType<Test> {
50-
environment(mapOf("profile" to "dev"))
51-
useJUnitPlatform()
50+
environment(mapOf("profile" to "dev"))
51+
useJUnitPlatform()
5252
}

‎server/data/taggers/flair.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ description: "flair"
33
tagset: "Universal Dependencies"
44
eraFrom: "2000"
55
eraTo: "2020"
6-
produces:
6+
annotations:
77
- upos
8-
- named-entity
8+
- ner
99
model:
1010
name: ner-dutch-large
1111
href: https://huggingface.co/flair/ner-dutch-large

‎server/data/taggers/hug-tdn-1400-1600.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "INT-Hug trained on DBNL excerpts, GTB dictionary quotations & CLVN
33
tagset: "TDN-Core"
44
eraFrom: "1400"
55
eraTo: "1600"
6-
produces:
6+
annotations:
77
- lemma
88
- pos
99
model:

‎server/data/taggers/hug-tdn-1600-1900.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "INT-Hug trained on DBNL excerpts, GTB dictionary quotations, newsp
33
tagset: "TDN-Core"
44
eraFrom: "1600"
55
eraTo: "1900"
6-
produces:
6+
annotations:
77
- lemma
88
- pos
99
model:

‎server/data/taggers/hug-tdn-all-enhanced.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "INT-Hug trained on all TDN-Core material with enhancements for sep
33
tagset: "TDN-Core"
44
eraFrom: "1400"
55
eraTo: "1900"
6-
produces:
6+
annotations:
77
- lemma
88
- pos
99
model:

‎server/data/taggers/hug-tdn-all.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "INT-Hug trained on all TDN-Core material"
33
tagset: "TDN-Core"
44
eraFrom: "1400"
55
eraTo: "1900"
6-
produces:
6+
annotations:
77
- lemma
88
- pos
99
model:

‎server/data/taggers/hug-tdn-bab.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "INT-Hug trained on letters as loot (Brieven als Buit)"
33
tagset: "TDN-Core"
44
eraFrom: "1600"
55
eraTo: "1800"
6-
produces:
6+
annotations:
77
- lemma
88
- pos
99
model:

‎server/data/taggers/hug-tdn-clvn.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "INT-Hug trained on CLVN"
33
tagset: "TDN-Core"
44
eraFrom: "1500"
55
eraTo: "1600"
6-
produces:
6+
annotations:
77
- lemma
88
- pos
99
model:

‎server/data/taggers/hug-tdn-cour.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "INT-Hug trained on newspapers"
33
tagset: "TDN-Core"
44
eraFrom: "1600"
55
eraTo: "1700"
6-
produces:
6+
annotations:
77
- lemma
88
- pos
99
model:

0 commit comments

Comments
 (0)
⚡