Merge pull request #207 from 17629354490/master

dependency upgrade
gudaoxuri · Jan 10, 2024 · 850f267 · 850f267
2 parents cd4bc67 + 882a6ba
commit 850f267
Show file tree

Hide file tree

Showing 132 changed files with 544 additions and 6,711 deletions.
diff --git a/devops/docker/dew-devops/Dockerfile b/devops/docker/dew-devops/Dockerfile
@@ -9,7 +9,7 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
     && apt-get install -y nodejs
 
 # ----------------- Add maven agent
-ARG MAVEN_AGENT_URL=https://oss.sonatype.org/content/repositories/public/group/idealworld/dew/dew-maven-agent/3.0.0-RC4/dew-maven-agent-3.0.0-RC4.jar
+ARG MAVEN_AGENT_URL=https://oss.sonatype.org/content/repositories/public/group/idealworld/dew/dew-maven-agent/3.0.0-RC5/dew-maven-agent-3.0.0-RC5.jar
 
 RUN mkdir -p /opt/maven/ \
     && mkdir -p /opt/jar/ \

diff --git a/devops/it/pom.xml b/devops/it/pom.xml
@@ -24,7 +24,7 @@
     <artifactId>devops-it</artifactId>
     <name>2.2 Dew Devops Integration Tests Build</name>
     <packaging>jar</packaging>
-    <version>3.0.0-RC4</version>
+    <version>3.0.0-RC5</version>
 
     <properties>
         <java.version>17</java.version>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>group.idealworld.dew</groupId>
             <artifactId>dew-maven-plugin</artifactId>
-            <version>3.0.0-RC4</version>
+            <version>3.0.0-RC5</version>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
@@ -94,17 +94,17 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.14.0-rc1</version>
+            <version>2.15.3</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.14.0-rc1</version>
+            <version>2.15.3</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.14.0-rc1</version>
+            <version>2.15.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/devops/it/src/it/helloworld-backend/pom.xml b/devops/it/src/it/helloworld-backend/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.idealworld.dew</groupId>
         <artifactId>parent-starter</artifactId>
-        <version>3.0.0-RC4</version>
+        <version>3.0.0-RC5</version>
     </parent>
 
     <groupId>group.idealworld.dew.devops.it</groupId>
@@ -42,8 +42,8 @@
             <artifactId>boot-starter</artifactId>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/devops/it/src/it/helloworld-frontend/pom.xml b/devops/it/src/it/helloworld-frontend/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.idealworld.dew</groupId>
         <artifactId>parent-starter</artifactId>
-        <version>3.0.0-RC4</version>
+        <version>3.0.0-RC5</version>
     </parent>
 
     <groupId>group.idealworld.dew.devops.it</groupId>

diff --git a/devops/it/src/it/helloworld-library/pom.xml b/devops/it/src/it/helloworld-library/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.idealworld.dew</groupId>
         <artifactId>parent-starter</artifactId>
-        <version>3.0.0-RC4</version>
+        <version>3.0.0-RC5</version>
     </parent>
 
     <groupId>group.idealworld.dew.devops.it</groupId>

diff --git a/devops/it/src/it/todo/backend/libraries/common/pom.xml b/devops/it/src/it/todo/backend/libraries/common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.idealworld.dew.devops.it</groupId>
         <artifactId>todo-parent</artifactId>
-        <version>3.0.0-RC4</version>
+        <version>3.0.0-RC5</version>
         <relativePath>../../..</relativePath>
     </parent>
 

diff --git a/devops/it/src/it/todo/backend/services/compute/pom.xml b/devops/it/src/it/todo/backend/services/compute/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.idealworld.dew.devops.it</groupId>
         <artifactId>todo-parent</artifactId>
-        <version>3.0.0-RC4</version>
+        <version>3.0.0-RC5</version>
         <relativePath>../../..</relativePath>
     </parent>
 

diff --git a/devops/it/src/it/todo/backend/services/kernel/pom.xml b/devops/it/src/it/todo/backend/services/kernel/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.idealworld.dew.devops.it</groupId>
         <artifactId>todo-parent</artifactId>
-        <version>3.0.0-RC4</version>
+        <version>3.0.0-RC5</version>
         <relativePath>../../..</relativePath>
     </parent>
 
@@ -44,6 +44,11 @@
             <groupId>group.idealworld.dew</groupId>
             <artifactId>cluster-spi-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.3</version>
+        </dependency>
         <dependency>
             <groupId>group.idealworld.dew</groupId>
             <artifactId>test-starter</artifactId>

diff --git a/.../services/kernel/src/test/java/group/idealworld/dew/devops/it/todo/kernel/KernelTest.java b/.../services/kernel/src/test/java/group/idealworld/dew/devops/it/todo/kernel/KernelTest.java
@@ -21,11 +21,11 @@
 import group.idealworld.dew.devops.it.todo.kernel.domain.Todo;
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Kernel test.

diff --git a/devops/it/src/it/todo/backend/services/notifier/pom.xml b/devops/it/src/it/todo/backend/services/notifier/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.idealworld.dew.devops.it</groupId>
         <artifactId>todo-parent</artifactId>
-        <version>3.0.0-RC4</version>
+        <version>3.0.0-RC5</version>
         <relativePath>../../..</relativePath>
     </parent>
 

diff --git a/devops/it/src/it/todo/frontend/pom.xml b/devops/it/src/it/todo/frontend/pom.xml
@@ -23,7 +23,8 @@
   <parent>
     <groupId>group.idealworld.dew</groupId>
     <artifactId>parent-starter</artifactId>
-    <version>3.0.0-RC4</version>
+    <version>3.0.0-RC5</version>
+    <relativePath>../../../../../framework/modules/parent-starter</relativePath>
   </parent>
 
   <groupId>group.idealworld.dew.devops.it</groupId>

