[#4785] Compatible with Spring6.x, Jakarta, JDK21, and Springboot3.x

.github/workflows/checkstyle.yml

@@ -21,7 +21,7 @@ name: checkstyle
 on:
   pull_request:
     branches:
-      - 2.8.x
+      - 2.9.x
 
 jobs:
   checkstyle:
@@ -32,7 +32,7 @@ jobs:
       - name: Set up jdk
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: checkstyle
         run: mvn -B -Pit install -DskipTests -Dspotbugs.skip=true checkstyle:check

.github/workflows/maven.yml

@@ -21,9 +21,9 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ 2.8.x ]
+    branches: [ 2.9.x ]
   pull_request:
-    branches: [ 2.8.x ]
+    branches: [ 2.9.x ]
 
 jobs:
   build:
@@ -36,7 +36,7 @@ jobs:
     - name: Set up jdk
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '21'
         distribution: 'temurin'
     - name: Set up Maven
       uses: stCarolas/setup-maven@v4.5

.github/workflows/rat_check.yml

@@ -21,10 +21,10 @@ name: rat check
 on:
   push:
     branches:
-      - 2.8.x
+      - 2.9.x
   pull_request:
     branches:
-      - 2.8.x
+      - 2.9.x
 
 jobs:
   rat_check:
@@ -35,7 +35,7 @@ jobs:
       - name: Set up jdk
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '21'
           distribution: 'temurin'
       - name: rat check
         run: mvn apache-rat:check -B -Pit,distribution

.github/workflows/spotbugs.yml

@@ -21,7 +21,7 @@ name: spot bugs
 on:
   pull_request:
     branches:
-      - 2.8.x
+      - 2.9.x
 
 jobs:
   spotbugs:
@@ -32,7 +32,7 @@ jobs:
       - name: Set up jdk
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '21'
           distribution: 'temurin'
       - name: spotbugs
         run: mvn -B -Pit -DskipTests clean verify spotbugs:spotbugs

.github/workflows/unit-test-jdk17.yml

@@ -22,7 +22,7 @@ name: Unit Test Jdk17
 on:
   pull_request:
     branches:
-      - 2.8.x
+      - 2.9.x
 
 jobs:
   unit-tests:

.github/workflows/unit-test-jdk11.yml → .github/workflows/unit-test-jdk21.yml

@@ -17,12 +17,12 @@
 # under the License.
 #
 
-name: Unit Test Jdk11
+name: Unit Test Jdk21
 
 on:
   pull_request:
     branches:
-      - 2.8.x
+      - 2.9.x
 
 jobs:
   unit-tests:
@@ -33,7 +33,7 @@ jobs:
       - name: Set up jdk
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'temurin'
       - name: Compilation and Installation
-        run: mvn -B -Dcheckstyle.skip -Dspotbugs.skip=true clean test
+        run: mvn -B -Dcheckstyle.skip -Dspotbugs.skip=true clean install -Pit

LICENSE

@@ -244,4 +244,15 @@ For foundations/foundation-protobuf/src/main/java/io/protostuff/runtime/ArrayFie
     foundations/foundation-protobuf/src/main/java/io/protostuff/SchemaWriter.java
 ================================================================
 This product bundles files from protostuff which is licensed under the Apache License v2.
-For details, see  https://github.com/protostuff/protostuff
+For details, see  https://github.com/protostuff/protostuff
+
+================================================================
+For swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/AbstractModelConverterAdapterJakarta.java
+    swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/JAXBAnnotationsHelperAdapterJakarta.java
+    swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ModelConvertersAdapterJakarta.java
+    swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ModelResolverAdapterJakarta.java
+    swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ParameterProcessorAdapterJakarta.java
+    swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/SwaggerAnnotationIntrospectorAdapterJakarta.java
+================================================================
+This product bundles files from swagger which is licensed under the Apache License v2.
+For details, see https://github.com/swagger-api/swagger-core

archetypes/business-service-jaxrs/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.servicecomb</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicecomb.archetypes</groupId>

archetypes/business-service-pojo/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.servicecomb</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicecomb.archetypes</groupId>

archetypes/business-service-spring-boot2-starter/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.servicecomb</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicecomb.archetypes</groupId>

archetypes/business-service-springmvc/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.servicecomb</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicecomb.archetypes</groupId>

archetypes/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.servicecomb</groupId>
     <artifactId>java-chassis-parent</artifactId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
     <relativePath>../parents/default</relativePath>
   </parent>
 

ci/spotbugs/exclude.xml

@@ -260,4 +260,36 @@
         <Bug pattern="VA_FORMAT_STRING_USES_NEWLINE"/>
     </Match>
 
