From 1b61134b0a2c5c170a310dd8f622691832d78e33 Mon Sep 17 00:00:00 2001
From: Jason Joo <hblzxsj@163.com>
Date: Tue, 30 Jul 2019 16:03:56 +0800
Subject: [PATCH] Bump to 4.1.1

---
 README.md                                     | 10 ++--
 pom.xml                                       | 32 ++++++++++++-
 tbschedule-console/pom.xml                    |  4 +-
 tbschedule-demo/pom.xml                       | 11 +++++
 .../tbschedule-demo-memory/pom.xml            | 46 +++----------------
 tbschedule-demo/tbschedule-demo-redis/pom.xml | 46 +++----------------
 .../tbschedule-demo-zookeeper/pom.xml         | 46 +++----------------
 7 files changed, 68 insertions(+), 127 deletions(-)

diff --git a/README.md b/README.md
index 96027b6..0775457 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ A simple non-centralizing scheduling framework.
 		- [Run](#run)
 - [Load Balancing](#load-balancing)
 - [Changelog](#changelog)
+	- [4.1.1](#411)
 	- [4.1.0](#410)
 	- [4.0.1](#401)
 	- [4.0.0](#400)
@@ -26,7 +27,7 @@ The necessary dependency:
 ```
 <groupId>com.yoloho.schedule</groupId>
 <artifactId>tbschedule-core</artifactId>
-<version>4.1.0</version>
+<version>4.1.1</version>
 ```
 
 If you use zookeeper as storage:
@@ -34,7 +35,7 @@ If you use zookeeper as storage:
 ```
 <groupId>com.yoloho.schedule</groupId>
 <artifactId>tbschedule-storage-zookeeper</artifactId>
-<version>4.1.0</version>
+<version>4.1.1</version>
 ```
 
 If you want use extensions like extension of task:
@@ -42,7 +43,7 @@ If you want use extensions like extension of task:
 ```
 <groupId>com.yoloho.schedule</groupId>
 <artifactId>tbschedule-extension-task</artifactId>
-<version>4.1.0</version>
+<version>4.1.1</version>
 ```
 
 See [tbschedule-demo](tbschedule-demo) for demo.
@@ -171,6 +172,9 @@ SERVER_PORT=8080
 In older original version the worker instances' distribution always includes the leader node. So if you have many jobs or some `single instance` jobs the leader will be the heaviest node. To solve this we introduce `dynamic schedule distribution` algorithm. A shuffling on scheduling servers will be done when rescheduling.
 
 # Changelog
+## 4.1.1
+* Introduce the flattern plugin
+* Optimize the deploy files
 
 ## 4.1.0
 * Restructure the storage related logics.
diff --git a/pom.xml b/pom.xml
index 5b3a915..78b9f75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
     <parent>
         <groupId>com.yoloho.enhanced.parent</groupId>
         <artifactId>enhanced-parent</artifactId>
-        <version>1.0.3</version>
+        <version>1.0.5</version>
     </parent>
     <groupId>com.yoloho.schedule</groupId>
     <artifactId>tbschedule-parent</artifactId>
     <packaging>pom</packaging>
     <version>${revision}</version>
     <properties>
-        <revision>4.1.0</revision>
+        <revision>4.1.1</revision>
     </properties>
     <modules>
         <module>tbschedule-core</module>
@@ -82,6 +82,34 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                    <pomElements>
+                        <build>remove</build>
+                        <pluginManagement>remove</pluginManagement>
+                    </pomElements>
+                </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/tbschedule-console/pom.xml b/tbschedule-console/pom.xml
index 714f3c3..f20a348 100644
--- a/tbschedule-console/pom.xml
+++ b/tbschedule-console/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>com.yoloho.enhanced.parent</groupId>
         <artifactId>enhanced-parent-springboot-web</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.5</version>
     </parent>
     <groupId>com.yoloho.schedule</groupId>
     <artifactId>tbschedule-console</artifactId>
     <name>tbschedule-console</name>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <packaging>jar</packaging>
     <dependencies>
         <!-- tbschedule -->
diff --git a/tbschedule-demo/pom.xml b/tbschedule-demo/pom.xml
index 27bd57b..becc327 100644
--- a/tbschedule-demo/pom.xml
+++ b/tbschedule-demo/pom.xml
@@ -15,4 +15,15 @@
         <module>tbschedule-demo-redis</module>
         <module>tbschedule-demo-zookeeper</module>
     </modules>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/tbschedule-demo/tbschedule-demo-memory/pom.xml b/tbschedule-demo/tbschedule-demo-memory/pom.xml
index 13c5595..871bbb7 100644
--- a/tbschedule-demo/tbschedule-demo-memory/pom.xml
+++ b/tbschedule-demo/tbschedule-demo-memory/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>com.yoloho.enhanced.parent</groupId>
         <artifactId>enhanced-parent-springboot-base</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.5</version>
     </parent>
     <groupId>com.yoloho.schedule</groupId>
     <artifactId>tbschedule-demo-memory</artifactId>
     <name>tbschedule-demo-memory</name>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <packaging>jar</packaging>
     <dependencies>
         <!-- tbschedule -->
@@ -81,44 +81,10 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <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>
-                <executions>
-                    <execution>
-                        <id>attach-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/tbschedule-demo/tbschedule-demo-redis/pom.xml b/tbschedule-demo/tbschedule-demo-redis/pom.xml
index e2dbdc0..ccf6cb8 100644
--- a/tbschedule-demo/tbschedule-demo-redis/pom.xml
+++ b/tbschedule-demo/tbschedule-demo-redis/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>com.yoloho.enhanced.parent</groupId>
         <artifactId>enhanced-parent-springboot-base</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.5</version>
     </parent>
     <groupId>com.yoloho.schedule</groupId>
     <artifactId>tbschedule-demo-redis</artifactId>
     <name>tbschedule-demo-redis</name>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <packaging>jar</packaging>
     <dependencies>
         <!-- tbschedule -->
@@ -81,44 +81,10 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <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>
-                <executions>
-                    <execution>
-                        <id>attach-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/tbschedule-demo/tbschedule-demo-zookeeper/pom.xml b/tbschedule-demo/tbschedule-demo-zookeeper/pom.xml
index 6233aaf..70beb42 100644
--- a/tbschedule-demo/tbschedule-demo-zookeeper/pom.xml
+++ b/tbschedule-demo/tbschedule-demo-zookeeper/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>com.yoloho.enhanced.parent</groupId>
         <artifactId>enhanced-parent-springboot-base</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.5</version>
     </parent>
     <groupId>com.yoloho.schedule</groupId>
     <artifactId>tbschedule-demo-zookeeper</artifactId>
     <name>tbschedule-demo-zookeeper</name>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <packaging>jar</packaging>
     <dependencies>
         <!-- tbschedule -->
@@ -81,44 +81,10 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <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>
-                <executions>
-                    <execution>
-                        <id>attach-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
         </plugins>
     </build>