Merge pull request #138 from europeana/EA-3860-upgrade-to-Java-17

EA-3860 upgrade to java 17
europeana · Jul 11, 2024 · 6e0ba6c · 6e0ba6c
2 parents 8e1bb99 + 44b6b47
commit 6e0ba6c
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 37 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: maven-settings-xml-action
       uses: whelk-io/maven-settings-xml-action@v14
       # see: https://github.com/europeana/europeana-parent-pom/blob/master/settings.xml       
@@ -34,4 +34,4 @@ jobs:
 
     - name: Build with Maven
       run: mvn -B verify --file pom.xml
-      if: github.ref != 'refs/heads/master'
+      if: github.ref != 'refs/heads/master'
diff --git a/api.Dockerfile b/api.Dockerfile
@@ -1,5 +1,5 @@
 # Builds a docker image from a locally built Maven war. Requires 'mvn package' to have been run beforehand
-FROM tomcat:9-jre11
+FROM tomcat:9-jre17
 LABEL Author="Europeana Foundation <[email protected]>"
 WORKDIR /usr/local/tomcat/webapps
 

diff --git a/api/pom.xml b/api/pom.xml
@@ -21,7 +21,7 @@
         <spring.boot.mainclass>eu.europeana.fulltext.api.FtApplication</spring.boot.mainclass>
         <solr-solrj.version>8.11.3</solr-solrj.version>
         <javax-validation.version>2.0.1.Final</javax-validation.version>
-        <apache-commons-text.version>1.10.0</apache-commons-text.version>
+        <apache-commons-text.version>1.12.0</apache-commons-text.version>
         <spring-boot-starter-data-solr.version>2.4.13</spring-boot-starter-data-solr.version>
         <maven-surefire.version>2.22.2</maven-surefire.version>
     </properties>
@@ -171,19 +171,6 @@
             <!-- <version>${jackson.version}</version> For some reason specifying a new version will make SpringDoc fail -->
         </dependency>
 
-        <!-- see https://github.com/io-informatics/jackson-jsonld -->
-        <dependency>
-            <groupId>com.io-informatics.oss</groupId>
-            <artifactId>jackson-jsonld</artifactId>
-            <version>${io-informatics.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>jcl-over-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
@@ -332,7 +319,6 @@
                     <attachClasses>true</attachClasses>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 </project>
diff --git a/api/src/main/java/eu/europeana/fulltext/api/config/SerializationConfig.java b/api/src/main/java/eu/europeana/fulltext/api/config/SerializationConfig.java
@@ -6,9 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import ioinformarics.oss.jackson.module.jsonld.JsonldModule;
-import java.text.DateFormat;
-import java.util.Locale;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
@@ -30,8 +28,4 @@ public ObjectMapper mapper() {
                 .visibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY).build();
     }
 
-    @Bean
-    public com.fasterxml.jackson.databind.Module jsonldModule() {
-        return new JsonldModule();
-    }
 }
diff --git a/api/src/main/java/eu/europeana/fulltext/api/model/v2/AnnotationFullBodyV2.java b/api/src/main/java/eu/europeana/fulltext/api/model/v2/AnnotationFullBodyV2.java
@@ -1,18 +1,27 @@
 package eu.europeana.fulltext.api.model.v2;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import ioinformarics.oss.jackson.module.jsonld.annotation.JsonldType;
 
 /**
  * Created by luthien on 14/06/2018.
  */
-@JsonldType("oa:SpecificResource")
-@JsonPropertyOrder({"id"})
+
+@JsonPropertyOrder({"id","type"})
 public class AnnotationFullBodyV2 extends AnnotationBodyV2{
 
+    private static final String TYPE = "oa:SpecificResource";
+
     private static final long serialVersionUID = 3894020068338298481L;
 
     public AnnotationFullBodyV2(String id) {
         super(id);
     }
+
+    @Override
+    @JsonProperty("@type")
+    public String getType() {
+        return TYPE;
+    }
+
 }
diff --git a/api/src/main/java/eu/europeana/fulltext/api/model/v2/JsonLdId.java b/api/src/main/java/eu/europeana/fulltext/api/model/v2/JsonLdId.java
@@ -1,7 +1,7 @@
 package eu.europeana.fulltext.api.model.v2;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import ioinformarics.oss.jackson.module.jsonld.annotation.JsonldId;
 
 import java.io.Serializable;
 
@@ -13,7 +13,7 @@ public class JsonLdId implements Serializable {
 
     private static final long serialVersionUID = 8639654567514332458L;
 
-    @JsonldId
+    @JsonProperty("@id")
     private String id;
 
     JsonLdId() {

diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
     </modules>
 
     <properties>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <maven.compiler.release>${java.version}</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -50,12 +50,12 @@
         <spring-boot.version>2.7.18</spring-boot.version>
         <spring-batch.version>4.3.6</spring-batch.version>
         <spring-security.version>5.7.8</spring-security.version>
-        <jackson.version>2.14.0</jackson.version>
-        <io-informatics.version>0.1.1</io-informatics.version>
+<!--        <jackson.version>2.14.0</jackson.version>-->
+<!--        <io-informatics.version>0.1.1</io-informatics.version>-->
         <morphia.version>2.2.9</morphia.version>
         <mongo-driver.version>4.5.1</mongo-driver.version>
-        <snappy.version>1.1.8.4</snappy.version>
-        <commons-lang3.version>3.9</commons-lang3.version>
+        <snappy.version>1.1.10.5</snappy.version>
+        <commons-lang3.version>3.14.0</commons-lang3.version>
         <commons-io.version>2.4</commons-io.version>
         <!-- Note that upgrading to a newer version of Junit Jupiter may not work with older IntelliJ versions (2019.2.1)
              However for Maven verify goal a newer Jupiter version is no problem-->
@@ -71,7 +71,7 @@
         <eclipse-jetty.version>11.0.11</eclipse-jetty.version>
         <build-helper-maven.version>3.0.0</build-helper-maven.version>
         <maven-failsafe.version>3.0.0-M5</maven-failsafe.version>
-        <dependency-check-maven.version>9.2.0</dependency-check-maven.version>
+        <dependency-check-maven.version>10.0.2</dependency-check-maven.version>
         <jettison.version>1.5.4</jettison.version>
         <snakeyaml.version>2.0</snakeyaml.version>