upgrade 3PP version:

hibernate 4.1.4->4.1.5, spring-data-jpa 1.1.0->1.1.1, jolokia 1.0.4->1.0.5, selenium 2.24.1->2.25.0, http-client 4.2.0->4.2.1, ehcache 2.5.2->2.6.0, aspectj 1.6.9->1.7.0, jetty 7.6.4->7.6.5, h2 1.3.167->1.3.168
This commit is contained in:
Calvin
2012-07-26 00:36:06 +08:00
parent 13bd2a3740
commit 29b2d3f0ec
7 changed files with 45 additions and 25 deletions
+20 -5
View File
@@ -12,8 +12,9 @@
<!-- 主要依赖库的版本定义 -->
<springside.version>4.0.0.RC4-SNAPSHOT</springside.version>
<spring.version>3.1.2.RELEASE</spring.version>
<hibernate.version>4.1.4.Final</hibernate.version>
<spring-data-jpa.version>1.1.0.RELEASE</spring-data-jpa.version>
<aspectj.version>1.7.0</aspectj.version>
<hibernate.version>4.1.5.SP1</hibernate.version>
<spring-data-jpa.version>1.1.1.RELEASE</spring-data-jpa.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<sitemesh.version>2.4.2</sitemesh.version>
<hibernate-validator.version>4.3.0.Final</hibernate-validator.version>
@@ -26,7 +27,7 @@
<h2.version>1.3.167</h2.version>
<junit.version>4.10</junit.version>
<mockito.version>1.9.0</mockito.version>
<selenium.version>2.24.1</selenium.version>
<selenium.version>2.25.0</selenium.version>
<!-- Plugin的属性定义 -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,6 +39,10 @@
<jdbc.driver.version>${h2.version}</jdbc.driver.version>
</properties>
<prerequisites>
<maven>3.0</maven>
</prerequisites>
<!-- 设定仓库 如有Nexus私服, 取消注释并指向正确的服务器地址.
<repositories>
<repository>
@@ -71,6 +76,11 @@
</dependency>
<!-- SPRING begin -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
@@ -82,7 +92,12 @@
</exclusion>
</exclusions>
</dependency>
<!-- <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> <version>1.6.9</version> </dependency> -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>${aspectj.version}</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
@@ -328,7 +343,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5</version>
<version>2.5.1</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
@@ -9,7 +9,7 @@
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd
http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"
http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.1.xsd"
default-lazy-init="true">
<description>Spring公共配置 </description>
@@ -9,7 +9,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"
http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.1.xsd"
default-lazy-init="true">
<description>Spring公共配置</description>
+16 -15
View File
@@ -12,19 +12,20 @@
<!-- 主要依赖库的版本定义 -->
<springside.version>4.0.0.RC4-SNAPSHOT</springside.version>
<spring.version>3.1.2.RELEASE</spring.version>
<hibernate.version>4.1.4.Final</hibernate.version>
<aspectj.version>1.7.0</aspectj.version>
<hibernate.version>4.1.5.SP1</hibernate.version>
<mybatis.version>3.1.1</mybatis.version>
<spring-data-jpa.version>1.1.0.RELEASE</spring-data-jpa.version>
<spring-data-jpa.version>1.1.1.RELEASE</spring-data-jpa.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<sitemesh.version>2.4.2</sitemesh.version>
<shiro.version>1.2.0</shiro.version>
<cxf.version>2.6.1</cxf.version>
<activemq.version>5.5.1</activemq.version>
<quartz.version>2.1.5</quartz.version>
<ehcache.version>2.5.2</ehcache.version>
<ehcache.version>2.6.0</ehcache.version>
<spymemcached.version>2.8.1</spymemcached.version>
<hibernate-validator.version>4.3.0.Final</hibernate-validator.version>
<jolokia.version>1.0.4</jolokia.version>
<jolokia.version>1.0.5</jolokia.version>
<jackson.version>2.0.4</jackson.version>
<slf4j.version>1.6.6</slf4j.version>
<log4j.version>1.2.17</log4j.version>
@@ -33,18 +34,23 @@
<guava.version>12.0</guava.version>
<joda-time.version>2.1</joda-time.version>
<dozer.version>5.3.2</dozer.version>
<httpclient.version>4.2.1</httpclient.version>
<freemarker.version>2.3.19</freemarker.version>
<junit.version>4.10</junit.version>
<mockito.version>1.9.0</mockito.version>
<powermock.version>1.4.12</powermock.version>
<selenium.version>2.24.1</selenium.version>
<jetty.version>7.6.4.v20120524</jetty.version>
<h2.version>1.3.167</h2.version>
<selenium.version>2.25.0</selenium.version>
<jetty.version>7.6.5.v20120716</jetty.version>
<h2.version>1.3.168</h2.version>
<!-- Plugin的属性定义 -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>1.6</jdk.version>
</properties>
<prerequisites>
<maven>3.0</maven>
</prerequisites>
<!-- 设定除中央仓库(repo1.maven.org/maven2/)外的其他仓库,按设定顺序进行查找. -->
<repositories>
@@ -144,15 +150,10 @@
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.6.9</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.9</version>
<version>${aspectj.version}</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
@@ -559,7 +560,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.2</version>
<version>${httpclient.version}</version>
</dependency>
<!-- template engine -->
@@ -727,7 +728,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5</version>
<version>2.5.1</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
@@ -1,5 +1,5 @@
@echo off
cd ../../modules/parent
call mvn versions:display-property-updates
cd ../../
call mvn versions:display-dependency-updates
pause
@@ -0,0 +1,5 @@
@echo off
cd ../../
call mvn versions:display-plugin-updates
pause
-1
View File
@@ -1,6 +1,5 @@
Exported Sonar profile.
sonar-*.xml are backup from sonar-2.13.1
springside-*.xml is a springside version base on sonar default profle.
please see the wiki: https://github.com/springside/springside4/wiki/Sonar