配置更新

pom.xml

@@ -1,93 +1,76 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?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">
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>9</version>
-	</parent>
 	<modelVersion>4.0.0</modelVersion>
+
 	<groupId>net.mingsoft</groupId>
-	<artifactId>ms-mcms</artifactId>
+	<artifactId>mcms</artifactId>
 	<version>4.7.0-SNAPSHOT</version>
+	<name>ms-mcms</name>
 	<packaging>war</packaging>
-
-	<name>${project.groupId}:${project.artifactId}</name>
-	<description>ms-mcms tools Library</description>
-	<url>https://github.com/ming-soft/ms-mcms</url>
-	<licenses>
-		<license>
-			<name>The MIT License (MIT)</name>
-			<url>http://mit-license.org</url>
-		</license>
-	</licenses>
-	<developers>
-		<developer>
-			<name>mingsoft develop group</name>
-			<email>service@mingsoft.net</email>
-			<organization>mingsoft</organization>
-			<organizationUrl>http://www.mingsoft.net</organizationUrl>
-		</developer>
-	</developers>
-
-	<scm>
-		<connection>scm:git://github.com/ming-soft/ms-mcms.git</connection>
-		<developerConnection>scm:git@github.com:ming-soft/ms-mcms.git</developerConnection>
-		<url>https://github.com/ming-soft/ms-mcms</url>
-	</scm>
-	<distributionManagement>
-		<snapshotRepository>
-			<id>sonatype-nexus-snapshots</id>
-			<name>Sonatype Nexus snapshot repository</name>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-		<repository>
-			<id>sonatype-nexus-staging</id>
-			<name>Sonatype Nexus release repository</name>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
-	</distributionManagement>
 	<properties>
 		<java.version>1.8</java.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<ms.basic.version>1.0.8.1-SNAPSHOT</ms.basic.version>
-		<ms.mdiy.version>1.0.7-SNAPSHOT</ms.mdiy.version>
-		<ms.mpeople.version>1.0.7-SNAPSHOT</ms.mpeople.version>
 	</properties>
+	<repositories>
+		<repository>
+			<id>sonatype-nexus-snapshots</id>
+			<name>Sonatype Nexus Snapshots</name>
+			<url>http://repo1.maven.org/maven2/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>sonatype</id>
+			<name>Sonatype Snapshots</name>
+			<url>https://oss.sonatype.org/content/groups/public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
 	<dependencies>
 		<dependency>
 			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-base</artifactId>
+			<version>1.0.8.boot</version>
+		</dependency>
+		<dependency>
+			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-basic</artifactId>
-			<version>${ms.basic.version}</version>
+			<version>1.0.8.1-SNAPSHOT</version>
 			<classifier>classes</classifier>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-mdiy</artifactId>
-			<version>${ms.mdiy.version}</version>
+			<version>1.0.7-SNAPSHOT</version>
 			<classifier>classes</classifier>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-mpeople</artifactId>
-			<version>${ms.mpeople.version}</version>
+			<version>1.0.7-SNAPSHOT</version>
 			<classifier>classes</classifier>
-			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 	<build>
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**/*.properties</include>
-					<include>**/*.xml</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
-		</resources>
+		<finalName>ms-mcms</finalName>
 		<plugins>
+			<!-- docker部署 <plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> 
+				<version>1.2.0</version> <configuration> <dockerHost>http://localhost</dockerHost> 
+				<imageName>ms-mcms</imageName> <baseImage>java</baseImage> <entryPoint>["java", 
+				"-jar", "/${project.build.finalName}.jar"]</entryPoint> <resources> <resource> 
+				<targetPath>/</targetPath> <directory>${project.build.directory}</directory> 
+				<include>${project.build.finalName}.jar</include> </resource> </resources> 
+				</configuration> </plugin> -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -95,183 +78,47 @@
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
-					<encoding>${project.build.sourceEncoding}</encoding>
-					<showDeprecation>true</showDeprecation>
-					<showWarnings>true</showWarnings>
-					<compilerArguments>
-						<verbose />
-						<bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar</bootclasspath>
-					</compilerArguments>
-					<compilerArgument>-Xlint:unchecked</compilerArgument>
 				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.codehaus.plexus</groupId>