+    <Match>
+        <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+    </Match>
+
+    <Match>
+        <Bug pattern="NP_BOOLEAN_RETURN_NULL"/>
+        <Class name="org.apache.servicecomb.swagger.jakarta.AbstractModelConverterAdapterJakarta"/>
+    </Match>
+    <Match>
+        <Class name="org.apache.servicecomb.swagger.jakarta.ModelConvertersAdapterJakarta"/>
+        <Or>
+            <Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE"/>
+            <Bug pattern="SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR"/>
+        </Or>
+    </Match>
+    <Match>
+        <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
+        <Class name="org.apache.servicecomb.swagger.jakarta.ModelResolverAdapterJakarta"/>
+    </Match>
+    <Match>
+        <Bug pattern="NP_BOOLEAN_RETURN_NULL"/>
+        <Class name="org.apache.servicecomb.swagger.jakarta.SwaggerAnnotationIntrospectorAdapterJakarta"/>
+    </Match>
+
+    <Match>
+        <Bug pattern="PA_PUBLIC_PRIMITIVE_ATTRIBUTE"/>
+        <Or>
+            <Class name="org.apache.servicecomb.registry.DiscoveryManager"/>
+            <Class name="org.apache.servicecomb.registry.RegistrationManager"/>
+        </Or>
+    </Match>
+
 </FindBugsFilter>

clients/config-center-client/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <artifactId>clients</artifactId>
     <groupId>org.apache.servicecomb</groupId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

clients/config-common/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>clients</artifactId>
         <groupId>org.apache.servicecomb</groupId>
-        <version>2.9.0-SNAPSHOT</version>
+        <version>2.10.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

clients/config-kie-client/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>clients</artifactId>
         <groupId>org.apache.servicecomb</groupId>
-        <version>2.9.0-SNAPSHOT</version>
+        <version>2.10.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

clients/dashboard-client/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>clients</artifactId>
         <groupId>org.apache.servicecomb</groupId>
-        <version>2.9.0-SNAPSHOT</version>
+        <version>2.10.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

clients/http-client-common/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <artifactId>clients</artifactId>
     <groupId>org.apache.servicecomb</groupId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

clients/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.servicecomb</groupId>
     <artifactId>java-chassis-parent</artifactId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
     <relativePath>../parents/default</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

clients/service-center-client/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <artifactId>clients</artifactId>
     <groupId>org.apache.servicecomb</groupId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

common/common-access-log/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <artifactId>common</artifactId>
     <groupId>org.apache.servicecomb</groupId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

common/common-protobuf/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.servicecomb</groupId>
     <artifactId>common</artifactId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
   <artifactId>common-protobuf</artifactId>
   <name>Java Chassis::Common::Protobuf</name>

common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/OperationProtobuf.java

@@ -21,8 +21,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.Response.Status.Family;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.Response.Status.Family;
 
 import org.apache.servicecomb.codec.protobuf.utils.ScopedProtobufSchemaManager;
 import org.apache.servicecomb.core.Invocation;

common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/ProtobufManager.java

@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-import javax.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.apache.servicecomb.codec.protobuf.utils.ScopedProtobufSchemaManager;
 import org.apache.servicecomb.core.Invocation;

common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/ProtoMethod.java

@@ -19,7 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.apache.servicecomb.swagger.invocation.context.HttpStatus;
 

common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java

@@ -28,8 +28,8 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.servicecomb.foundation.protobuf.internal.ProtoConst;

common/common-rest/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.servicecomb</groupId>
     <artifactId>common</artifactId>
-    <version>2.9.0-SNAPSHOT</version>
+    <version>2.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>common-rest</artifactId>
@@ -65,10 +65,5 @@
       <artifactId>swagger-generator-jaxrs</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java

@@ -24,8 +24,8 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor;
@@ -322,7 +322,7 @@ protected void sendResponse(Response response) {
     RestServerCodecFilter.copyHeadersToHttpResponse(response.getHeaders(), responseEx);
 
     if (!(response.getResult() instanceof ServerWebSocket)) {
-      responseEx.setStatus(response.getStatusCode(), response.getReasonPhrase());
+      responseEx.setStatus(response.getStatusCode());
     }
     responseEx.setAttribute(RestConst.INVOCATION_HANDLER_RESPONSE, response);
     responseEx.setAttribute(RestConst.INVOCATION_HANDLER_PROCESSOR, produceProcessor);

common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreator.java

@@ -16,16 +16,16 @@
  */
 package org.apache.servicecomb.common.rest;
 
-import static javax.ws.rs.core.Response.Status.NOT_ACCEPTABLE;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.NOT_ACCEPTABLE;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 import static org.apache.servicecomb.core.exception.ExceptionCodes.GENERIC_CLIENT;
 import static org.apache.servicecomb.core.exception.ExceptionCodes.NOT_DEFINED_ANY_SCHEMA;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-import javax.annotation.Nonnull;
-import javax.ws.rs.core.HttpHeaders;
+import jakarta.annotation.Nonnull;
+import jakarta.ws.rs.core.HttpHeaders;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor;