upgrade jdk11

sofastack · Aug 4, 2022 · 7da35ab · 7da35ab
1 parent b802ace
commit 7da35ab
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 19 deletions.
diff --git a/.aci.yml b/.aci.yml
@@ -23,7 +23,7 @@ STC扫描:
   checkRule:
     - passRate = 100
   tools:
-    jdk: '1.8'  #jdk版本枚举：1.6、1.7、1.8
+    jdk: '11'  #jdk版本枚举：1.6、1.7、1.8
     maven: 3.2.5
   parameters:
     encoding: UTF-8 # 编码设置
@@ -38,7 +38,7 @@ STC扫描:
   checkRule:
     - passRate = 100
   tools:
-    jdk: '1.8'
+    jdk: '11'
   parameters:
     encoding: UTF-8 # 编码设置
   pluginConfig:

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Integration Test
         run: mvn compile -B
           && mvn clean test -DisSkipUnitTest=true "-Dtest.logging.level=ERROR"

diff --git a/.github/workflows/pmd.yml b/.github/workflows/pmd.yml
@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: PMD
         run: mvn install -Dmaven.test.skip=true
           && mvn pmd:check
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Unit Testt
         run: mvn compile -B
           && mvn clean test -DisSkipIntegrationTest=true "-Dtest.logging.level=ERROR" --fail-at-end --batch-mode

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,7 +4,7 @@ version: '{build}'
 # environment settings
 environment:
     matrix:
-        - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+        - JAVA_HOME: C:\Program Files\Java\jdk11.0
 
 platform: x64
 

diff --git a/client/impl/pom.xml b/client/impl/pom.xml
@@ -14,6 +14,8 @@
 
     <properties>
         <main.user.dir>../../</main.user.dir>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -56,8 +56,8 @@
         <module>test</module>
     </modules>
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <bolt.version>1.6.3</bolt.version>
         <commons.lang.version>2.6</commons.lang.version>

diff --git a/server/pom.xml b/server/pom.xml
@@ -40,8 +40,8 @@
     </profiles>
     <properties>
         <!-- Build args -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.user.dir>../</main.user.dir>
     </properties>

diff --git a/.../src/main/java/com/alipay/sofa/registry/server/meta/resource/RegistryCoreOpsResource.java b/.../src/main/java/com/alipay/sofa/registry/server/meta/resource/RegistryCoreOpsResource.java
@@ -27,7 +27,7 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import org.apache.commons.lang.StringUtils;
-import sun.net.util.IPAddressUtil;
+import org.glassfish.jersey.internal.guava.InetAddresses;
 
 /**
  * @author chen.zhu
@@ -51,7 +51,7 @@ public class RegistryCoreOpsResource {
   @Deprecated
   public CommonResponse kickoffServer(@PathParam(value = "ip") String ip) {
     LOGGER.warn("[kickoffServer][begin] server [{}], use opsapi/v2 instead", ip);
-    if (StringUtils.isBlank(ip) || !IPAddressUtil.isIPv4LiteralAddress(ip)) {
+    if (StringUtils.isBlank(ip) || !InetAddresses.isUriInetAddress(ip)) {
       LOGGER.error("[kickoffServer]invalid ip: {}", ip);
       return GenericResponse.buildFailedResponse("invalid ip address: " + ip);
     }
@@ -71,7 +71,7 @@ public CommonResponse kickoffServer(@PathParam(value = "ip") String ip) {
   @Deprecated
   public CommonResponse rejoinServerGroup(@PathParam(value = "ip") String ip) {
     LOGGER.warn("[rejoinServerGroup][begin] server [{}], use opsapi/v2 instead", ip);
-    if (StringUtils.isBlank(ip) || !IPAddressUtil.isIPv4LiteralAddress(ip)) {
+    if (StringUtils.isBlank(ip) || !InetAddresses.isUriInetAddress(ip)) {
       LOGGER.error("[rejoinServerGroup]invalid ip: {}", ip);
       return GenericResponse.buildFailedResponse("invalid ip address: " + ip);
     }

diff --git a/...rc/main/java/com/alipay/sofa/registry/server/meta/resource/RegistryCoreOpsV2Resource.java b/...rc/main/java/com/alipay/sofa/registry/server/meta/resource/RegistryCoreOpsV2Resource.java
@@ -33,8 +33,9 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import org.apache.commons.lang.StringUtils;
+import org.glassfish.jersey.internal.guava.InetAddresses;
 import org.springframework.beans.factory.annotation.Autowired;
-import sun.net.util.IPAddressUtil;
+
 
 /**
  * @author chen.zhu
@@ -65,7 +66,7 @@ public CommonResponse kickoffServer(
       return GenericResponse.buildFailedResponse("invalid nodeType: " + nodeType);
     }
 
-    if (StringUtils.isBlank(ip) || !IPAddressUtil.isIPv4LiteralAddress(ip)) {
+    if (StringUtils.isBlank(ip) || !InetAddresses.isUriInetAddress(ip)) {
       LOGGER.error("[kickoffServerV2]invalid ip: {}", ip);
       return GenericResponse.buildFailedResponse("invalid ip address: " + ip);
     }
@@ -106,7 +107,7 @@ public CommonResponse rejoinServerGroup(
       return GenericResponse.buildFailedResponse("invalid nodeType: " + nodeType);
     }
 
-    if (StringUtils.isBlank(ip) || !IPAddressUtil.isIPv4LiteralAddress(ip)) {
+    if (StringUtils.isBlank(ip) || !InetAddresses.isUriInetAddress(ip)) {
       LOGGER.error("[rejoinServerGroupV2]invalid ip: {}", ip);
       return GenericResponse.buildFailedResponse("invalid ip address: " + ip);
     }