-						<artifactId>plexus-compiler-eclipse</artifactId>
-						<version>2.1</version>
-					</dependency>
-				</dependencies>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.8</version>
-				<configuration>
-					<additionalConfig>
-						<file>
-							<name>.settings/org.eclipse.core.resources.prefs</name>
-							<content>
-                            <![CDATA[
-                            eclipse.preferences.version=1
-                            encoding/<project>=${project.build.sourceEncoding}
-                            ]]>
-							</content>
-						</file>
-					</additionalConfig>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>-Xmx256m</argLine>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.atlassian.maven.plugins</groupId>
-				<artifactId>maven-clover2-plugin</artifactId>
-				<version>2.6.3</version>
-				<configuration>
-					<licenseLocation>${clover.license.file}</licenseLocation>
-					<encoding>${project.build.sourceEncoding}</encoding>
-					<generateXml>true</generateXml>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>1.2</version>
-				<configuration>
-					<findbugsXmlOutput>true</findbugsXmlOutput>
-					<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
-					<xmlOutput>true</xmlOutput>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>2.2.1</version>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>attach-sources</id>
 						<goals>
-							<goal>jar-no-fork</goal>
+							<goal>repackage</goal>
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9.1</version>
 				<configuration>
-					<charset>UTF-8</charset>
-					<encoding>UTF-8</encoding>
-					<docencoding>UTF-8</docencoding>
-					<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
-					<additionalparam>-Xdoclint:none</additionalparam>
+					<fork>true</fork>
 				</configuration>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.6</version>
-				<configuration>
-					<webResources>
-						<resource>
-							<directory>src/main/webapp/WEB-INF</directory>
-							<targetPath>WEB-INF</targetPath>
-							<filtering>true</filtering>
-							<includes>
-								<include>**/*.xml</include>
-							</includes>
-							<excludes>
-								<exclude>web.xml</exclude>
-							</excludes>
-						</resource>
-					</webResources>
-					<attachClasses>true</attachClasses>
-					<warSourceExcludes> */web.xml,static</warSourceExcludes>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<packagingExcludes>ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class</packagingExcludes>
-					<!-- <overlays>
-						<overlay>
-							<groupId>net.mingsoft</groupId>
-							<artifactId>ms-basic</artifactId>
-							<excludes>
-								<exclude>*/</exclude>
-							</excludes>
-						</overlay>
-						<overlay>
-							<groupId>net.mingsoft</groupId>
-							<artifactId>ms-mdiy</artifactId>
-							<excludes>
-								<exclude>*/</exclude>
-							</excludes>
-						</overlay>
-						<overlay>
-							<groupId>net.mingsoft</groupId>
-							<artifactId>ms-mpeople</artifactId>
-							<excludes>
-								<exclude>*/</exclude>
-							</excludes>
-						</overlay>
-					</overlays>
- -->				</configuration>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-release-plugin</artifactId>
-				<configuration>
-					<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
+				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
-					<serverId>sonatype-nexus-staging</serverId>
-					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-					<autoReleaseAfterClose>true</autoReleaseAfterClose>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
+					<!-- 打包时候需需要启用，注意避免快照依赖的冗余jar包 -->
+					<!-- outputFileNameMapping>@{artifactId}@- @{baseVersion}@. @{extension}@</outputFileNameMapping -->
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.5</version>
-				<executions>
-					<execution>
-						<id>sign-artifacts</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/webapp</directory>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>src/main/java</directory>
+			</resource>
+		</resources>
 		<defaultGoal>compile</defaultGoal>
-
-		<finalName>ms-mcms</finalName>
 	</build>
 </project>