Skip to content

Upgrade to Java 11 and to Metafacture 7.0.0 #455 #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Phu2 merged 12 commits into from
Feb 23, 2026
Merged

Upgrade to Java 11 and to Metafacture 7.0.0 #455 #459

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
55ba569
Quick test to upgrade to Java 11 #455
TobiasNx Feb 18, 2026
d394406
Merge remote-tracking branch 'origin/master' into 455-updateJavaVersi…
TobiasNx Feb 18, 2026
6348e0e
Update scala and sbt #455
TobiasNx Feb 18, 2026
5d66c17
Update comment refering to weywots #455
TobiasNx Feb 18, 2026
ba7577c
Checkout changed test #455
TobiasNx Feb 19, 2026
65e2a63
Merge remote-tracking branch 'origin/master' into 455-updateJavaVersi…
TobiasNx Feb 19, 2026
dd62950
Update the metafacture version #455
TobiasNx Feb 19, 2026
b65cf07
Merge remote-tracking branch 'origin/improveReadme' into 455-updateJa…
TobiasNx Feb 19, 2026
205bbe8
Update JAVA_HOME to use Java 11 #455
TobiasNx Feb 20, 2026
43bbcd5
Add Java 11 as a prerequisite in README #455
TobiasNx Feb 20, 2026
c4f939d
Add -no-version-check flag
Phu2 Feb 23, 2026
00c1aeb
Remove internal comment
Phu2 Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v5
- name: Set up JDK 1.8
- name: Set up JDK 11
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 8
java-version: 11
- name: Install and start Elasticsearch
env:
ES_DOWNLOAD_URL: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${{ env.ES_VERSION }}.tar.gz
Expand Down
14 changes: 8 additions & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lazy val root = (project in file(".")).enablePlugins(PlayJava)
EclipseKeys.projectFlavor := EclipseProjectFlavor.Java
EclipseKeys.createSrc := EclipseCreateSrc.ValueSet(EclipseCreateSrc.ManagedClasses, EclipseCreateSrc.ManagedResources)

scalaVersion := "2.12.4"
scalaVersion := "2.12.12"

libraryDependencies += guice

Expand All @@ -20,15 +20,15 @@ libraryDependencies += "javax.mail" % "mail" % "1.4.1"

libraryDependencies += "org.apache.jena" % "apache-jena-libs" % "3.7.0"

libraryDependencies += "org.metafacture" % "metafacture-framework" % "5.4.0"
libraryDependencies += "org.metafacture" % "metafacture-framework" % "7.0.0"

libraryDependencies += "org.metafacture" % "metafacture-flowcontrol" % "5.4.0"
libraryDependencies += "org.metafacture" % "metafacture-flowcontrol" % "7.0.0"

libraryDependencies += "org.metafacture" % "metafacture-io" % "5.4.0"
libraryDependencies += "org.metafacture" % "metafacture-io" % "7.0.0"

libraryDependencies += "org.metafacture" % "metafacture-xml" % "5.4.0"
libraryDependencies += "org.metafacture" % "metafacture-xml" % "7.0.0"

libraryDependencies += "org.metafacture" % "metafacture-elasticsearch" % "5.4.0" exclude("com.fasterxml.jackson.core", "jackson-databind")
libraryDependencies += "org.metafacture" % "metafacture-elasticsearch" % "7.0.0" exclude("com.fasterxml.jackson.core", "jackson-databind")

libraryDependencies += "org.elasticsearch" % "elasticsearch" % "5.6.3"

Expand All @@ -46,6 +46,8 @@ libraryDependencies += "org.apache.logging.log4j" % "log4j-api" % "2.16.0"

libraryDependencies += "org.hamcrest" % "hamcrest-library" % "1.3" % Test

javacOptions ++= Seq("-source", "11", "-target", "11")

resolvers += Resolver.mavenLocal

