Update to Java 17

ChannelFinder · Feb 5, 2024 · 93c67c6 · 93c67c6
1 parent e17fcd9
commit 93c67c6
Show file tree

Hide file tree

Showing 20 changed files with 137 additions and 256 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -22,10 +22,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - uses: ankane/setup-elasticsearch@v1

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
@@ -39,10 +39,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Test with Maven
@@ -59,10 +59,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - uses: ankane/setup-elasticsearch@v1

diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,3 @@
-FROM openjdk:11-jre
+FROM openjdk:17-jre
 WORKDIR /channelfinder
 ADD https://repo1.maven.org/maven2/org/phoebus/app-channel-channelfinder/4.7.2/app-channel-channelfinder-4.7.2.jar .
diff --git a/Dockerfile.integrationtest b/Dockerfile.integrationtest
@@ -16,7 +16,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 # ------------------------------------------------------------------------------
 
-FROM openjdk:11
+FROM openjdk:17
 
 # deployment unit
 COPY target/ChannelFinder-*.jar /channelfinder/ChannelFinder-*.jar

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Collected installation recipes and notes may be found on [wiki pages](https://gi
 
 * Prerequisites
 
-  * JDK 11
+  * JDK 17
   * Elastic version 8.2.x
   * <For authN/authZ using LDAP:> LDAP server, e.g. OpenLDAP
 
@@ -45,7 +45,7 @@ Collected installation recipes and notes may be found on [wiki pages](https://gi
 * Build 
 ```
 # Debian 10
-sudo apt-get install openjdk-11-jdk maven git curl wget
+sudo apt-get install openjdk-17-jdk maven git curl wget
 wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.2.0-amd64.deb
 sudo dpkg -i elasticsearch-8.2.0-amd64.deb
 sudo systemctl start elasticsearch

diff --git a/pom.xml b/pom.xml
@@ -55,24 +55,6 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <!-- The following 3 dependencies are temporarily added for java 11 compatibility
-            TODO They should be removed as soon as possible. -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <!-- The above 3 dependencies are temporarily added for java 11 compatibility -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -85,11 +67,6 @@
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-commons</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <!--JUnit Jupiter Engine to depend on the JUnit5 engine and JUnit 5 API -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -346,8 +323,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
 				<version>3.11.0</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>17</source>
+                    <target>17</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
@@ -423,7 +400,7 @@
                                     <additionalOptions>
                                         <additionalOption>-Xdoclint:none</additionalOption>
                                     </additionalOptions>
-                                    <source>11</source>
+                                    <source>17</source>
                                 </configuration>
                             </execution>
                         </executions>