Merge branch 'refs/heads/master' into release-0.8.1

kermitt2 · Jul 17, 2024 · 99f653a · 99f653a
2 parents 56d351c + e04048d
commit 99f653a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Dockerfile.crf b/Dockerfile.crf
@@ -18,6 +18,7 @@ FROM openjdk:17-jdk-slim as builder
 USER root
 
 RUN apt-get update && \
+    apt-get -y upgrade && \
     apt-get -y --no-install-recommends install unzip
 
 WORKDIR /opt/grobid-source
@@ -65,6 +66,7 @@ RUN rm -rf grobid-source
 FROM openjdk:17-slim
 
 RUN apt-get update && \
+    apt-get -y upgrade && \
     apt-get -y --no-install-recommends install libxml2 libfontconfig && \
     rm -rf /var/lib/apt/lists/*
 

diff --git a/Dockerfile.delft b/Dockerfile.delft
@@ -20,6 +20,7 @@ FROM openjdk:17-jdk-slim as builder
 USER root
 
 RUN apt-get update && \
+    apt-get -y upgrade && \
     apt-get -y --no-install-recommends install unzip
 
 WORKDIR /opt/grobid-source
@@ -86,6 +87,7 @@ ENTRYPOINT ["/tini", "-s", "--"]
 
 # install JRE, python and other dependencies
 RUN apt-get update && \
+    apt-get -y upgrade && \
     apt-get -y --no-install-recommends install apt-utils build-essential gcc libxml2 libfontconfig unzip curl \
     openjdk-17-jre-headless ca-certificates-java \
     musl gfortran \

diff --git a/grobid-core/src/main/java/org/grobid/core/utilities/matching/ReferenceMarkerMatcher.java b/grobid-core/src/main/java/org/grobid/core/utilities/matching/ReferenceMarkerMatcher.java
@@ -7,7 +7,7 @@
 import org.apache.lucene.analysis.standard.ClassicAnalyzer;
 import org.apache.lucene.util.Version;
 import org.grobid.core.data.BibDataSet;
-import org.grobid.core.data.BiblioItem;;
+import org.grobid.core.data.BiblioItem;
 import org.grobid.core.layout.LayoutToken;
 import org.grobid.core.utilities.LayoutTokensUtil;
 import org.grobid.core.utilities.Pair;
@@ -478,4 +478,4 @@ public boolean isKnownFirstAuthor(String text) {
             return false;
     }
 
-}
+}