maven插件版本升级并集中配置

f502a624 · 武汉红喜 · 2f194111 · f502a624 · f502a624 · f502a624
21 changed file
--- a/README.md
+++ b/README.md
 # whatsmars
-*`mvn clean package -Dmaven.test.skip`* `jdk8+`
+*`mvn clean package -Dmaven.test.skip`* `jdk8+` `maven3.3.1+`
 <br>Java生态研究(Spring Boot + Redis + Dubbo + RocketMQ)
 <br>Spring Boot 系列(Servlet, Tomcat, Spring, SpringMVC, Spring Boot)


--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,11 @@
        <java-source.version>1.8</java-source.version>
        <java-target.version>1.8</java-target.version>
        <file-encoding>UTF-8</file-encoding>
+        <compiler-plugin.version>3.7.0</compiler-plugin.version>
+        <resources-plugin.version>3.0.2</resources-plugin.version>
+        <release-plugin.version>2.5.3</release-plugin.version>
+        <dependency-plugin.version>3.0.2</dependency-plugin.version>
+        <springloaded.version>1.2.6.RELEASE</springloaded.version>

        <rootdir>${basedir}</rootdir>
    </properties>
@@ -444,7 +449,7 @@
        <plugins>
            <plugin>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>${compiler-plugin.version}</version>
                <configuration>
                    <source>${java-source.version}</source>
                    <target>${java-target.version}</target>
@@ -453,7 +458,7 @@
            </plugin>
            <plugin>
                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
+                <version>${resources-plugin.version}</version>
                <configuration>
                    <encoding>${file-encoding}</encoding>
                </configuration>
@@ -461,7 +466,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-release-plugin</artifactId>
-                <version>2.1</version>
+                <version>${release-plugin.version}</version>
            </plugin>
        </plugins>
    </build>

--- a/whatsmars-common/pom.xml
+++ b/whatsmars-common/pom.xml
@@ -101,29 +101,6 @@

    <build>
        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>${java-source.version}</source>
-                    <target>${java-target.version}</target>
-                    <encoding>${file-encoding}</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <encoding>${file-encoding}</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.1</version>
-            </plugin>
-        </plugins>
    </build>



--- a/whatsmars-dubbo/whatsmars-dubbo-api/pom.xml
+++ b/whatsmars-dubbo/whatsmars-dubbo-api/pom.xml
@@ -13,9 +13,6 @@
    <packaging>jar</packaging>
    <name>${project.artifactId}</name>
    <description>The demo module of dubbo project</description>
-    <properties>
-        <skip_maven_deploy>true</skip_maven_deploy>
-    </properties>


 </project>
\ No newline at end of file
--- a/whatsmars-dubbo/whatsmars-dubbo-consumer-boot/pom.xml
+++ b/whatsmars-dubbo/whatsmars-dubbo-consumer-boot/pom.xml
@@ -77,7 +77,7 @@
                    <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>springloaded</artifactId>
-                        <version>1.2.6.RELEASE</version>
+                        <version>${springloaded.version}</version>
                    </dependency>
                </dependencies>
                <!-- POM不是继承spring-boot-starter-parent的话，需要下面的指定 -->

--- a/whatsmars-dubbo/whatsmars-dubbo-consumer/pom.xml
+++ b/whatsmars-dubbo/whatsmars-dubbo-consumer/pom.xml
@@ -87,7 +87,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
+                <version>${dependency-plugin.version}</version>
                <executions>
                    <execution>
                        <id>copy-dependencies</id>

--- a/whatsmars-dubbo/whatsmars-dubbo-provider-boot/pom.xml
+++ b/whatsmars-dubbo/whatsmars-dubbo-provider-boot/pom.xml
@@ -82,7 +82,7 @@
                    <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>springloaded</artifactId>
-                        <version>1.2.6.RELEASE</version>
+                        <version>${springloaded.version}</version>
                    </dependency>
                </dependencies>
                <!-- POM不是继承spring-boot-starter-parent的话，需要下面的指定 -->

--- a/whatsmars-dubbo/whatsmars-dubbo-provider/pom.xml
+++ b/whatsmars-dubbo/whatsmars-dubbo-provider/pom.xml
@@ -94,7 +94,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
+                <version>${dependency-plugin.version}</version>
                <executions>
                    <execution>
                        <id>copy-dependencies</id>

--- a/whatsmars-elasticjob/pom.xml
+++ b/whatsmars-elasticjob/pom.xml
@@ -12,11 +12,9 @@
    <artifactId>whatsmars-elasticjob</artifactId>

    <properties>
-        <java.version>1.7</java.version>
        <elastic-job.version>2.1.5</elastic-job.version>
        <curator.version>2.10.0</curator.version>
        <h2.version>1.4.184</h2.version>
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
    </properties>

    <dependencies>

--- a/whatsmars-fs-web/pom.xml
+++ b/whatsmars-fs-web/pom.xml
@@ -78,29 +78,6 @@
                <filtering>true</filtering>
            </resource>
        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>${java-source.version}</source>
-                    <target>${java-target.version}</target>
-                    <encoding>${file-encoding}</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <encoding>${file-encoding}</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.1</version>
-            </plugin>
-        </plugins>
    </build>



--- a/whatsmars-motan/pom.xml
+++ b/whatsmars-motan/pom.xml
@@ -15,7 +15,6 @@
    <name>${project.artifactId}</name>
    <description>The demo module of motan project</description>
    <properties>
-        <skip_maven_deploy>true</skip_maven_deploy>
        <motan.version>1.0.0</motan.version>
    </properties>
    <modules>

--- a/whatsmars-motan/whatsmars-motan-consumer/pom.xml
+++ b/whatsmars-motan/whatsmars-motan-consumer/pom.xml
@@ -88,7 +88,7 @@
                    <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>springloaded</artifactId>
-                        <version>1.2.6.RELEASE</version>
+                        <version>${springloaded.version}</version>
                    </dependency>
                </dependencies>
                <!-- POM不是继承spring-boot-starter-parent的话，需要下面的指定 -->

--- a/whatsmars-motan/whatsmars-motan-provider/pom.xml
+++ b/whatsmars-motan/whatsmars-motan-provider/pom.xml
@@ -89,7 +89,7 @@
                    <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>springloaded</artifactId>
-                        <version>1.2.6.RELEASE</version>
+                        <version>${springloaded.version}</version>
                    </dependency>
                </dependencies>
                <!-- POM不是继承spring-boot-starter-parent的话，需要下面的指定 -->

--- a/whatsmars-redis/pom.xml
+++ b/whatsmars-redis/pom.xml
@@ -73,7 +73,7 @@
                    <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>springloaded</artifactId>
-                        <version>1.2.6.RELEASE</version>
+                        <version>${springloaded.version}</version>
                    </dependency>
                </dependencies>
                <!-- POM不是继承spring-boot-starter-parent的话，需要下面的指定 -->

--- a/whatsmars-sharding-jdbc/pom.xml
+++ b/whatsmars-sharding-jdbc/pom.xml
@@ -80,7 +80,7 @@
                    <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>springloaded</artifactId>
-                        <version>1.2.6.RELEASE</version>
+                        <version>${springloaded.version}</version>
                    </dependency>
                </dependencies>
                <!-- POM不是继承spring-boot-starter-parent的话，需要下面的指定 -->

--- a/whatsmars-spring-boot/pom.xml
+++ b/whatsmars-spring-boot/pom.xml
@@ -121,7 +121,7 @@
                    <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>springloaded</artifactId>
-                        <version>1.2.6.RELEASE</version>
+                        <version>${springloaded.version}</version>
                    </dependency>
                </dependencies>
                <!-- POM不是继承spring-boot-starter-parent的话，需要下面的指定 -->

--- a/whatsmars-spring-cloud/whatsmars-cloud-consumer/pom.xml
+++ b/whatsmars-spring-cloud/whatsmars-cloud-consumer/pom.xml
@@ -60,7 +60,7 @@
                    <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>springloaded</artifactId>
-                        <version>1.2.6.RELEASE</version>
+                        <version>${springloaded.version}</version>
                    </dependency>
                </dependencies>
                <!-- POM不是继承spring-boot-starter-parent的话，需要下面的指定 -->

--- a/whatsmars-spring-cloud/whatsmars-cloud-eureka/pom.xml
+++ b/whatsmars-spring-cloud/whatsmars-cloud-eureka/pom.xml
@@ -46,7 +46,7 @@
                    <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>springloaded</artifactId>
-                        <version>1.2.6.RELEASE</version>
+                        <version>${springloaded.version}</version>
                    </dependency>
                </dependencies>
                <!-- POM不是继承spring-boot-starter-parent的话，需要下面的指定 -->

--- a/whatsmars-spring-cloud/whatsmars-cloud-provider/pom.xml
+++ b/whatsmars-spring-cloud/whatsmars-cloud-provider/pom.xml
@@ -46,7 +46,7 @@
                    <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>springloaded</artifactId>
-                        <version>1.2.6.RELEASE</version>
+                        <version>${springloaded.version}</version>
                    </dependency>
                </dependencies>
                <!-- POM不是继承spring-boot-starter-parent的话，需要下面的指定 -->

--- a/whatsmars-spring-cloud/whatsmars-cloud-zuul/pom.xml
+++ b/whatsmars-spring-cloud/whatsmars-cloud-zuul/pom.xml
@@ -59,7 +59,7 @@
                    <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>springloaded</artifactId>
-                        <version>1.2.6.RELEASE</version>
+                        <version>${springloaded.version}</version>
                    </dependency>
                </dependencies>
                <!-- POM不是继承spring-boot-starter-parent的话，需要下面的指定 -->

--- a/whatsmars-tomcat/pom.xml
+++ b/whatsmars-tomcat/pom.xml
@@ -61,6 +61,7 @@
            </resource>
        </resources>
        <plugins>
+            <!-- 生成可执行jar和lib文件夹 -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
@@ -68,11 +69,30 @@
                    <archive>
                        <addMavenDescriptor>true</addMavenDescriptor>
                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
                            <mainClass>org.hongxi.whatsmars.tomcat.server.HttpServer</mainClass>
                        </manifest>
                    </archive>
                </configuration>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>${dependency-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
        </plugins>
    </build>