diff --git a/.vscode/settings.json b/.vscode/settings.json index 7b016a89..e0120650 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { - "java.compile.nullAnalysis.mode": "automatic" + "java.compile.nullAnalysis.mode": "automatic", + "java.configuration.updateBuildConfiguration": "interactive" } \ No newline at end of file diff --git a/devops/docker/dew-devops/Dockerfile b/devops/docker/dew-devops/Dockerfile index 176a4dff..5e8c476f 100644 --- 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-rc.6/dew-maven-agent-3.0.0-rc.6.jar +ARG MAVEN_AGENT_URL=https://oss.sonatype.org/content/repositories/public/group/idealworld/dew/dew-maven-agent/3.0.0-rc.7/dew-maven-agent-3.0.0-rc.7.jar RUN mkdir -p /opt/maven/ \ && mkdir -p /opt/jar/ \ diff --git a/devops/it/pom.xml b/devops/it/pom.xml index d62ca74a..95e02b01 100644 --- a/devops/it/pom.xml +++ b/devops/it/pom.xml @@ -8,7 +8,7 @@ devops-it 2.2 Dew Devops Integration Tests Build jar - 3.0.0-rc.6 + 3.0.0-rc.7 21 @@ -29,7 +29,7 @@ group.idealworld.dew dew-maven-plugin - 3.0.0-rc.6 + 3.0.0-rc.7 org.jooq diff --git a/devops/it/src/it/helloworld-backend/pom.xml b/devops/it/src/it/helloworld-backend/pom.xml index 9fb323b7..1a22861d 100644 --- a/devops/it/src/it/helloworld-backend/pom.xml +++ b/devops/it/src/it/helloworld-backend/pom.xml @@ -7,7 +7,7 @@ group.idealworld.dew parent-starter - 3.0.0-rc.6 + 3.0.0-rc.7 group.idealworld.dew.devops.it diff --git a/devops/it/src/it/helloworld-frontend/pom.xml b/devops/it/src/it/helloworld-frontend/pom.xml index 4bf5ccc4..507edccf 100644 --- a/devops/it/src/it/helloworld-frontend/pom.xml +++ b/devops/it/src/it/helloworld-frontend/pom.xml @@ -7,7 +7,7 @@ group.idealworld.dew parent-starter - 3.0.0-rc.6 + 3.0.0-rc.7 group.idealworld.dew.devops.it diff --git a/devops/it/src/it/helloworld-library/pom.xml b/devops/it/src/it/helloworld-library/pom.xml index 44bda9a5..3604a286 100644 --- a/devops/it/src/it/helloworld-library/pom.xml +++ b/devops/it/src/it/helloworld-library/pom.xml @@ -7,7 +7,7 @@ group.idealworld.dew parent-starter - 3.0.0-rc.6 + 3.0.0-rc.7 group.idealworld.dew.devops.it diff --git a/devops/it/src/it/todo/backend/libraries/common/pom.xml b/devops/it/src/it/todo/backend/libraries/common/pom.xml index 0045919c..88ed340f 100644 --- a/devops/it/src/it/todo/backend/libraries/common/pom.xml +++ b/devops/it/src/it/todo/backend/libraries/common/pom.xml @@ -7,7 +7,7 @@ group.idealworld.dew.devops.it todo-parent - 3.0.0-rc.6 + 3.0.0-rc.7 ../../.. diff --git a/devops/it/src/it/todo/backend/services/compute/pom.xml b/devops/it/src/it/todo/backend/services/compute/pom.xml index ffaaf558..79078ec0 100644 --- a/devops/it/src/it/todo/backend/services/compute/pom.xml +++ b/devops/it/src/it/todo/backend/services/compute/pom.xml @@ -7,7 +7,7 @@ group.idealworld.dew.devops.it todo-parent - 3.0.0-rc.6 + 3.0.0-rc.7 ../../.. diff --git a/devops/it/src/it/todo/backend/services/kernel/pom.xml b/devops/it/src/it/todo/backend/services/kernel/pom.xml index 78a4b577..76c53a85 100644 --- a/devops/it/src/it/todo/backend/services/kernel/pom.xml +++ b/devops/it/src/it/todo/backend/services/kernel/pom.xml @@ -7,7 +7,7 @@ group.idealworld.dew.devops.it todo-parent - 3.0.0-rc.6 + 3.0.0-rc.7 ../../.. diff --git a/devops/it/src/it/todo/backend/services/notifier/pom.xml b/devops/it/src/it/todo/backend/services/notifier/pom.xml index 675b4abc..023bfb61 100644 --- a/devops/it/src/it/todo/backend/services/notifier/pom.xml +++ b/devops/it/src/it/todo/backend/services/notifier/pom.xml @@ -7,7 +7,7 @@ group.idealworld.dew.devops.it todo-parent - 3.0.0-rc.6 + 3.0.0-rc.7 ../../.. diff --git a/devops/it/src/it/todo/frontend/pom.xml b/devops/it/src/it/todo/frontend/pom.xml index 20ebb4bf..7ff0a6fe 100644 --- a/devops/it/src/it/todo/frontend/pom.xml +++ b/devops/it/src/it/todo/frontend/pom.xml @@ -7,7 +7,7 @@ group.idealworld.dew parent-starter - 3.0.0-rc.6 + 3.0.0-rc.7 ../../../../../framework/modules/parent-starter diff --git a/devops/it/src/it/todo/pom.xml b/devops/it/src/it/todo/pom.xml index 9a5a89f9..7ea03870 100644 --- a/devops/it/src/it/todo/pom.xml +++ b/devops/it/src/it/todo/pom.xml @@ -8,12 +8,12 @@ group.idealworld.dew parent-starter - 3.0.0-rc.6 + 3.0.0-rc.7 group.idealworld.dew.devops.it todo-parent - 3.0.0-rc.6 + 3.0.0-rc.7 pom @@ -37,7 +37,7 @@ group.idealworld.dew.devops.it todo-common - 3.0.0-rc.6 + 3.0.0-rc.7 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 index c73f93ed..8605a0c5 100644 --- 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 @@ -21,7 +21,7 @@ public class HelloWorldLibraryVerify extends BasicProcessor implements Verify { 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-rc.6/maven-metadata.xml"); + + "group/idealworld/dew/devops/it/helloworld-library/3.0.0-rc.7/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 index 609f0d63..efa879ee 100644 --- 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 @@ -23,7 +23,7 @@ public void doVerify(String buildPath, String expectedResPath) throws Exception // verify parent String metaData = $.http.get( - itSnapshotRepositoryUrl + "group/idealworld/dew/devops/it/todo-parent/3.0.0-rc.6/maven-metadata.xml"); + itSnapshotRepositoryUrl + "group/idealworld/dew/devops/it/todo-parent/3.0.0-rc.7/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"); @@ -33,7 +33,7 @@ public void doVerify(String buildPath, String expectedResPath) throws Exception // verify common metaData = $.http.get( - itSnapshotRepositoryUrl + "group/idealworld/dew/devops/it/todo-common/3.0.0-rc.6/maven-metadata.xml"); + itSnapshotRepositoryUrl + "group/idealworld/dew/devops/it/todo-common/3.0.0-rc.7/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 index 38c1952f..3d23863f 100644 --- a/devops/maven/dew-maven-agent/pom.xml +++ b/devops/maven/dew-maven-agent/pom.xml @@ -6,13 +6,13 @@ group.idealworld.dew parent-starter - 3.0.0-rc.6 + 3.0.0-rc.7 ../../../framework/modules/parent-starter dew-maven-agent jar - 3.0.0-rc.6 + 3.0.0-rc.7 2.1 Dew DevOps Maven Agent diff --git a/devops/maven/dew-maven-plugin/pom.xml b/devops/maven/dew-maven-plugin/pom.xml index cd8e9b94..a5e0fc15 100644 --- a/devops/maven/dew-maven-plugin/pom.xml +++ b/devops/maven/dew-maven-plugin/pom.xml @@ -6,13 +6,13 @@ group.idealworld.dew parent-starter - 3.0.0-rc.6 + 3.0.0-rc.7 ../../../framework/modules/parent-starter dew-maven-plugin maven-plugin - 3.0.0-rc.6 + 3.0.0-rc.7 2.0 Dew DevOps Maven Plugin diff --git a/devops/pom.xml b/devops/pom.xml index f8f11ce7..267ce8e5 100644 --- a/devops/pom.xml +++ b/devops/pom.xml @@ -8,7 +8,7 @@ build-devops 2 Dew Devops Build pom - 3.0.0-rc.6 + 3.0.0-rc.7 true diff --git a/devops/sh/dew-devops.sh b/devops/sh/dew-devops.sh index 1dee3c58..2951c232 100644 --- a/devops/sh/dew-devops.sh +++ b/devops/sh/dew-devops.sh @@ -23,7 +23,7 @@ MINIO_BUCKET_NAME=dew GITLAB_URL=http://gitlab.dew.test GITLAB_RUNNER_NAMESPACE=devops GITLAB_RUNNER_NAME=dew-runner -GITLAB_RUNNER_IMAGE=dewms/devops:3.0.0-rc.6 +GITLAB_RUNNER_IMAGE=dewms/devops:3.0.0-rc.7 GITLAB_RUNNER_REG_TOKEN=3mezus8cX9qAjkrNY4B GITLAB_RUNNER_PROFILE=test diff --git a/docs/index.html b/docs/index.html index 82b87ed5..1c77dc03 100644 --- a/docs/index.html +++ b/docs/index.html @@ -5,7 +5,7 @@ - + Dew:一站式微服务解决方案