diff --git a/README.md b/README.md index e2ce9a31b..72e2cd937 100644 --- a/README.md +++ b/README.md @@ -3,18 +3,18 @@ [![Fast CI](https://img.shields.io/github/actions/workflow/status/alibaba/cola/ci.yaml?branch=master&logo=github&logoColor=white&label=fast%20ci)](https://github.com/alibaba/cola/actions/workflows/ci.yaml) [![Multiply Java versions CI](https://img.shields.io/github/actions/workflow/status/alibaba/cola/ci_by_multiply_java_versions.yaml?branch=master&logo=github&logoColor=white&label=strong%20ci)](https://github.com/alibaba/cola/actions/workflows/ci_by_multiply_java_versions.yaml) [![License](https://img.shields.io/badge/license-LGPL--2.1-4EB1BA.svg?color=4D7A97&logo=apache)](LICENSE) -[![Java support](https://img.shields.io/badge/Java-8+-339933?logo=OpenJDK&logoColor=white)](https://openjdk.java.net/) +[![Java support](https://img.shields.io/badge/Java-17+-339933?logo=OpenJDK&logoColor=white)](https://openjdk.java.net/) [![Maven Central](https://img.shields.io/maven-central/v/com.alibaba.cola/cola-component-dto.svg?logo=apache-maven&label=maven%20central)](https://central.sonatype.com/namespace/com.alibaba.cola) [![GitHub Releases](https://img.shields.io/github/release/alibaba/COLA.svg)](https://github.com/alibaba/COLA/releases) -[![GitHub Stars](https://img.shields.io/github/stars/alibaba/COLA)](https://github.com/alibaba/COLA/stargazers) -[![GitHub Forks](https://img.shields.io/github/forks/alibaba/COLA)](https://github.com/alibaba/COLA/fork) +[![GitHub Stars](https://img.shields.io/github/stars/alibaba/COLA?style=flat)](https://github.com/alibaba/COLA/stargazers) +[![GitHub Forks](https://img.shields.io/github/forks/alibaba/COLA?style=flat)](https://github.com/alibaba/COLA/fork) [![user repos](https://badgen.net/github/dependents-repo/alibaba/COLA?label=user%20repos)](https://github.com/alibaba/COLA/network/dependents) [![GitHub issues](https://img.shields.io/github/issues/alibaba/COLA.svg)](https://github.com/alibaba/COLA/issues) [![GitHub Contributors](https://img.shields.io/github/contributors/alibaba/COLA)](https://github.com/alibaba/COLA/graphs/contributors) [![gitpod: Ready to Code](https://img.shields.io/badge/Gitpod-ready%20to%20code-339933?label=gitpod&logo=gitpod&logoColor=white)](https://gitpod.io/#https://github.com/alibaba/COLA) COLA 是 Clean Object-Oriented and Layered Architecture的缩写,代表“整洁面向对象分层架构”。 -目前COLA已经发展到[COLA v5](https://blog.csdn.net/significantfrank/article/details/110934799)。 +目前COLA已经发展到[COLA v5](#版本迭代)。 > - 想了解更多COLA信息,请关注微信公众号: > qrcode @@ -43,7 +43,7 @@ COLA架构就是为此而生,其核心职责就是定义良好的应用结构 cure -经过多次迭代,我们定义出了相对稳定、可靠的应用架构:COLA v4 +经过多次迭代,我们定义出了相对稳定、可靠的应用架构: cola arch @@ -88,7 +88,7 @@ mvn archetype:generate \ -Dpackage=com.alibaba.demo \ -DarchetypeArtifactId=cola-framework-archetype-web \ -DarchetypeGroupId=com.alibaba.cola \ - -DarchetypeVersion=4.3.2 + -DarchetypeVersion=5.0.0 ``` 命令执行成功的话,会看到如下的应用代码结构: @@ -112,7 +112,7 @@ mvn archetype:generate \ -Dpackage=com.alibaba.demo \ -DarchetypeArtifactId=cola-framework-archetype-service \ -DarchetypeGroupId=com.alibaba.cola \ - -DarchetypeVersion=4.3.2 + -DarchetypeVersion=5.0.0 ``` # 版本迭代 diff --git a/cola-archetypes/cola-archetype-light/pom.xml b/cola-archetypes/cola-archetype-light/pom.xml index 87aadac0f..094196e83 100644 --- a/cola-archetypes/cola-archetype-light/pom.xml +++ b/cola-archetypes/cola-archetype-light/pom.xml @@ -1,13 +1,17 @@ 4.0.0 + + com.alibaba.cola + cola-framework-archetypes-parent + 5.x-SNAPSHOT + - com.alibaba.cola cola-archetype-light - 1.0.0-SNAPSHOT maven-archetype - - cola-archetype-light + ${project.artifactId} + ${project.artifactId} + https://github.com/alibaba/COLA diff --git a/cola-archetypes/cola-archetype-service/pom.xml b/cola-archetypes/cola-archetype-service/pom.xml index 2d0934808..4aa0055c1 100644 --- a/cola-archetypes/cola-archetype-service/pom.xml +++ b/cola-archetypes/cola-archetype-service/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cola cola-framework-archetypes-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT cola-framework-archetype-service diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml index c12917699..e95f1371f 100644 --- a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml +++ b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml @@ -16,7 +16,7 @@ UTF-8 true - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT 2.7.2 2.2.2 diff --git a/cola-archetypes/cola-archetype-web/pom.xml b/cola-archetypes/cola-archetype-web/pom.xml index 702a35e79..6c4f3a9dd 100644 --- a/cola-archetypes/cola-archetype-web/pom.xml +++ b/cola-archetypes/cola-archetype-web/pom.xml @@ -4,7 +4,7 @@ com.alibaba.cola cola-framework-archetypes-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT cola-framework-archetype-web diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml index fcaa1cbfb..cb94a3060 100644 --- a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml +++ b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml @@ -16,7 +16,7 @@ UTF-8 true - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT 2.7.2 2.2.2 diff --git a/cola-archetypes/pom.xml b/cola-archetypes/pom.xml index 0fb142ad3..7a9d1b0d0 100644 --- a/cola-archetypes/pom.xml +++ b/cola-archetypes/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cola cola-framework-archetypes-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT pom ${project.artifactId} ${project.artifactId} @@ -53,6 +53,7 @@ + cola-archetype-light cola-archetype-service cola-archetype-web diff --git a/cola-components/cola-component-catchlog-starter/pom.xml b/cola-components/cola-component-catchlog-starter/pom.xml index 3dbdeef34..e2636f588 100644 --- a/cola-components/cola-component-catchlog-starter/pom.xml +++ b/cola-components/cola-component-catchlog-starter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.cola cola-components-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT cola-component-catchlog-starter diff --git a/cola-components/cola-component-domain-starter/pom.xml b/cola-components/cola-component-domain-starter/pom.xml index 50568be58..87097bee3 100644 --- a/cola-components/cola-component-domain-starter/pom.xml +++ b/cola-components/cola-component-domain-starter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.cola cola-components-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT cola-component-domain-starter diff --git a/cola-components/cola-component-dto/pom.xml b/cola-components/cola-component-dto/pom.xml index ed45ca00f..ff3a84a2b 100644 --- a/cola-components/cola-component-dto/pom.xml +++ b/cola-components/cola-component-dto/pom.xml @@ -4,7 +4,7 @@ com.alibaba.cola cola-components-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT cola-component-dto diff --git a/cola-components/cola-component-dto/src/versions-rules.xml b/cola-components/cola-component-dto/src/versions-rules.xml deleted file mode 100644 index 3538274b1..000000000 --- a/cola-components/cola-component-dto/src/versions-rules.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - (?i).*[-.]alpha([-.]?\d+)? - - (?i).*[-.]beta([-.]?\d+)? - (?i).*-eap-\d+ - - .*-M\d+(-.*)? - - (?i).*-rc(-?\d+(-.*)?)? - .*-does-not-exist - - (?i).*-dev-?\d+(-.*)? - .*(-does)?-not-exist - - - - - - .*-native-.* - - - - diff --git a/cola-components/cola-component-exception/pom.xml b/cola-components/cola-component-exception/pom.xml index 29ff03d96..00850c0e5 100644 --- a/cola-components/cola-component-exception/pom.xml +++ b/cola-components/cola-component-exception/pom.xml @@ -4,7 +4,7 @@ com.alibaba.cola cola-components-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT cola-component-exception diff --git a/cola-components/cola-component-extension-starter/pom.xml b/cola-components/cola-component-extension-starter/pom.xml index 9a8c94246..44f09e3a6 100644 --- a/cola-components/cola-component-extension-starter/pom.xml +++ b/cola-components/cola-component-extension-starter/pom.xml @@ -4,7 +4,7 @@ com.alibaba.cola cola-components-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT cola-component-extension-starter diff --git a/cola-components/cola-component-ruleengine/pom.xml b/cola-components/cola-component-ruleengine/pom.xml index 5c11f8ed6..513605aba 100644 --- a/cola-components/cola-component-ruleengine/pom.xml +++ b/cola-components/cola-component-ruleengine/pom.xml @@ -4,7 +4,7 @@ com.alibaba.cola cola-components-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT cola-component-ruleengine diff --git a/cola-components/cola-component-statemachine/pom.xml b/cola-components/cola-component-statemachine/pom.xml index dc0eee61d..5a0382593 100644 --- a/cola-components/cola-component-statemachine/pom.xml +++ b/cola-components/cola-component-statemachine/pom.xml @@ -12,7 +12,7 @@ com.alibaba.cola cola-components-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT cola-component-statemachine diff --git a/cola-components/cola-component-test-container/pom.xml b/cola-components/cola-component-test-container/pom.xml index d91fddc4b..f45b1b87f 100644 --- a/cola-components/cola-component-test-container/pom.xml +++ b/cola-components/cola-component-test-container/pom.xml @@ -4,7 +4,7 @@ com.alibaba.cola cola-components-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT cola-component-test-container diff --git a/cola-components/cola-component-unittest/pom.xml b/cola-components/cola-component-unittest/pom.xml index 051a89d1a..2d4f47aa2 100644 --- a/cola-components/cola-component-unittest/pom.xml +++ b/cola-components/cola-component-unittest/pom.xml @@ -4,7 +4,7 @@ com.alibaba.cola cola-components-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT cola-component-unittest @@ -93,7 +93,7 @@ com.alibaba.cola cola-component-test-container - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT test diff --git a/cola-components/cola-components-bom/pom.xml b/cola-components/cola-components-bom/pom.xml index 1a2ca755c..2d2c743bc 100644 --- a/cola-components/cola-components-bom/pom.xml +++ b/cola-components/cola-components-bom/pom.xml @@ -10,7 +10,7 @@ --> com.alibaba.cola cola-components-bom - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT pom ${project.artifactId} ${project.artifactId} diff --git a/cola-components/pom.xml b/cola-components/pom.xml index c61048575..fe515a11a 100644 --- a/cola-components/pom.xml +++ b/cola-components/pom.xml @@ -7,7 +7,7 @@ cola-components-parent - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT pom @@ -342,30 +342,6 @@ - - - - - org.codehaus.mojo - - versions-maven-plugin - - 2.16.0 - - - - - file://${maven.multiModuleProjectDirectory}/cola-component-dto/src/versions-rules.xml - - - false - - - - - diff --git a/cola-samples/craftsman/pom.xml b/cola-samples/craftsman/pom.xml index c96a416c0..72e597939 100644 --- a/cola-samples/craftsman/pom.xml +++ b/cola-samples/craftsman/pom.xml @@ -16,7 +16,7 @@ UTF-8 true - 4.4.0-SNAPSHOT + 5.x-SNAPSHOT 2.7.5 2.2.2 diff --git a/scripts/bump_cola_version b/scripts/bump_cola_version index a17cc2982..46fcc185c 100755 --- a/scripts/bump_cola_version +++ b/scripts/bump_cola_version @@ -18,7 +18,7 @@ readonly bump_version="$1" cd ../cola-components/ jvb::mvn_cmd \ - org.codehaus.mojo:versions-maven-plugin:2.8.1:set \ + org.codehaus.mojo:versions-maven-plugin:2.16.2:set \ -DgenerateBackupPoms=false \ -DprocessAllModules=true \ -DnewVersion="$bump_version" @@ -29,7 +29,7 @@ readonly bump_version="$1" cd ../cola-archetypes/ jvb::mvn_cmd \ - org.codehaus.mojo:versions-maven-plugin:2.11.0:set \ + org.codehaus.mojo:versions-maven-plugin:2.16.2:set \ -DgenerateBackupPoms=false \ -DnewVersion="$bump_version"