Merge pull request #97 from janeirodigital/upgrade-java

upgrade to java 17
janeirodigital · May 10, 2023 · 0edac2e · 0edac2e
2 parents 7ad717b + c57582c
commit 0edac2e
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 23 deletions.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -10,10 +10,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'corretto'
+          cache: 'maven'
           server-id: jd-oss-github # Value of the distributionManagement/repository/id field of the pom.xml
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

diff --git a/.github/workflows/maven-documentation.yml b/.github/workflows/maven-documentation.yml
@@ -29,10 +29,12 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ steps.previoustag.outputs.tag }}
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'corretto'
+          cache: 'maven'
           server-id: jd-oss-github # Value of the distributionManagement/repository/id field of the pom.xml
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -12,10 +12,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'corretto'
+          cache: 'maven'
           server-id: jd-oss-github # Value of the distributionManagement/repository/id field of the pom.xml
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
@@ -30,10 +30,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'corretto'
+          cache: 'maven'
           server-id: jd-oss-github # Value of the distributionManagement/repository/id field of the pom.xml
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

diff --git a/pom.xml b/pom.xml
@@ -7,26 +7,27 @@
     <version>0.1.15-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>17</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
         <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
         <lombok.version>1.18.26</lombok.version>
-        <slf4j.version>1.7.36</slf4j.version>
-        <jena.version>4.4.0</jena.version>
+        <slf4j.version>2.0.7</slf4j.version>
+        <jena.version>4.8.0</jena.version>
         <titanium.version>1.3.2</titanium.version>
-        <junit.version>5.8.2</junit.version>
-        <shapetrees.version>0.9.10</shapetrees.version>
-        <sai-rdf-utils.version>0.9.6</sai-rdf-utils.version>
-        <sai-http-utils.version>0.9.5</sai-http-utils.version>
-        <sai-authentication.version>0.9.3</sai-authentication.version>
+        <junit.version>5.9.3</junit.version>
+        <shapetrees.version>0.9.11</shapetrees.version>
+        <sai-rdf-utils.version>0.9.9</sai-rdf-utils.version>
+        <sai-http-utils.version>0.9.8</sai-http-utils.version>
+        <sai-authentication.version>0.9.4</sai-authentication.version>
         <mockwebserverplus-ext.version>0.9.6</mockwebserverplus-ext.version>
         <jacoco-maven-plugin.version>0.8.9</jacoco-maven-plugin.version>
         <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
         <maven-javadoc.version>3.5.0</maven-javadoc.version>
         <snakeyaml.version>2.0</snakeyaml.version>
         <mockito.version>4.5.0</mockito.version>
-        <maven-release-plugin.version>3.0.0-M5</maven-release-plugin.version>
+        <maven-release-plugin.version>3.0.0</maven-release-plugin.version>
         <project.scm.id>github</project.scm.id>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -142,7 +143,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <release>11</release>
+                    <release>${java.version}</release>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.projectlombok</groupId>