From 0a1daf7823ef33d978fe0eb813fb5cb338d11dae Mon Sep 17 00:00:00 2001 From: Thomas Krause Date: Fri, 17 Apr 2026 16:58:23 +0200 Subject: [PATCH 1/8] Update to next larger spring patch version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 10c17d138b..8b9da7bb27 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.12 + 2.5.15 From a0e25e925c00c8f7c9567d30a3193a56ca9c6060 Mon Sep 17 00:00:00 2001 From: Thomas Krause Date: Sat, 18 Apr 2026 12:53:07 +0200 Subject: [PATCH 2/8] Update to Spring Boot 2.6.15 which still uses H2 v1 as dependency --- pom.xml | 9 ++++++--- .../java/org/corpus_tools/annis/gui/AnnisBaseUI.java | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8b9da7bb27..e447b1c58e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.15 + 2.6.15 @@ -44,7 +44,6 @@ server 1.5.24 1.8.4 - 1.6.0 3.17.0 @@ -563,7 +562,6 @@ org.jetbrains.kotlin kotlin-stdlib - ${kotlin.version} test @@ -607,6 +605,11 @@ com.fasterxml.jackson.dataformat jackson-dataformat-toml + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + org.apache.commons diff --git a/src/main/java/org/corpus_tools/annis/gui/AnnisBaseUI.java b/src/main/java/org/corpus_tools/annis/gui/AnnisBaseUI.java index 22738ea0f6..622f35247b 100644 --- a/src/main/java/org/corpus_tools/annis/gui/AnnisBaseUI.java +++ b/src/main/java/org/corpus_tools/annis/gui/AnnisBaseUI.java @@ -172,7 +172,8 @@ protected Map loadInstanceConfig() { TreeMap result = new TreeMap<>(); JsonMapper mapper = new JsonMapper(); - mapper.registerModule(new JaxbAnnotationModule()); + JaxbAnnotationModule module = new JaxbAnnotationModule(); + mapper.registerModule(module); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); // get a list of all directories that contain instance informations From 9b610db0181cca185eb8201d2d906d7f44cbaa25 Mon Sep 17 00:00:00 2001 From: Thomas Krause Date: Sat, 18 Apr 2026 15:05:59 +0200 Subject: [PATCH 3/8] Update to OpenApi 5.4.0 and Spring Boot 2.7.18 Explicitly set the h2 dependency to 1.4.200 to stay compatible with the frontend database --- CHANGELOG.md | 4 ++++ pom.xml | 13 ++++++++++--- .../gui/requesthandler/BinaryRequestHandler.java | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba9f67cc62..7d2feb9563 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ ANNIS is a frontend to the graphANNIS webservice, which has its [own changelog]( - Update to graphANNIS 4.1.3 which includes a bugfix for including token in subgraph even if the token is not covered by a segmentation node +### Changed + +- Update some of the dependencies of the project: Spring Boot to 2.7.x and OpenApi to 5.4.x. + ## [4.15.1] - 2025-10-10 ### Fixed diff --git a/pom.xml b/pom.xml index e447b1c58e..68e77721c3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.15 + 2.7.18 @@ -45,6 +45,7 @@ 1.5.24 1.8.4 3.17.0 + 1.4.200 @@ -314,7 +315,7 @@ org.openapitools openapi-generator-maven-plugin - 5.0.1 + 5.4.0 @@ -562,7 +563,6 @@ org.jetbrains.kotlin kotlin-stdlib - test @@ -610,6 +610,13 @@ com.fasterxml.jackson.module jackson-module-jaxb-annotations + + + org.openapitools + jackson-databind-nullable + 0.2.10 + compile + org.apache.commons diff --git a/src/main/java/org/corpus_tools/annis/gui/requesthandler/BinaryRequestHandler.java b/src/main/java/org/corpus_tools/annis/gui/requesthandler/BinaryRequestHandler.java index ce9f7062e5..a45e403f6a 100644 --- a/src/main/java/org/corpus_tools/annis/gui/requesthandler/BinaryRequestHandler.java +++ b/src/main/java/org/corpus_tools/annis/gui/requesthandler/BinaryRequestHandler.java @@ -132,7 +132,7 @@ public void sendResponse(VaadinSession session, VaadinRequest request, // Execute the call and return the response Call call; try { - call = client.buildCall(localVarPath, "GET", localVarQueryParams, + call = client.buildCall(null, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, null); From 03071e952062334142828400cea72707b47a299a Mon Sep 17 00:00:00 2001 From: Thomas Krause Date: Sat, 18 Apr 2026 15:09:21 +0200 Subject: [PATCH 4/8] Updating graphANNIS CLI to download --- misc/download-annis-cli.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/download-annis-cli.sh b/misc/download-annis-cli.sh index ef2ea1cdb2..adf4f83d8e 100755 --- a/misc/download-annis-cli.sh +++ b/misc/download-annis-cli.sh @@ -1,6 +1,6 @@ #!/bin/bash -GRAPHANNIS_VERSION=${1:-3.5.1} +GRAPHANNIS_VERSION=${1:-4.1.3} install_graphannis_cli=false From 421ac0524f23f648510b49bb34395f0996e3f537 Mon Sep 17 00:00:00 2001 From: Thomas Krause Date: Sat, 18 Apr 2026 15:13:31 +0200 Subject: [PATCH 5/8] Update Apache Tika version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68e77721c3..8802ef81c8 100644 --- a/pom.xml +++ b/pom.xml @@ -592,7 +592,7 @@ org.apache.tika tika-core - 2.7.0 + [3.2.2,) From 466d9701ba850510c657684be50cf6d2e7b7594f Mon Sep 17 00:00:00 2001 From: Thomas Krause Date: Sat, 18 Apr 2026 16:34:03 +0200 Subject: [PATCH 6/8] Use updated graphANNIS 4.1.4 which fixes an issue in the import --- CHANGELOG.md | 2 +- misc/download-annis-cli.sh | 2 +- pom.xml | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d2feb9563..94ef40b2cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ ANNIS is a frontend to the graphANNIS webservice, which has its [own changelog]( ### Fixed -- Update to graphANNIS 4.1.3 which includes a bugfix for including token in subgraph even if the +- Update to graphANNIS 4.1.4 which includes a bugfix for including token in subgraph even if the token is not covered by a segmentation node ### Changed diff --git a/misc/download-annis-cli.sh b/misc/download-annis-cli.sh index adf4f83d8e..18d110b74c 100755 --- a/misc/download-annis-cli.sh +++ b/misc/download-annis-cli.sh @@ -1,6 +1,6 @@ #!/bin/bash -GRAPHANNIS_VERSION=${1:-4.1.3} +GRAPHANNIS_VERSION=${1:-4.1.4} install_graphannis_cli=false diff --git a/pom.xml b/pom.xml index 8802ef81c8..8c87db9803 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.14.3 true org.corpus_tools.annis.gui.AnnisUiApplication - 4.1.3 + 4.1.4 4.7.2 server 1.5.24 @@ -261,7 +261,7 @@ https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-unknown-linux-gnu.tar.xz ${project.build.directory}/native/ - b64c63cf721ed40c9e59dd7cba464f9ede588a2d3ae544b889e67228b6e9c7a7 + 0ffa61fe683359faa1f5f6f7cf62f4cd05bcf5ea9d20509064c234410f5fd186 true @@ -276,7 +276,7 @@ https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-pc-windows-msvc.zip ${project.build.directory}/native/win32-x86-64/ - 3c3a259999e6b988836ee42f301364fcc4b9da995eeb4e0bab29b05523e3cb81 + 9b4a6f425c1096de405fd6de7e35447e7b7bb09f0341640495c53c1ebaa205b4 true @@ -291,7 +291,7 @@ https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-aarch64-apple-darwin.tar.xz ${project.build.directory}/native/ - 0595e02f2446315564a22982803cf05dbd6ebe4f055c6ebf0f7674e952dfd97f + 6e22c6faecd323aa153a41e30e27cf0733aabd4fde88c969e361cbd83fd1255f true @@ -306,7 +306,7 @@ https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-apple-darwin.tar.xz ${project.build.directory}/native/ - 92adb2cd4e548a4316f8c6960073a5b931aa2bcf913f1e493a511195f54a90b7 + 1401f9ee98620e3756d4b30c9730d33c50f5b6965074f59e94ef73dd2f901b7f true From ccc1cfe5d852a45015b0fc8116d5af625f928f62 Mon Sep 17 00:00:00 2001 From: Thomas Krause Date: Sat, 18 Apr 2026 16:44:39 +0200 Subject: [PATCH 7/8] Drop support for Java 8, new lowest version is 11. --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/test.yml | 26 -------------------------- CHANGELOG.md | 8 +++++--- pom.xml | 2 +- 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3eb5afb9cc..9eb56f4f3e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,8 +10,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Set JAVA_HOME to included JDK 8 - run: echo JAVA_HOME=$JAVA_HOME_8_X64 >> $GITHUB_ENV + - name: Set JAVA_HOME to included JDK 11 + run: echo JAVA_HOME=$JAVA_HOME_11_X64 >> $GITHUB_ENV - run: misc/download-annis-cli.sh env: OS_NAME: linux diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 22cac13865..6d4832825c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,32 +6,6 @@ on: branches: [main] jobs: - test_jdk8: - name: Execute all automated tests JDK 8 - runs-on: ubuntu-24.04 - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Cache local Maven repository - uses: actions/cache@v4 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-8-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven-8- - - name: Cache test corpora - uses: actions/cache@v4 - with: - path: "*.zip" - key: ${{ runner.os }}-corpora-${{ hashFiles('misc/import-test-corpora.sh') }} - - name: Set JAVA_HOME to included JDK 8 - run: echo JAVA_HOME=$JAVA_HOME_8_X64 >> $GITHUB_ENV - - run: misc/download-annis-cli.sh - env: - OS_NAME: linux - - run: misc/import-test-corpora.sh - - name: Run Maven install (includes tests) - run: mvn install test_jdk11: name: Execute all automated tests on JDK 11 runs-on: ubuntu-24.04 diff --git a/CHANGELOG.md b/CHANGELOG.md index 94ef40b2cd..88857f23f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,16 @@ ANNIS is a frontend to the graphANNIS webservice, which has its [own changelog]( ## [Unreleased] +### Changed + +- 💥 Drop support for Java 8 (**breaking change**). The lowest support Java version is now 11. +- Update some of the dependencies of the project: Spring Boot to 2.7.x and OpenApi to 5.4.x. + ### Fixed - Update to graphANNIS 4.1.4 which includes a bugfix for including token in subgraph even if the token is not covered by a segmentation node -### Changed - -- Update some of the dependencies of the project: Spring Boot to 2.7.x and OpenApi to 5.4.x. ## [4.15.1] - 2025-10-10 diff --git a/pom.xml b/pom.xml index 8c87db9803..0eb6411ddd 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ UTF-8 - 1.8 + 11 8.14.3 true org.corpus_tools.annis.gui.AnnisUiApplication From 88dd20cea46c8c6f69b054a95371948bcffe8bbf Mon Sep 17 00:00:00 2001 From: Thomas Krause Date: Sat, 18 Apr 2026 16:50:12 +0200 Subject: [PATCH 8/8] Clarify that the documentation already says we need Java 11 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88857f23f5..daf4df333f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,9 @@ ANNIS is a frontend to the graphANNIS webservice, which has its [own changelog]( ### Changed -- 💥 Drop support for Java 8 (**breaking change**). The lowest support Java version is now 11. +- 💥 Drop support for Java 8 (**breaking change**). The lowest supported Java version is now 11. + The documentation and homepage stated to use Java 11 for a while now, so this hopefully should + have limited impact for the users. - Update some of the dependencies of the project: Spring Boot to 2.7.x and OpenApi to 5.4.x. ### Fixed