Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

- name: Create or update the GitHub release
env:
GH_TOKEN: ${{ github.token }}
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
run: |
set -euo pipefail
TAG="$GITHUB_REF_NAME"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.crf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# -------------------
# build builder image
# -------------------
FROM eclipse-temurin:21.0.10_7-jdk AS builder
FROM eclipse-temurin:21.0.11_10-jdk-noble AS builder

USER root

Expand Down Expand Up @@ -74,7 +74,7 @@ RUN rm -rf grobid-source
# -------------------
# build runtime image
# -------------------
FROM eclipse-temurin:21.0.10_7-jre
FROM eclipse-temurin:21.0.11_10-jre-noble

RUN apt-get update && \
apt-get -y upgrade && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.delft
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# build builder image
# -------------------

FROM eclipse-temurin:21.0.10_7-jdk AS builder
FROM eclipse-temurin:21.0.11_10-jdk-noble AS builder

USER root

Expand Down Expand Up @@ -78,7 +78,7 @@ RUN rm -rf grobid-source
# build runtime image
# -------------------

FROM eclipse-temurin:21.0.10_7-jre
FROM eclipse-temurin:21.0.11_10-jre-noble

# setting locale is likely useless but to be sure
ENV LANG=C.UTF-8
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.evaluation
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# build builder image
# -------------------

FROM eclipse-temurin:21.0.10_7-jdk AS builder
FROM eclipse-temurin:21.0.11_10-jdk-noble AS builder

USER root

Expand Down Expand Up @@ -142,4 +142,4 @@ LABEL \
org.label-schema.name="Grobid" \
org.label-schema.description="Image running the Grobid End 2 end evaluation" \
org.label-schema.url="https://github.com/kermitt2/Grobid" \
org.label-schema.version=${GROBID_VERSION}
org.label-schema.version=${GROBID_VERSION}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ project("grobid-core") {
}

dependencies {
implementation(group: 'xml-apis', name: 'xml-apis') {
implementation("xml-apis:xml-apis") {
// otherwise xml-apis 2.0.1 will come from XOM and will result in
// java.lang.ClassNotFoundException: org.w3c.dom.ElementTraversal
//TODO: sort out this problem better
Expand Down Expand Up @@ -313,7 +313,7 @@ project("grobid-core") {
// never invokes Ruby's openssl — so the BC code is never loaded and the CVE is not triggerable.
// No released jruby ships a fixed BouncyCastle yet (latest bundles 1.83; the fix needs 1.84), so
// we leave it as-is and wait for an upstream jruby release with BouncyCastle >= 1.84.
implementation group: 'org.jruby', name: 'jruby-complete', version: '9.4.12.1'
implementation "org.jruby:jruby-complete:9.4.12.1"

shadedLib "org.apache.lucene:lucene-analyzers-common:4.5.1"
}
Expand Down Expand Up @@ -503,7 +503,7 @@ project(":grobid-trainer") {
apply plugin: 'jacoco'

dependencies {
implementation(group: 'xml-apis', name: 'xml-apis') {
implementation("xml-apis:xml-apis") {
// otherwise xml-apis 2.0.1 will come from XOM and will result in
// java.lang.ClassNotFoundException: org.w3c.dom.ElementTraversal
//TODO: sort out this problem better
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 4 additions & 7 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 28 additions & 35 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading