Merge remote-tracking branch 'origin/master'

apache · Dec 6, 2021 · da36842 · da36842
2 parents ae8b7f8 + 8dcb32d
commit da36842
Show file tree

Hide file tree

Showing 459 changed files with 2,378 additions and 1,115 deletions.
diff --git a/examples/example-core/config-utility/pom.xml b/examples/example-core/config-utility/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>example-core</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>config-utility</artifactId>
     <name>${project.artifactId}</name>

diff --git a/examples/example-core/example-api/pom.xml b/examples/example-core/example-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>example-core</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>example-api</artifactId>
     <name>${project.artifactId}</name>

diff --git a/examples/example-core/example-raw-jdbc/pom.xml b/examples/example-core/example-raw-jdbc/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>example-core</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>example-raw-jdbc</artifactId>
     <name>${project.artifactId}</name>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.shardingsphere.example</groupId>
             <artifactId>config-utility</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere.example</groupId>
             <artifactId>example-api</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/examples/example-core/example-spring-jpa/pom.xml b/examples/example-core/example-spring-jpa/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>example-core</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>example-spring-jpa</artifactId>
     <name>${project.artifactId}</name>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.shardingsphere.example</groupId>
             <artifactId>config-utility</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere.example</groupId>
             <artifactId>example-api</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
 
         <dependency>

diff --git a/examples/example-core/example-spring-mybatis/pom.xml b/examples/example-core/example-spring-mybatis/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>example-core</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>example-spring-mybatis</artifactId>
     <name>common::example-spring-mybatis</name>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.shardingsphere.example</groupId>
             <artifactId>config-utility</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere.example</groupId>
             <artifactId>example-api</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis</groupId>

diff --git a/examples/example-core/pom.xml b/examples/example-core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>shardingsphere-example</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>example-core</artifactId>
     <packaging>pom</packaging>
@@ -36,4 +36,35 @@
         <module>example-spring-mybatis</module>
         <module>example-spring-jpa</module>
     </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <pluginExecutions>
+                            <pluginExecution>
+                                <pluginExecutionFilter>
+                                    <groupId>org.codehaus.mojo</groupId>
+                                    <artifactId>flatten-maven-plugin</artifactId>
+                                    <versionRange>[1.1.0,)</versionRange>
+                                    <goals>
+                                        <goal>flatten</goal>
+                                    </goals>
+                                </pluginExecutionFilter>
+                                <action>
+                                    <ignore></ignore>
+                                </action>
+                            </pluginExecution>
+                        </pluginExecutions>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
 </project>
diff --git a/examples/other-example/pom.xml b/examples/other-example/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>shardingsphere-example</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>other-example</artifactId>
     <packaging>pom</packaging>
@@ -32,4 +32,35 @@
     <modules>
         <module>shardingsphere-parser-example</module>
     </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <pluginExecutions>
+                            <pluginExecution>
+                                <pluginExecutionFilter>
+                                    <groupId>org.codehaus.mojo</groupId>
+                                    <artifactId>flatten-maven-plugin</artifactId>
+                                    <versionRange>[1.1.0,)</versionRange>
+                                    <goals>
+                                        <goal>flatten</goal>
+                                    </goals>
+                                </pluginExecutionFilter>
+                                <action>
+                                    <ignore></ignore>
+                                </action>
+                            </pluginExecution>
+                        </pluginExecutions>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
 </project>
diff --git a/examples/other-example/shardingsphere-parser-example/pom.xml b/examples/other-example/shardingsphere-parser-example/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>other-example</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>shardingsphere-parser-example</artifactId>
     <name>${project.artifactId}</name>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.shardingsphere.example</groupId>
     <artifactId>shardingsphere-example</artifactId>
-    <version>5.0.1-SNAPSHOT</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 
@@ -35,6 +35,7 @@
     </modules>
 
     <properties>
+        <revision>5.0.1-SNAPSHOT</revision>
         <java.version>1.8</java.version>
         <maven.version.range>[3.0.4,)</maven.version.range>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -72,6 +73,7 @@
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <freemarker.version>2.3.31</freemarker.version>
         <snakeyaml.version>1.16</snakeyaml.version>
+        <flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version>
 
         <javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
     </properties>
@@ -448,6 +450,30 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>${flatten-maven-plugin.version}</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/examples/shardingsphere-jdbc-example/mixed-feature-example/pom.xml b/examples/shardingsphere-jdbc-example/mixed-feature-example/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>shardingsphere-jdbc-example</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>mixed-feature-example</artifactId>
     <packaging>pom</packaging>

diff --git a/...ingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/pom.xml b/...ingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>mixed-feature-example</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>sharding-readwrite-splitting-example</artifactId>
     <packaging>pom</packaging>

diff --git a/...harding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/pom.xml b/...harding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>sharding-readwrite-splitting-example</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>sharding-readwrite-splitting-raw-jdbc-example</artifactId>
     <name>${project.artifactId}</name>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.shardingsphere.example</groupId>
             <artifactId>example-raw-jdbc</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>

diff --git a/...-readwrite-splitting-example/sharding-readwrite-splitting-spring-boot-jpa-example/pom.xml b/...-readwrite-splitting-example/sharding-readwrite-splitting-spring-boot-jpa-example/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>sharding-readwrite-splitting-example</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>sharding-readwrite-splitting-spring-boot-jpa-example</artifactId>
     <name>${project.artifactId}</name>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.shardingsphere.example</groupId>
             <artifactId>example-spring-jpa</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>

diff --git a/...dwrite-splitting-example/sharding-readwrite-splitting-spring-boot-mybatis-example/pom.xml b/...dwrite-splitting-example/sharding-readwrite-splitting-spring-boot-mybatis-example/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>sharding-readwrite-splitting-example</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>sharding-readwrite-splitting-spring-boot-mybatis-example</artifactId>
     <name>${project.artifactId}</name>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.shardingsphere.example</groupId>
             <artifactId>example-spring-mybatis</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
 
         <dependency>

diff --git a/...write-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/pom.xml b/...write-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>sharding-readwrite-splitting-example</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>sharding-readwrite-splitting-spring-namespace-jpa-example</artifactId>
     <name>${project.artifactId}</name>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.shardingsphere.example</groupId>
             <artifactId>example-spring-jpa</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
 
         <dependency>

diff --git a/...e-splitting-example/sharding-readwrite-splitting-spring-namespace-mybatis-example/pom.xml b/...e-splitting-example/sharding-readwrite-splitting-spring-namespace-mybatis-example/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>sharding-readwrite-splitting-example</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>sharding-readwrite-splitting-spring-namespace-mybatis-example</artifactId>
     <name>${project.artifactId}</name>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.shardingsphere.example</groupId>
             <artifactId>example-spring-mybatis</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
 
         <dependency>

diff --git a/examples/shardingsphere-jdbc-example/pom.xml b/examples/shardingsphere-jdbc-example/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
         <artifactId>shardingsphere-example</artifactId>
-        <version>5.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>shardingsphere-jdbc-example</artifactId>
     <packaging>pom</packaging>
@@ -33,4 +33,35 @@
         <module>mixed-feature-example</module>
         <module>single-feature-example</module>
     </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <pluginExecutions>
+                            <pluginExecution>
+                                <pluginExecutionFilter>
+                                    <groupId>org.codehaus.mojo</groupId>
+                                    <artifactId>flatten-maven-plugin</artifactId>
+                                    <versionRange>[1.1.0,)</versionRange>
+                                    <goals>
+                                        <goal>flatten</goal>
+                                    </goals>
+                                </pluginExecutionFilter>
+                                <action>
+                                    <ignore></ignore>
+                                </action>
+                            </pluginExecution>
+                        </pluginExecutions>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
 </project>