chore update after release v5.0.0

alibaba · Jun 2, 2024 · ce00b6b · ce00b6b
1 parent eee3dc6
commit ce00b6b
Show file tree

Hide file tree

Showing 21 changed files with 36 additions and 85 deletions.
diff --git 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)
 
 <strong>COLA 是 Clean Object-Oriented and Layered Architecture的缩写，代表“整洁面向对象分层架构”。
-目前COLA已经发展到[COLA v5](https://blog.csdn.net/significantfrank/article/details/110934799)。</strong>
+目前COLA已经发展到[COLA v5](#版本迭代)。</strong>
 
 > - 想了解更多COLA信息，请关注微信公众号：  
 > <a href="#dummy"><img src="https://img-blog.csdnimg.cn/2020110314110321.png" width="25%" alt="qrcode" /></a>
@@ -43,7 +43,7 @@ COLA架构就是为此而生，其核心职责就是定义良好的应用结构
 
 <a href="#dummy"><img src="https://img-blog.csdnimg.cn/2020120918285068.png" alt="cure" /></a>
 
-经过多次迭代，我们定义出了相对稳定、可靠的应用架构：COLA v4
+经过多次迭代，我们定义出了相对稳定、可靠的应用架构：
 
 <a href="#dummy"><img src="https://img-blog.csdnimg.cn/6549230c6723448fb3ab51ca74829e80.png" alt="cola arch" /></a>
 
@@ -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
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.alibaba.cola</groupId>
+    <artifactId>cola-framework-archetypes-parent</artifactId>
+    <version>5.x-SNAPSHOT</version>
+  </parent>
 
-  <groupId>com.alibaba.cola</groupId>
   <artifactId>cola-archetype-light</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
-
-  <name>cola-archetype-light</name>
+  <name>${project.artifactId}</name>
+  <description>${project.artifactId}</description>
+  <url>https://github.com/alibaba/COLA</url>
 
   <build>
     <extensions>

diff --git a/cola-archetypes/cola-archetype-service/pom.xml b/cola-archetypes/cola-archetype-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alibaba.cola</groupId>
         <artifactId>cola-framework-archetypes-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>5.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>cola-framework-archetype-service</artifactId>

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
@@ -16,7 +16,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.deploy.skip>true</maven.deploy.skip>
 
-        <cola.components.version>4.4.0-SNAPSHOT</cola.components.version>
+        <cola.components.version>5.x-SNAPSHOT</cola.components.version>
 
         <spring-boot.version>2.7.2</spring-boot.version>
         <mybatis-starter.version>2.2.2</mybatis-starter.version>

diff --git a/cola-archetypes/cola-archetype-web/pom.xml b/cola-archetypes/cola-archetype-web/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.alibaba.cola</groupId>
         <artifactId>cola-framework-archetypes-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>5.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>cola-framework-archetype-web</artifactId>

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
@@ -16,7 +16,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.deploy.skip>true</maven.deploy.skip>
 
-        <cola.components.version>4.4.0-SNAPSHOT</cola.components.version>
+        <cola.components.version>5.x-SNAPSHOT</cola.components.version>
 
         <spring-boot.version>2.7.2</spring-boot.version>
         <mybatis-starter.version>2.2.2</mybatis-starter.version>

diff --git a/cola-archetypes/pom.xml b/cola-archetypes/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibaba.cola</groupId>
     <artifactId>cola-framework-archetypes-parent</artifactId>
-    <version>4.4.0-SNAPSHOT</version>
+    <version>5.x-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
@@ -53,6 +53,7 @@
     </developers>
 
     <modules>
+        <module>cola-archetype-light</module>
         <module>cola-archetype-service</module>
         <module>cola-archetype-web</module>
     </modules>

diff --git a/cola-components/cola-component-catchlog-starter/pom.xml b/cola-components/cola-component-catchlog-starter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.alibaba.cola</groupId>
         <artifactId>cola-components-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>5.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>cola-component-catchlog-starter</artifactId>

diff --git a/cola-components/cola-component-domain-starter/pom.xml b/cola-components/cola-component-domain-starter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.alibaba.cola</groupId>
         <artifactId>cola-components-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>5.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>cola-component-domain-starter</artifactId>

diff --git a/cola-components/cola-component-dto/pom.xml b/cola-components/cola-component-dto/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.alibaba.cola</groupId>
         <artifactId>cola-components-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>5.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>cola-component-dto</artifactId>

diff --git a/cola-components/cola-component-dto/src/versions-rules.xml b/cola-components/cola-component-dto/src/versions-rules.xml
diff --git a/cola-components/cola-component-exception/pom.xml b/cola-components/cola-component-exception/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.alibaba.cola</groupId>
         <artifactId>cola-components-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>5.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>cola-component-exception</artifactId>

diff --git a/cola-components/cola-component-extension-starter/pom.xml b/cola-components/cola-component-extension-starter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.alibaba.cola</groupId>
         <artifactId>cola-components-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>5.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>cola-component-extension-starter</artifactId>

diff --git a/cola-components/cola-component-ruleengine/pom.xml b/cola-components/cola-component-ruleengine/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.alibaba.cola</groupId>
         <artifactId>cola-components-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>5.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>cola-component-ruleengine</artifactId>

diff --git a/cola-components/cola-component-statemachine/pom.xml b/cola-components/cola-component-statemachine/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.alibaba.cola</groupId>
         <artifactId>cola-components-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>5.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>cola-component-statemachine</artifactId>

diff --git a/cola-components/cola-component-test-container/pom.xml b/cola-components/cola-component-test-container/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.alibaba.cola</groupId>
         <artifactId>cola-components-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>5.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>cola-component-test-container</artifactId>

diff --git a/cola-components/cola-component-unittest/pom.xml b/cola-components/cola-component-unittest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.alibaba.cola</groupId>
         <artifactId>cola-components-parent</artifactId>
-        <version>4.4.0-SNAPSHOT</version>
+        <version>5.x-SNAPSHOT</version>
     </parent>
 
     <artifactId>cola-component-unittest</artifactId>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>com.alibaba.cola</groupId>
             <artifactId>cola-component-test-container</artifactId>
-            <version>4.4.0-SNAPSHOT</version>
+            <version>5.x-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/cola-components/cola-components-bom/pom.xml b/cola-components/cola-components-bom/pom.xml
@@ -10,7 +10,7 @@
     -->
     <groupId>com.alibaba.cola</groupId>
     <artifactId>cola-components-bom</artifactId>
-    <version>4.4.0-SNAPSHOT</version>
+    <version>5.x-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>

diff --git a/cola-components/pom.xml b/cola-components/pom.xml
@@ -7,7 +7,7 @@
 
   <artifactId>cola-components-parent</artifactId>
 
-  <version>4.4.0-SNAPSHOT</version>
+  <version>5.x-SNAPSHOT</version>
 
   <packaging>pom</packaging>
 
@@ -342,30 +342,6 @@
 
         </plugin>
 
-        <plugin>
-
-          <!--
-                                  config example: https://github.com/mojohaus/versions-maven-plugin/issues/157#issuecomment-306041074
-                              -->
-
-          <groupId>org.codehaus.mojo</groupId>
-
-          <artifactId>versions-maven-plugin</artifactId>
-
-          <version>2.16.0</version>
-
-          <configuration>
-
-            <rulesUri>
-                            file://${maven.multiModuleProjectDirectory}/cola-component-dto/src/versions-rules.xml
-                        </rulesUri>
-
-            <generateBackupPoms>false</generateBackupPoms>
-
-          </configuration>
-
-        </plugin>
-
         <!--修复老的maven-surefire-plugin不支持junit5 + spring5的bug-->
 
         <plugin>

diff --git a/cola-samples/craftsman/pom.xml b/cola-samples/craftsman/pom.xml
@@ -16,7 +16,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.deploy.skip>true</maven.deploy.skip>
 
-        <cola.components.version>4.4.0-SNAPSHOT</cola.components.version>
+        <cola.components.version>5.x-SNAPSHOT</cola.components.version>
 
         <spring-boot.version>2.7.5</spring-boot.version>
         <mybatis-starter.version>2.2.2</mybatis-starter.version>

diff --git 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"