trapExit := false
2 changes: 1 addition & 1 deletion conf/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ entityfacts {

index {
boot: {
hosts: ["localhost"] # ["weywot3.hbz-nrw.de", "weywot4.hbz-nrw.de", "weywot5.hbz-nrw.de"]
hosts: ["localhost"] # ["weywot13.hbz-nrw.de", "weywot14.hbz-nrw.de", "weywot15.hbz-nrw.de"]
Copy link
Contributor

@Phu2 Phu2 Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we add internal server adresses here? I don't think we should publish them.

Copy link
Contributor Author

@TobiasNx TobiasNx Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fsteeg could you help here?

Copy link
Member

@fsteeg fsteeg Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since these are commented out anyway, you could remove them here. The idea would be to have an internal Wiki page for the details, like we have for RPB.

cluster: "elasticsearch" # "weywot"
name: "gnd-boot" # "gnd"
}
Expand Down
4 changes: 3 additions & 1 deletion monit_restart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ case $ACTION in
if [ -f target/universal/stage/RUNNING_PID ]; then
kill $(cat target/universal/stage/RUNNING_PID)
fi
JAVA_OPTS="$JAVA_OPTS -XX:+ExitOnOutOfMemoryError" sbt --java-home $JAVA_HOME "start $PORT"
sbt clean
Copy link
Contributor Author

@TobiasNx TobiasNx Feb 20, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reintroduces sbt clean and sbt stage that @Phu2 dropped before: d7d693f

Copy link
Member

@fsteeg fsteeg Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like I said, both is fine here, lobid-gnd doesn't log to target.

sbt --java-home $JAVA_HOME stage
JAVA_OPTS="$JAVA_OPTS -XX:+ExitOnOutOfMemoryError" ./target/universal/stage/bin/lobid-gnd -Dhttp.port=$PORT
;;
stop)
if [ -f target/universal/stage/RUNNING_PID ]; then
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.16
sbt.version=0.13.18
2 changes: 1 addition & 1 deletion test/data/GND.jsonl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
{"index":{"_index":"gnd-test","_type":"authority","_id":"https://d-nb.info/gnd/1077774206"}}
{"geographicAreaCode":[{"id":"https://d-nb.info/standards/vocab/gnd/geographic-area-code#XD-US","label":"USA"}],"biographicalOrHistoricalInformation":["Faculty of Infectious and Tropical Diseases, London School of Hygiene and Tropic𘛌􀁏𘚣𘚾𘛐𘛏􀁌𘛎􀁌𘛓𘛐","Rollins School of Public Health, Emory University, Atlanta, Ga."],"gender":[{"id":"https://d-nb.info/standards/vocab/gnd/gender#male","label":"Männlich"}],"gndIdentifier":"1077774206","id":"https://d-nb.info/gnd/1077774206","preferredName":"Clasen, Thomas","type":["DifferentiatedPerson","Person","AuthorityResource"],"@context":"https://lobid.org/gnd/context.jsonld","preferredNameEntityForThePerson":{"forename":["Thomas"],"surname":["Clasen"]},"sameAs":[{"id":"http://viaf.org/viaf/182144782963056229916","collection":{"id":"http://www.wikidata.org/entity/Q54919","abbr":"VIAF","publisher":"OCLC","icon":"http://viaf.org/viaf/images/viaf.ico","name":"Virtual International Authority File (VIAF)"}}]}
{"index":{"_index":"gnd-test","_type":"authority","_id":"https://d-nb.info/gnd/1072719991"}}
{"gender":[{"id":"https://d-nb.info/standards/vocab/gnd/gender#notKnown","label":"Unbekannt"}],"variantNameEntityForThePerson":[{"forename":["良𩆩"],"surname":["趙"]},{"personalName":["Zhao Liang shu"]},{"personalName":["Zhao Liangshu"]}],"type":["AuthorityResource","DifferentiatedPerson","Person"],"@context":"https://lobid.org/gnd/context.jsonld","geographicAreaCode":[{"id":"https://d-nb.info/standards/vocab/gnd/geographic-area-code#XB-CN","label":"China"}],"biographicalOrHistoricalInformation":["Chines. Gelehrter der Qing-Dynastie, Jinshi-Grad 1795"],"periodOfActivity":["1795-"],"gndIdentifier":"1072719991","id":"https://d-nb.info/gnd/1072719991","preferredName":"Zhao, Liangshu","variantName":["Zhao Liang shu","趙, 良𩆩","Zhao Liangshu"],"preferredNameEntityForThePerson":{"forename":["Liangshu"],"surname":["Zhao"]},"sameAs":[{"id":"http://viaf.org/viaf/316502188","collection":{"id":"http://www.wikidata.org/entity/Q54919","abbr":"VIAF","publisher":"OCLC","icon":"http://viaf.org/viaf/images/viaf.ico","name":"Virtual International Authority File (VIAF)"}}]}
{"gender":[{"id":"https://d-nb.info/standards/vocab/gnd/gender#notKnown","label":"Unbekannt"}],"variantNameEntityForThePerson":[{"personalName":["Zhao Liang shu"]},{"forename":["良𩆩"],"surname":["趙"]},{"personalName":["Zhao Liangshu"]}],"type":["AuthorityResource","DifferentiatedPerson","Person"],"@context":"https://lobid.org/gnd/context.jsonld","geographicAreaCode":[{"id":"https://d-nb.info/standards/vocab/gnd/geographic-area-code#XB-CN","label":"China"}],"biographicalOrHistoricalInformation":["Chines. Gelehrter der Qing-Dynastie, Jinshi-Grad 1795"],"periodOfActivity":["1795-"],"gndIdentifier":"1072719991","id":"https://d-nb.info/gnd/1072719991","preferredName":"Zhao, Liangshu","variantName":["Zhao Liang shu","趙, 良𩆩","Zhao Liangshu"],"preferredNameEntityForThePerson":{"forename":["Liangshu"],"surname":["Zhao"]},"sameAs":[{"id":"http://viaf.org/viaf/316502188","collection":{"id":"http://www.wikidata.org/entity/Q54919","abbr":"VIAF","publisher":"OCLC","icon":"http://viaf.org/viaf/images/viaf.ico","name":"Virtual International Authority File (VIAF)"}}]}
{"index":{"_index":"gnd-test","_type":"authority","_id":null}}
{"@context":"https://lobid.org/gnd/context.jsonld"}