Merge branch 'master' of https://github.com/alibaba/COLA

� Conflicts: � cola-components/cola-component-statemachine/pom.xml
jack-yu-matrix · Jan 28, 2021 · 3da81b6 · 3da81b6
2 parents 3b2af73 + 6d6149b
commit 3da81b6
Show file tree

Hide file tree

Showing 236 changed files with 1,299 additions and 1,857 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,3 @@
-language: java
 # Building a Java project
 #   https://docs.travis-ci.com/user/languages/java
 #
@@ -9,27 +8,26 @@ language: java
 #   https://docs.travis-ci.com/user/reference/trusty/#JVM-(Clojure%2C-Groovy%2C-Java%2C-Scala)-images
 # - Customizing the Build / Build Matrix
 #   https://docs.travis-ci.com/user/customizing-the-build/#Build-Matrix
+language: java
 
+# The Ubuntu Linux Build Environments
+#   https://docs.travis-ci.com/user/reference/linux/
 dist: bionic
 
 # JVM (Clojure, Groovy, Java, Scala) support
 #   https://docs.travis-ci.com/user/reference/bionic#jvm-clojure-groovy-java-scala-support
 jdk:
-  - openjdk8
-  - openjdk10
   - openjdk11
 
 # Job Lifecycle
 #   https://docs.travis-ci.com/user/job-lifecycle/
 
 before_install:
   # output env info
-  - ls -la
-  - ls -l /usr/lib/jvm && ls /usr/lib/jvm/*
-  - echo -e "JAVA_HOME=$JAVA_HOME\nPATH=$PATH\nSHELL=$SHELL"
+  - echo -e "PATH=$PATH\nSHELL=$SHELL"
 
 script:
-  - scripts/integration-test.sh
+  - scripts/multi-jdk-integration-test.sh
 
 after_script:
   - git status --ignored
@@ -38,10 +36,12 @@ before_cache:
   # clear self maven install
   - rm -rf $HOME/.m2/repository/com/alibaba/cola
   - rm -rf $HOME/.m2/repository/com/alibaba/craftsman
+  - rm -rf $HOME/.m2/repository/com/alibaba/demo
 
 # Caching Dependencies and Directories
 # https://docs.travis-ci.com/user/caching/
 cache:
   directories:
     - $HOME/.m2
+    - $HOME/.sdkman
     - $HOME/.cache/pip
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# COLA 4.0
+# 🥤 COLA 4.0
 
 [![Build Status](https://travis-ci.org/alibaba/COLA.svg?branch=master)](https://travis-ci.org/alibaba/COLA)
 [![Maven Central](https://img.shields.io/maven-central/v/com.alibaba.cola/cola-component-dto.svg?color=2d545e)](https://search.maven.org/search?q=g:com.alibaba.cola)
@@ -8,7 +8,8 @@
 [![GitHub Forks](https://img.shields.io/github/forks/alibaba/COLA)](https://github.com/alibaba/COLA/fork)
 [![GitHub issues](https://img.shields.io/github/issues/alibaba/COLA.svg)](https://github.com/alibaba/COLA/issues)
 
-<strong>COLA 是 Clean Object-Oriented and Layered Architecture的缩写，代表“整洁面向对象分层架构”。目前COLA已经发展到[COLA 4.0](https://blog.csdn.net/significantfrank/article/details/110934799)。</strong>
+<strong>COLA 是 Clean Object-Oriented and Layered Architecture的缩写，代表“整洁面向对象分层架构”。
+目前COLA已经发展到[COLA 4.0](https://blog.csdn.net/significantfrank/article/details/110934799)。</strong>
 
 COLA分为两个部分，COLA架构和COLA组件。
 
@@ -72,13 +73,13 @@ COLA架构区别于这些架构的地方，在于除了思想之外，我们还
 
 ```bash
 mvn archetype:generate  \
-    -DgroupId=com.alibaba.cola.demo.service \
+    -DgroupId=com.alibaba.cola.demo.web \
     -DartifactId=demo-web \
     -Dversion=1.0.0-SNAPSHOT \
     -Dpackage=com.alibaba.demo \
     -DarchetypeArtifactId=cola-framework-archetype-web \
     -DarchetypeGroupId=com.alibaba.cola \
-    -DarchetypeVersion=4.0.0
+    -DarchetypeVersion=4.0.1
 ```
 
 命令执行成功的话，会看到如下的应用代码结构：
@@ -104,7 +105,7 @@ mvn archetype:generate  \
     -Dpackage=com.alibaba.demo \
     -DarchetypeArtifactId=cola-framework-archetype-service \
     -DarchetypeGroupId=com.alibaba.cola \
-    -DarchetypeVersion=4.0.0
+    -DarchetypeVersion=4.0.1
 ```
 
 # 版本迭代

diff --git a/cola-archetypes/cola-archetype-service/pom.xml b/cola-archetypes/cola-archetype-service/pom.xml
@@ -2,12 +2,15 @@
 <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-archetypes-parent</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+    </parent>
 
-    <groupId>com.alibaba.cola</groupId>
     <artifactId>cola-framework-archetype-service</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
-    <name>${project.artifactId}</name>
+    <name>${project.artifactId}:${project.version}</name>
     <description>${project.artifactId}</description>
     <url>https://github.com/alibaba/COLA</url>
 
@@ -31,155 +34,24 @@
         <developer>
             <id>significantfrank</id>
             <name>Frank Zhang</name>
-            <email>25216348@qq.com</email>
+            <email>25216348(at)qq.com</email>
             <roles>
                 <role>Developer</role>
                 <role>Architect</role>
             </roles>
             <timezone>+8</timezone>
             <url>https://github.com/significantfrank</url>
         </developer>
+        <developer>
+            <id>oldratlee</id>
+            <name>Jerry Lee</name>
+            <email>oldratlee(at)gmail.com</email>
+            <roles>
+                <role>Developer</role>
+                <role>CI/SCM Engineer</role>
+            </roles>
+            <timezone>+8</timezone>
+            <url>https://github.com/oldratlee</url>
+        </developer>
     </developers>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <build>
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.archetype</groupId>
-                <artifactId>archetype-packaging</artifactId>
-                <version>3.0.1</version>
-            </extension>
-        </extensions>
-        <plugins>
-            <plugin>
-                <artifactId>maven-archetype-plugin</artifactId>
-                <version>3.0.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.8</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <profiles>
-        <profile>
-            <id>gen-src+doc</id>
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>3.2.1</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.2.0</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadoc</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <source>8</source>
-                            <show>protected</show>
-                            <charset>UTF-8</charset>
-                            <encoding>UTF-8</encoding>
-                            <docencoding>UTF-8</docencoding>
-                            <additionalJOptions>
-                                <additionalJOption>-quiet</additionalJOption>
-                                <additionalJOption>-J-Duser.language=en</additionalJOption>
-                                <additionalJOption>-J-Duser.country=US</additionalJOption>
-                                <additionalJOption>-Xdoclint:none</additionalJOption>
-                            </additionalJOptions>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>gen-sign</id>
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/...a-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml b/...a-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>${groupId}</groupId>
-        <artifactId>${rootArtifactId}</artifactId>
+        <artifactId>${rootArtifactId}-parent</artifactId>
         <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml b/...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>${groupId}</groupId>
-        <artifactId>${rootArtifactId}</artifactId>
+        <artifactId>${rootArtifactId}-parent</artifactId>
         <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml b/...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>${groupId}</groupId>
-        <artifactId>${rootArtifactId}</artifactId>
+        <artifactId>${rootArtifactId}-parent</artifactId>
         <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/...-service/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml b/...-service/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>${groupId}</groupId>
-        <artifactId>${rootArtifactId}</artifactId>
+        <artifactId>${rootArtifactId}-parent</artifactId>
         <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

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
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
+    <artifactId>${artifactId}-parent</artifactId>
     <version>${version}</version>
     <packaging>pom</packaging>
     <name>${artifactId}</name>
@@ -55,22 +55,22 @@
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-client</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-app</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-domain</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-infrastructure</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <!--Project modules End-->
             <!--Spring Boot-->

diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/start/pom.xml b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/start/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>${groupId}</groupId>
-        <artifactId>${rootArtifactId}</artifactId>
+        <artifactId>${rootArtifactId}-parent</artifactId>
         <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>