|
|
@@ -9,6 +9,7 @@
|
|
|
<groupId>com.uas.platform</groupId>
|
|
|
<artifactId>platform</artifactId>
|
|
|
<version>0.0.1-SNAPSHOT</version>
|
|
|
+ <relativePath>../platform</relativePath>
|
|
|
</parent>
|
|
|
<profiles>
|
|
|
<profile>
|
|
|
@@ -29,10 +30,8 @@
|
|
|
<!-- static plugin -->
|
|
|
<static-path>static</static-path>
|
|
|
</properties>
|
|
|
- <!-- 默认 -->
|
|
|
- <activation>
|
|
|
- <activeByDefault>true</activeByDefault>
|
|
|
- </activation>
|
|
|
+
|
|
|
+
|
|
|
</profile>
|
|
|
<profile>
|
|
|
<!-- 生产环境 -->
|
|
|
@@ -42,6 +41,10 @@
|
|
|
<!-- static plugin -->
|
|
|
<static-path>http://static.ubtob.com</static-path>
|
|
|
</properties>
|
|
|
+ <!-- 默认 -->
|
|
|
+ <activation>
|
|
|
+ <activeByDefault>true</activeByDefault>
|
|
|
+ </activation>
|
|
|
</profile>
|
|
|
</profiles>
|
|
|
<dependencies>
|
|
|
@@ -172,10 +175,17 @@
|
|
|
<artifactId>hibernate-ehcache</artifactId>
|
|
|
</dependency>
|
|
|
<!-- jdbc -->
|
|
|
+ <!--oracle-->
|
|
|
<dependency>
|
|
|
<groupId>com.oracle</groupId>
|
|
|
<artifactId>ojdbc6</artifactId>
|
|
|
</dependency>
|
|
|
+ <!-- mysql -->
|
|
|
+ <dependency>
|
|
|
+ <groupId>mysql</groupId>
|
|
|
+ <artifactId>mysql-connector-java</artifactId>
|
|
|
+ <version>5.1.21</version>
|
|
|
+ </dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.springframework</groupId>
|
|
|
<artifactId>spring-orm</artifactId>
|
|
|
@@ -278,6 +288,12 @@
|
|
|
<version>0.0.1-SNAPSHOT</version>
|
|
|
</dependency>
|
|
|
|
|
|
+ <!--<dependency>-->
|
|
|
+ <!--<groupId>com.uas.sso</groupId>-->
|
|
|
+ <!--<artifactId>sso-common</artifactId>-->
|
|
|
+ <!--<version>0.0.1-SNAPSHOT</version>-->
|
|
|
+ <!--</dependency>-->
|
|
|
+
|
|
|
<dependency>
|
|
|
<groupId>com.uas.ps</groupId>
|
|
|
<artifactId>ps-core</artifactId>
|
|
|
@@ -342,7 +358,7 @@
|
|
|
</resources>
|
|
|
<!-- 在maven生命周期validate阶段生成timestamp -->
|
|
|
<plugins>
|
|
|
- <plugin>
|
|
|
+ <!--<plugin>
|
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
|
<artifactId>buildnumber-maven-plugin</artifactId>
|
|
|
<version>1.3</version>
|
|
|
@@ -355,10 +371,12 @@
|
|
|
</execution>
|
|
|
</executions>
|
|
|
<configuration>
|
|
|
- <format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
|
|
|
- <items>
|
|
|
- <item>timestamp</item>
|
|
|
- </items>
|
|
|
+ <configuration>
|
|
|
+ <format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
|
|
|
+ <items>
|
|
|
+ <item>timestamp</item>
|
|
|
+ </items>
|
|
|
+ </configuration>
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
<plugin>
|
|
|
@@ -373,7 +391,7 @@
|
|
|
<groupId>com.samaxes.maven</groupId>
|
|
|
<artifactId>minify-maven-plugin</artifactId>
|
|
|
<version>1.7.4</version>
|
|
|
- <!-- 静态文件压缩 -->
|
|
|
+ <!– 静态文件压缩 –>
|
|
|
<executions>
|
|
|
<execution>
|
|
|
<id>default-minify</id>
|
|
|
@@ -434,7 +452,7 @@
|
|
|
<groupId>com.uas.plugins</groupId>
|
|
|
<artifactId>static-maven-plugin</artifactId>
|
|
|
<version>0.0.2-SNAPSHOT</version>
|
|
|
- <!-- 静态资源分离 -->
|
|
|
+ <!– 静态资源分离 –>
|
|
|
<executions>
|
|
|
<execution>
|
|
|
<id>default-static</id>
|
|
|
@@ -452,6 +470,7 @@
|
|
|
<sourceInclude>resources/tpl/**/*.html</sourceInclude>
|
|
|
<sourceInclude>WEB-INF/views/**/*.html</sourceInclude>
|
|
|
</sourceIncludes>
|
|
|
+ http://static.ubtob.com/css/index.css?_v=1450321871828
|
|
|
<versionSuffix>
|
|
|
<suffix>?_v=${timestamp}</suffix>
|
|
|
<exclude>*/require.js,*.min.js,*.min.css</exclude>
|
|
|
@@ -477,7 +496,7 @@
|
|
|
</resource>
|
|
|
</webResources>
|
|
|
</configuration>
|
|
|
- </plugin>
|
|
|
+ </plugin>-->
|
|
|
<plugin>
|
|
|
<groupId>org.apache.tomcat.maven</groupId>
|
|
|
<artifactId>tomcat7-maven-plugin</artifactId>
|
|
|
@@ -489,7 +508,7 @@
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
</plugins>
|
|
|
- <pluginManagement>
|
|
|
+ <!--<pluginManagement>
|
|
|
<plugins>
|
|
|
<plugin>
|
|
|
<groupId>org.eclipse.m2e</groupId>
|
|
|
@@ -524,7 +543,7 @@
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
</plugins>
|
|
|
- </pluginManagement>
|
|
|
+ </pluginManagement>-->
|
|
|
</build>
|
|
|
<properties>
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|