Skip to content

Update from upstream - #23

Merged
damian1996 merged 521 commits into
cochrane-labfrom
update-from-upstream
Jul 14, 2026
Merged

Update from upstream#23
damian1996 merged 521 commits into
cochrane-labfrom
update-from-upstream

Conversation

@damian1996

Copy link
Copy Markdown
Collaborator

Summary:
Conflicts in files:

both modified:   .github/workflows/ci-build-manual-crf.yml
deleted by us:   .github/workflows/ci-build-manual-full.yml
deleted by us:   .github/workflows/ci-build-unstable.yml
both modified:   Dockerfile.crf
both modified:   Dockerfile.delft
both modified:   build.gradle
deleted by them: doc/Benchmarking-elife.md
deleted by them: doc/Benchmarking-pmc.md
both modified:   gradle/wrapper/gradle-wrapper.jar
both modified:   gradle/wrapper/gradle-wrapper.properties
both modified:   gradlew
both modified:   grobid-core/localLibs/grobid-lucene-analysers-0.0.2.jar
both modified:   grobid-core/src/main/java/org/grobid/core/document/TEIFormatter.java
both modified:   grobid-service/src/main/java/org/grobid/service/main/GrobidServiceApplication.java

Multiple changes with upgrading java to version 21, gradle to version 9. In java files the changes were related to formatting issues and coords changes coming from our fork.

I've kept removed .github/workflows/ci-build-manual-full.yml
and .github/workflows/ci-build-unstable.yml

I’m not sure whether we can trust the new JAR files they provided to resolve the conflicts, or whether we should rebuild them ourselves for security reasons.

The image used by them in the dockerfiles seems to have vulnerability problems, not sure what to do about it (according to vscode warning): eclipse-temurin:21.0.10_7-jdk

Test plan:

Issue number/task:

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.