Explorar el Código

Merge branch 'master' of ssh://10.10.101.21/source/kanban-parent

zhuth hace 8 años
padre
commit
5333ce543e
Se han modificado 1 ficheros con 28 adiciones y 19 borrados
  1. 28 19
      kanban-console/pom.xml

+ 28 - 19
kanban-console/pom.xml

@@ -69,31 +69,25 @@
 
 	<build>
 		<plugins>
+			<!-- 在maven生命周期validate阶段生成timestamp -->
 			<plugin>
-				<groupId>com.google.code.maven-svn-revision-number-plugin</groupId>
-				<artifactId>svn-revision-number-maven-plugin</artifactId>
-				<version>1.13</version>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+				<version>1.3</version>
 				<executions>
 					<execution>
+						<phase>validate</phase>
 						<goals>
-							<goal>revision</goal>
+							<goal>create-timestamp</goal>
 						</goals>
 					</execution>
 				</executions>
 				<configuration>
-					<entries>
-						<entry>
-							<prefix>svn</prefix>
-						</entry>
-					</entries>
+					<format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
+					<items>
+						<item>timestamp</item>
+					</items>
 				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.tmatesoft.svnkit</groupId>
-						<artifactId>svnkit</artifactId>
-						<version>1.8.10</version>
-					</dependency>
-				</dependencies>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -135,19 +129,20 @@
 						<id>default-static</id>
 						<phase>prepare-package</phase>
 						<configuration>
+							<staticUrl>static</staticUrl>
 							<webappDir>${project.build.directory}/minify</webappDir>
 							<sourceDir>/</sourceDir>
 							<targetDir>${project.build.directory}/statics</targetDir>
 							<staticDir>/</staticDir>
 							<sourceIncludes>
 								<sourceInclude>resources/js/**/*.js</sourceInclude>
-								<sourceInclude>resources/css/**/*.css</sourceInclude>
+								<sourceInclude>resources/app/**/*.js</sourceInclude>
 								<sourceInclude>WEB-INF/views/**/*.html</sourceInclude>
 							</sourceIncludes>
 							<!-- http://static.ubtoc.com/css/index.css?_v=1450321871828 -->
 							<versionSuffix>
-								<suffix>?_v=${svn.revision}</suffix>
-								<exclude>resources/lib/**/*</exclude>
+								<suffix>?_v=${timestamp}</suffix>
+								<exclude>**/lib/**/*,**/ext/**/*</exclude>
 							</versionSuffix>
 						</configuration>
 						<goals>
@@ -156,6 +151,20 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<webResources>
+						<resource>
+							<directory>${project.build.directory}/statics</directory>
+						</resource>
+						<resource>
+							<directory>${project.build.directory}/minify</directory>
+						</resource>
+					</webResources>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>