Update to Grobid 0.9.1 and simplify build.gradle

.github/dependabot.yml

@@ -0,0 +1,22 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: weekly

Dockerfile.software

@@ -52,7 +52,7 @@ RUN wget https://github.com/kermitt2/Pub2TEI/archive/refs/heads/master.zip && \
 # build runtime image
 # -------------------
 
-FROM lfoppiano/grobid:0.9.0-full AS runtime
+FROM lfoppiano/grobid:0.9.1-full AS runtime
 
 # setting locale is likely useless but to be sure
 ENV LANG C.UTF-8

build.gradle

@@ -22,7 +22,6 @@ plugins {
     id 'com.gradleup.shadow' version '8.3.10'
     id 'distribution'
     id 'application'
-    id "org.jetbrains.kotlin.jvm" version "2.0.21"
 }
 
 apply plugin: 'jacoco'
@@ -39,13 +38,11 @@ apply plugin: 'com.github.kt3k.coveralls'
 def getGitRevision() {
     def gitRevision = "unknown"
     try {
-        println("Checking git under ${rootProject.rootDir}")
         def result = providers.exec {
             workingDir = rootProject.rootDir
             commandLine 'git', 'describe', '--tags', '--always', '--first-parent'
         }
         gitRevision = result.standardOutput.asText.get().trim()
-        println "Current Git revision: ${gitRevision}"
     } catch (Exception e) {
         println "Could not get Git revision: ${e}"
     }
@@ -54,7 +51,6 @@ def getGitRevision() {
 
 project.ext.gitRevision = getGitRevision()
 
-// Create a task to expose the revision for other tasks
 tasks.register('collectGitRevision') {
     project.ext.gitRevision = getGitRevision()
     doLast {
@@ -118,8 +114,8 @@ dependencies {
     //compile group: 'org.dkpro.statistics', name: 'dkpro-statistics-agreement', version: '2.2.0-SNAPSHOT'
     implementation "me.tongfei:progressbar:0.9.0"
 
-    //Logging
-    implementation 'org.slf4j:slf4j-api:1.7.36'
+    //Logging (slf4j 2.0.x / logback 1.5.x move together with Dropwizard 5)
+    implementation 'org.slf4j:slf4j-api:2.0.17'
 
     //Apache commons
     implementation group: 'commons-pool', name: 'commons-pool', version: '1.6'
@@ -130,16 +126,22 @@ dependencies {
     implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.5.0'
     implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.14.1'
 
-    //Dropwizard
-    implementation 'ru.vyarus:dropwizard-guicey:7.3.1'
-
-    implementation 'io.dropwizard:dropwizard-bom:4.0.17'
-    implementation 'io.dropwizard:dropwizard-core:4.0.17'
-    implementation 'io.dropwizard:dropwizard-assets:4.0.17'
-    implementation 'io.dropwizard:dropwizard-testing:4.0.17'
-    implementation 'io.dropwizard:dropwizard-forms:4.0.17'
-    implementation 'io.dropwizard:dropwizard-client:4.0.17'
-    implementation 'io.dropwizard:dropwizard-auth:4.0.17'
+    //Dropwizard 5.x (Jakarta EE 10 / Jetty 12) to match Grobid 0.9.1. guicey 8.x is the
+    // Dropwizard-5-compatible line. Jetty 12 removed the org.eclipse.jetty.servlets
+    // CrossOriginFilter/QoSFilter; the service now uses CrossOriginHandler/QoSHandler.
+    implementation 'ru.vyarus:dropwizard-guicey:8.0.2'
+
+    // Dropwizard 5.0.1 ships Jetty 12.1.5; force the Jetty BOMs to 12.1.9 (CVE-2026-2332).
+    implementation platform('org.eclipse.jetty:jetty-bom:12.1.9')
+    implementation platform('org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9')
+
+    implementation 'io.dropwizard:dropwizard-bom:5.0.1'
+    implementation 'io.dropwizard:dropwizard-core:5.0.1'
+    implementation 'io.dropwizard:dropwizard-assets:5.0.1'
+    implementation 'io.dropwizard:dropwizard-testing:5.0.1'
+    implementation 'io.dropwizard:dropwizard-forms:5.0.1'
+    implementation 'io.dropwizard:dropwizard-client:5.0.1'
+    implementation 'io.dropwizard:dropwizard-auth:5.0.1'
     implementation 'io.dropwizard.metrics:metrics-core:4.2.38'
     implementation 'io.dropwizard.metrics:metrics-servlets:4.2.38'
 
@@ -170,13 +172,13 @@ dependencies {
     implementation group: 'org.semanticweb.yars', name: 'nxparser-parsers', version: '2.3.3'
 
     //Grobid
-    implementation(group: 'org.grobid', name: 'grobid-core', version: '0.9.0') {
+    implementation(group: 'org.grobid', name: 'grobid-core', version: '0.9.1') {
         exclude group: 'org.slf4j', module: "slf4j-log4j12"
     }
-    api(group: 'org.grobid', name: 'grobid-service', version: '0.9.0') {
+    api(group: 'org.grobid', name: 'grobid-service', version: '0.9.1') {
         exclude group: 'org.slf4j', module: "slf4j-log4j12"
     }
-    implementation(group: 'org.grobid', name: 'grobid-trainer', version: '0.9.0') {
+    implementation(group: 'org.grobid', name: 'grobid-trainer', version: '0.9.1') {
         exclude group: 'org.slf4j', module: "slf4j-log4j12"
     }
 
@@ -197,11 +199,9 @@ dependencies {
     testImplementation 'org.easymock:easymock:5.2.0'
     testImplementation 'org.hamcrest:hamcrest-all:1.3'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
-    testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
-    testImplementation 'org.powermock:powermock-api-easymock:2.0.9'
-    testImplementation 'org.jetbrains.kotlin:kotlin-test'
-    testImplementation "io.mockk:mockk:1.13.9"
-
+    // JUnit 4 API for compilation (was previously provided transitively by
+    // powermock-module-junit4); JUnit 4 tests are executed by junit-vintage-engine.
+    testImplementation 'junit:junit:4.13.2'
 }
 
 configurations.all {
@@ -253,7 +253,7 @@ test {
         jvmArgs "--add-opens", "java.base/java.util.stream=ALL-UNNAMED",
             "--add-opens", "java.base/java.io=ALL-UNNAMED",
             "--add-opens", "java.xml/jdk.xml.internal=ALL-UNNAMED",
-            // PowerMock compatibility with Java 21 — matches parent grobid
+            // Reflective access needed by the test mocking framework (EasyMock) on Java 21
             "--add-opens", "java.base/java.lang=ALL-UNNAMED",
             "--add-opens", "java.base/java.util=ALL-UNNAMED"
     }
@@ -325,10 +325,6 @@ jar {
     enabled = true
 }
 
-artifacts {
-    archives shadowJar
-}
-
 distZip.enabled = true
 distTar.enabled = false
 shadowDistZip.enabled = false

localLibs/org/grobid/grobid-core/0.9.0/grobid-core-0.9.0.pom → localLibs/org/grobid/grobid-core/0.9.1/grobid-core-0.9.1.pom

@@ -8,20 +8,20 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.grobid</groupId>
   <artifactId>grobid-core</artifactId>
-  <version>0.9.0</version>
+  <version>0.9.1</version>
+  <licenses>
+    <license>
+      <name>The Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
   <dependencies>
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
       <version>2.12.2</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>net.arnx</groupId>
-      <artifactId>jsonic</artifactId>
-      <version>1.3.10</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>net.sf.saxon</groupId>
       <artifactId>Saxon-HE</artifactId>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
-      <version>2.0.21</version>
+      <version>2.2.20</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -88,16 +88,10 @@
       <version>1.15.0</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-dbutils</groupId>
-      <artifactId>commons-dbutils</artifactId>
-      <version>1.8.1</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>33.5.0-jre</version>
+      <version>33.6.0-jre</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -121,25 +115,19 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.21.1</version>
+      <version>2.21.4</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.21.1</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-afterburner</artifactId>
-      <version>2.21.1</version>
+      <version>2.21.4</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
-      <version>2.21.1</version>
+      <version>2.21.4</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -151,19 +139,19 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.36</version>
+      <version>2.0.17</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.13</version>
+      <version>1.5.26</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
       <artifactId>pdfbox</artifactId>
-      <version>2.0.35</version>
+      <version>2.0.36</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -181,7 +169,7 @@
     <dependency>
       <groupId>org.apache.opennlp</groupId>
       <artifactId>opennlp-tools</artifactId>
-      <version>1.9.4</version>
+      <version>2.5.9</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -190,5 +178,11 @@
       <version>9.4.12.1</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>net.arnx</groupId>
+      <artifactId>jsonic</artifactId>
+      <version>1.3.10</version>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 </project>