diff --git a/devops/it/src/it/todo/pom.xml b/devops/it/src/it/todo/pom.xml
@@ -24,12 +24,12 @@
     <parent>
         <groupId>group.idealworld.dew</groupId>
         <artifactId>parent-starter</artifactId>
-        <version>3.0.0-RC4</version>
+        <version>3.0.0-RC5</version>
     </parent>
 
     <groupId>group.idealworld.dew.devops.it</groupId>
     <artifactId>todo-parent</artifactId>
-    <version>3.0.0-RC4</version>
+    <version>3.0.0-RC5</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -53,7 +53,7 @@
             <dependency>
                 <groupId>group.idealworld.dew.devops.it</groupId>
                 <artifactId>todo-common</artifactId>
-                <version>3.0.0-RC4</version>
+                <version>3.0.0-RC5</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/devops/it/src/test/java/group/idealworld/dew/devops/it/verify/HelloWorldLibraryVerify.java b/devops/it/src/test/java/group/idealworld/dew/devops/it/verify/HelloWorldLibraryVerify.java
@@ -36,7 +36,7 @@ public class HelloWorldLibraryVerify extends BasicProcessor implements Verify {
     @Override
     public void doVerify(String buildPath, String expectedResPath) throws Exception {
         loadConfig();
-        String metaData = $.http.get(itSnapshotRepositoryUrl + "group/idealworld/dew/devops/it/helloworld-library/3.0.0-RC4/maven-metadata.xml");
+        String metaData = $.http.get(itSnapshotRepositoryUrl + "group/idealworld/dew/devops/it/helloworld-library/3.0.0-RC5/maven-metadata.xml");
         Document doc = JOOX.builder().parse(new ByteArrayInputStream(metaData.getBytes()));
         String lastUpdateTime = JOOX.$(doc).find("lastUpdated").get(0).getTextContent();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");

diff --git a/devops/it/src/test/java/group/idealworld/dew/devops/it/verify/TodoVerify.java b/devops/it/src/test/java/group/idealworld/dew/devops/it/verify/TodoVerify.java
@@ -38,7 +38,7 @@ public void doVerify(String buildPath, String expectedResPath) throws Exception
         loadConfig();
 
         // verify parent
-        String metaData = $.http.get(itSnapshotRepositoryUrl + "group/idealworld/dew/devops/it/todo-parent/3.0.0-RC4/maven-metadata.xml");
+        String metaData = $.http.get(itSnapshotRepositoryUrl + "group/idealworld/dew/devops/it/todo-parent/3.0.0-RC5/maven-metadata.xml");
         Document doc = JOOX.builder().parse(new ByteArrayInputStream(metaData.getBytes()));
         String lastUpdateTime = JOOX.$(doc).find("lastUpdated").get(0).getTextContent();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -47,7 +47,7 @@ public void doVerify(String buildPath, String expectedResPath) throws Exception
         Assert.assertTrue("parent | last deploy time check", offsetMinutes < 5);
 
         // verify common
-        metaData = $.http.get(itSnapshotRepositoryUrl + "group/idealworld/dew/devops/it/todo-common/3.0.0-RC4/maven-metadata.xml");
+        metaData = $.http.get(itSnapshotRepositoryUrl + "group/idealworld/dew/devops/it/todo-common/3.0.0-RC5/maven-metadata.xml");
         doc = JOOX.builder().parse(new ByteArrayInputStream(metaData.getBytes()));
         lastUpdateTime = JOOX.$(doc).find("lastUpdated").get(0).getTextContent();
         sdf = new SimpleDateFormat("yyyyMMddHHmmss");

diff --git a/devops/maven/dew-maven-agent/pom.xml b/devops/maven/dew-maven-agent/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>group.idealworld.dew</groupId>
         <artifactId>parent-starter</artifactId>
-        <version>3.0.0-RC4</version>
+        <version>3.0.0-RC5</version>
         <relativePath>../../../framework/modules/parent-starter</relativePath>
     </parent>
 
     <artifactId>dew-maven-agent</artifactId>
     <packaging>jar</packaging>
-    <version>3.0.0-RC4</version>
+    <version>3.0.0-RC5</version>
     <name>2.1 Dew DevOps Maven Agent</name>
 
     <properties>

diff --git a/devops/maven/dew-maven-plugin/pom.xml b/devops/maven/dew-maven-plugin/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>group.idealworld.dew</groupId>
         <artifactId>parent-starter</artifactId>
-        <version>3.0.0-RC4</version>
+        <version>3.0.0-RC5</version>
         <relativePath>../../../framework/modules/parent-starter</relativePath>
     </parent>
 
     <artifactId>dew-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>3.0.0-RC4</version>
+    <version>3.0.0-RC5</version>
     <name>2.0 Dew DevOps Maven Plugin</name>
 
     <properties>

diff --git a/...n/src/main/java/group/idealworld/dew/devops/kernel/flow/rollback/DefaultRollbackFlow.java b/...n/src/main/java/group/idealworld/dew/devops/kernel/flow/rollback/DefaultRollbackFlow.java
@@ -23,7 +23,7 @@
 import group.idealworld.dew.devops.kernel.function.VersionController;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.models.V1ConfigMap;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...-plugin/src/main/java/group/idealworld/dew/devops/kernel/function/NeedProcessChecker.java b/...-plugin/src/main/java/group/idealworld/dew/devops/kernel/function/NeedProcessChecker.java
@@ -28,9 +28,9 @@
 import group.idealworld.dew.devops.kernel.util.DewLog;
 import group.idealworld.dew.devops.kernel.util.ExecuteOnceProcessor;
 import io.kubernetes.client.openapi.models.V1ConfigMap;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 
 import java.io.BufferedReader;