Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dependency upgrade #207

Merged
merged 10 commits into from
Jan 10, 2024
Merged

dependency upgrade #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4bd1bf8
sync modify
17629354490 Jan 6, 2024
9552e68
modify package name
17629354490 Jan 6, 2024
aa7edc5
.
gudaoxuri Jan 8, 2024
2e3e30a
Fix package naming error.
gudaoxuri Jan 8, 2024
d40c53a
Fix configuration errors caused after upgrading spring
gudaoxuri Jan 8, 2024
718f9dc
Merge branch 'gudaoxuri:master' into master
17629354490 Jan 8, 2024
4a27948
sync commons
17629354490 Jan 8, 2024
c69afd2
sync modify
17629354490 Jan 10, 2024
dcdd0a2
dbutils bug fix
17629354490 Jan 10, 2024
882a6ba
sync docs and dialect
17629354490 Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion devops/docker/dew-devops/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/ \
Expand Down
10 changes: 5 additions & 5 deletions devops/it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions devops/it/src/it/helloworld-backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion devops/it/src/it/helloworld-frontend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion devops/it/src/it/helloworld-library/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion devops/it/src/it/todo/backend/libraries/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion devops/it/src/it/todo/backend/services/compute/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
7 changes: 6 additions & 1 deletion devops/it/src/it/todo/backend/services/kernel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions .../services/kernel/src/test/java/group/idealworld/dew/devops/it/todo/kernel/KernelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion devops/it/src/it/todo/backend/services/notifier/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
3 changes: 2 additions & 1 deletion devops/it/src/it/todo/frontend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions devops/it/src/it/todo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion devops/it/src/test/java/group/idealworld/dew/devops/it/verify/HelloWorldLibraryVerify.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions devops/it/src/test/java/group/idealworld/dew/devops/it/verify/TodoVerify.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions devops/maven/dew-maven-agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions devops/maven/dew-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...n/src/main/java/group/idealworld/dew/devops/kernel/flow/rollback/DefaultRollbackFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...-plugin/src/main/java/group/idealworld/dew/devops/kernel/function/NeedProcessChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading