Merge pull request #151 from apache/OLINGO-1600-upgrade

[OLINGO-1600] Upgrade JDK 17 + Jakarta + Spring (6)
apache · Dec 17, 2023 · 7daba34 · 7daba34
2 parents 7b8f056 + 05f8656
commit 7daba34
Show file tree

Hide file tree

Showing 133 changed files with 734 additions and 647 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -34,18 +34,18 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
 
-    - name: Set up JDK 8 (Corretto)
+    - name: Set up JDK 17 (Corretto)
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'corretto'
         cache: maven
 

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 8 (Corretto)
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17 (Corretto)
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'corretto'
         cache: maven
     - name: Build with Maven

diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-dist</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/dist/client-lib/pom.xml b/dist/client-lib/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-dist</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/dist/javadoc/pom.xml b/dist/javadoc/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-dist</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-parent</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/dist/server-lib-ext/pom.xml b/dist/server-lib-ext/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-dist</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/dist/server-lib/pom.xml b/dist/server-lib/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-dist</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/ext/client-android/pom.xml b/ext/client-android/pom.xml
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-ext</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/ext/client-proxy/pom.xml b/ext/client-proxy/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-ext</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/ext/karaf/karaf-features/pom.xml b/ext/karaf/karaf-features/pom.xml
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-karaf</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
     <build>

diff --git a/ext/karaf/karaf-fit/pom.xml b/ext/karaf/karaf-fit/pom.xml
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-karaf</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
   <dependencies>

diff --git a/ext/karaf/karaf-fit/src/test/java/org/apache/olingo/osgi/itests/server/CarServiceTest.java b/ext/karaf/karaf-fit/src/test/java/org/apache/olingo/osgi/itests/server/CarServiceTest.java
@@ -96,7 +96,7 @@ public Option[] config() {
         return new Option[] {
             olingoBaseConfig(),
             features(olingoUrl, "olingo-server", "olingo-client"),
-            mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "5.0.0-SNAPSHOT-RC01"),
+            mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "5.0.0-ALPHA-02-RC01"),
             logLevel(LogLevel.INFO)
         };
     }

diff --git a/ext/karaf/pom.xml b/ext/karaf/pom.xml
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-ext</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/ext/pojogen-maven-plugin/pom.xml b/ext/pojogen-maven-plugin/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-ext</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml b/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml
@@ -30,8 +30,8 @@
   <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description>
 
   <properties>
-    <project.source>1.6</project.source>
-    <compiler.plugin.version>3.2</compiler.plugin.version>
+    <project.source>17</project.source>
+    <compiler.plugin.version>3.11.0</compiler.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -62,6 +62,9 @@
           <showWarnings>true</showWarnings>
           <showDeprecation>true</showDeprecation>
           <compilerArgument>-Xlint:unchecked</compilerArgument>
+          <includes>
+            <include>${project.basedir}/target/generated-sources/**</include>
+          </includes>
         </configuration>
       </plugin>
       <plugin>

diff --git a/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml b/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml
@@ -30,8 +30,8 @@
   <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description>
 
   <properties>
-    <project.source>1.6</project.source>
-    <compiler.plugin.version>3.2</compiler.plugin.version>
+    <project.source>17</project.source>
+    <compiler.plugin.version>3.11.0</compiler.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -62,6 +62,9 @@
           <showWarnings>true</showWarnings>
           <showDeprecation>true</showDeprecation>
           <compilerArgument>-Xlint:unchecked</compilerArgument>
+          <includes>
+            <include>${project.basedir}/target/generated-sources/**</include>
+          </includes>
         </configuration>
       </plugin>
       <plugin>

diff --git a/ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml b/ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml
@@ -30,8 +30,8 @@
   <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description>
 
   <properties>
-    <project.source>1.6</project.source>
-    <compiler.plugin.version>3.2</compiler.plugin.version>
+    <project.source>17</project.source>
+    <compiler.plugin.version>3.11.0</compiler.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 

diff --git a/ext/pom.xml b/ext/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-parent</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/fit/pom.xml b/fit/pom.xml
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-parent</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.0-ALPHA-02</version>
   </parent>
 
   <properties>
@@ -82,8 +82,8 @@
 
     <!-- REST services CXF -->
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-javamail_1.4_spec</artifactId>
+      <groupId>org.apache.geronimo.javamail</groupId>
+      <artifactId>geronimo-javamail_1.6_mail</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
@@ -102,22 +102,44 @@
       <artifactId>jackson-databind</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
+      <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+      <artifactId>jackson-jakarta-rs-json-provider</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
     </dependency>
     <!-- /REST services CXF -->
 
+    <!-- Jakarta -->
     <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-core</artifactId>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+      <version>${jakarta.inject.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
+      <version>${jakarta.ws.version}</version>
+    </dependency>
+
+    <!-- JAVAX -->
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>${javax.activation.version}</version>
     </dependency>
+
+    <!-- SPRING -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-logging-log4j</artifactId>
+      <artifactId>tomcat-embed-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
@@ -185,7 +207,7 @@
 	 <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>properties-maven-plugin</artifactId>
-        <version>1.0.0</version>
+        <version>1.2.1</version>
         <executions>
           <execution>
             <phase>generate-resources</phase>

diff --git a/fit/src/it/demo/pom.xml b/fit/src/it/demo/pom.xml
@@ -30,8 +30,8 @@
   <description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description>
 
   <properties>
-    <project.source>1.6</project.source>
-    <compiler.plugin.version>3.2</compiler.plugin.version>
+    <project.source>17</project.source>
+    <compiler.plugin.version>3.11.0</compiler.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 

diff --git a/fit/src/it/openType/pom.xml b/fit/src/it/openType/pom.xml
@@ -30,8 +30,8 @@
   <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description>
 
   <properties>
-    <project.source>1.6</project.source>
-    <compiler.plugin.version>3.2</compiler.plugin.version>
+    <project.source>17</project.source>
+    <compiler.plugin.version>3.11.0</compiler.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 

diff --git a/fit/src/it/staticService/pom.xml b/fit/src/it/staticService/pom.xml
@@ -30,8 +30,8 @@
   <description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description>
 
   <properties>
-    <project.source>1.6</project.source>
-    <compiler.plugin.version>3.2</compiler.plugin.version>
+    <project.source>17</project.source>
+    <compiler.plugin.version>3.11.0</compiler.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 

diff --git a/fit/src/main/java/org/apache/olingo/fit/Demo.java b/fit/src/main/java/org/apache/olingo/fit/Demo.java
@@ -23,20 +23,20 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;

diff --git a/fit/src/main/java/org/apache/olingo/fit/KeyAsSegment.java b/fit/src/main/java/org/apache/olingo/fit/KeyAsSegment.java
@@ -23,21 +23,21 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;