update 3pp minor version, spring 4.0.1->4.0.2, spring data jpa 1.4.2->1.4.4, tomcat-jdbc 7.0.50->7.0.52, cxf 2.7.9->2.7.10, jedis 2.3.1->2.4.1, mybatis 3.2.4->3.2.5, hystrix 1.3.8->1.3.9, aspectj 1.7.3->1.7.4, selenium 2.39->2.40
This commit is contained in:
@@ -11,14 +11,15 @@
|
||||
<properties>
|
||||
<!-- 主要依赖库的版本定义 -->
|
||||
<springside.version>4.3.0-SNAPSHOT</springside.version>
|
||||
<spring.version>4.0.1.RELEASE</spring.version>
|
||||
<spring.version>4.0.2.RELEASE</spring.version>
|
||||
<hibernate.version>4.3.1.Final</hibernate.version>
|
||||
<spring-data-jpa.version>1.4.2.RELEASE</spring-data-jpa.version>
|
||||
<tomcat-jdbc.version>7.0.50</tomcat-jdbc.version>
|
||||
<spring-data-jpa.version>1.4.4.RELEASE</spring-data-jpa.version>
|
||||
<tomcat-jdbc.version>7.0.52</tomcat-jdbc.version>
|
||||
<sitemesh.version>2.4.2</sitemesh.version>
|
||||
<shiro.version>1.2.2</shiro.version>
|
||||
<hibernate-validator.version>5.0.2.Final</hibernate-validator.version>
|
||||
<hibernate-validator.version>5.0.3.Final</hibernate-validator.version>
|
||||
<jackson.version>2.3.1</jackson.version>
|
||||
<aspectj.version>1.7.4</aspectj.version>
|
||||
<slf4j.version>1.7.6</slf4j.version>
|
||||
<logback.version>1.1.1</logback.version>
|
||||
<commons-lang3.version>3.2.1</commons-lang3.version>
|
||||
@@ -26,7 +27,7 @@
|
||||
<junit.version>4.11</junit.version>
|
||||
<assertj.version>1.5.0</assertj.version>
|
||||
<mockito.version>1.9.5</mockito.version>
|
||||
<selenium.version>2.39.0</selenium.version>
|
||||
<selenium.version>2.40.0</selenium.version>
|
||||
<jetty.version>7.6.14.v20131031</jetty.version>
|
||||
<h2.version>1.3.175</h2.version>
|
||||
|
||||
@@ -94,24 +95,18 @@
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-jpa</artifactId>
|
||||
<version>${spring-data-jpa.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit-dep</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- spring aop -->
|
||||
<dependency>
|
||||
<groupId>org.aspectj</groupId>
|
||||
<artifactId>aspectjrt</artifactId>
|
||||
<version>1.7.3</version>
|
||||
<version>${aspectj.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.aspectj</groupId>
|
||||
<artifactId>aspectjweaver</artifactId>
|
||||
<version>1.7.3</version>
|
||||
<version>${aspectj.version}</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
+10
-16
@@ -11,22 +11,22 @@
|
||||
<properties>
|
||||
<!-- 主要依赖库的版本定义 -->
|
||||
<springside.version>4.3.0-SNAPSHOT</springside.version>
|
||||
<spring.version>4.0.1.RELEASE</spring.version>
|
||||
<spring.version>4.0.2.RELEASE</spring.version>
|
||||
<hibernate.version>4.3.1.Final</hibernate.version>
|
||||
<mybatis.version>3.2.4</mybatis.version>
|
||||
<spring-data-jpa.version>1.4.2.RELEASE</spring-data-jpa.version>
|
||||
<tomcat-jdbc.version>7.0.50</tomcat-jdbc.version>
|
||||
<mybatis.version>3.2.5</mybatis.version>
|
||||
<spring-data-jpa.version>1.4.4.RELEASE</spring-data-jpa.version>
|
||||
<tomcat-jdbc.version>7.0.52</tomcat-jdbc.version>
|
||||
<sitemesh.version>2.4.2</sitemesh.version>
|
||||
<shiro.version>1.2.2</shiro.version>
|
||||
<cxf.version>2.7.9</cxf.version>
|
||||
<cxf.version>2.7.10</cxf.version>
|
||||
<activemq.version>5.7.0</activemq.version>
|
||||
<quartz.version>2.2.1</quartz.version>
|
||||
<jedis.version>2.3.1</jedis.version>
|
||||
<jedis.version>2.4.1</jedis.version>
|
||||
<ehcache.version>2.6.8</ehcache.version>
|
||||
<spymemcached.version>2.10.5</spymemcached.version>
|
||||
<hibernate-validator.version>5.0.2.Final</hibernate-validator.version>
|
||||
<hibernate-validator.version>5.0.3.Final</hibernate-validator.version>
|
||||
<jolokia.version>1.1.5</jolokia.version>
|
||||
<hystrix.version>1.3.8</hystrix.version>
|
||||
<hystrix.version>1.3.9</hystrix.version>
|
||||
<javasimon.version>3.4.0</javasimon.version>
|
||||
<jackson.version>2.3.1</jackson.version>
|
||||
<slf4j.version>1.7.6</slf4j.version>
|
||||
@@ -38,12 +38,12 @@
|
||||
<dozer.version>5.4.0</dozer.version>
|
||||
<httpclient.version>4.3.2</httpclient.version>
|
||||
<freemarker.version>2.3.20</freemarker.version>
|
||||
<aspectj.version>1.7.3</aspectj.version>
|
||||
<aspectj.version>1.7.4</aspectj.version>
|
||||
<junit.version>4.11</junit.version>
|
||||
<assertj.version>1.5.0</assertj.version>
|
||||
<mockito.version>1.9.5</mockito.version>
|
||||
<powermock.version>1.5.4</powermock.version>
|
||||
<selenium.version>2.39.0</selenium.version>
|
||||
<selenium.version>2.40.0</selenium.version>
|
||||
<nosqlunit.version>0.7.9</nosqlunit.version>
|
||||
<jetty.version>7.6.14.v20131031</jetty.version>
|
||||
<h2.version>1.3.175</h2.version>
|
||||
@@ -139,12 +139,6 @@
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-jpa</artifactId>
|
||||
<version>${spring-data-jpa.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit-dep</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- aop -->
|
||||
|
||||
Reference in New Issue
Block a user