Skip to content

Commit

Permalink
update 3pp version
Browse files Browse the repository at this point in the history
  • Loading branch information
@calvin1978
calvin1978 committed Mar 4, 2013
1 parent 436fe2b commit a4297ce
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 31 deletions.
18 changes: 9 additions & 9 deletions examples/quickstart/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@
<properties>
<!-- 主要依赖库的版本定义 -->
<springside.version>4.1.0-SNAPSHOT</springside.version>
<spring.version>3.2.0.RELEASE</spring.version>
<spring.version>3.2.1.RELEASE</spring.version>
<hibernate.version>4.1.9.Final</hibernate.version>
<spring-data-jpa.version>1.2.0.RELEASE</spring-data-jpa.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<sitemesh.version>2.4.2</sitemesh.version>
<shiro.version>1.2.1</shiro.version>
<hibernate-validator.version>4.3.1.Final</hibernate-validator.version>
<jackson.version>2.1.2</jackson.version>
<jackson.version>2.1.4</jackson.version>
<slf4j.version>1.7.2</slf4j.version>
<logback.version>1.0.9</logback.version>
<commons-lang3.version>3.1</commons-lang3.version>
<guava.version>13.0.1</guava.version>
<guava.version>14.0</guava.version>
<joda-time.version>2.1</joda-time.version>
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<selenium.version>2.28.0</selenium.version>
<jetty.version>7.6.8.v20121106</jetty.version>
<selenium.version>2.31.0</selenium.version>
<jetty.version>7.6.9.v20130131</jetty.version>
<h2.version>1.3.170</h2.version>

<!-- Plugin的属性定义 -->
Expand Down Expand Up @@ -89,12 +89,12 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<scope>runtime</scope>
</dependency>
<!-- AOP end -->
Expand Down Expand Up @@ -189,7 +189,7 @@
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
<version>2.6.2</version>
<version>2.6.5</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand Down Expand Up @@ -436,7 +436,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
<version>2.13</version>
<configuration>
<includes>
<include>**/*Test.java</include>
Expand Down
38 changes: 16 additions & 22 deletions modules/parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,35 @@
<properties>
<!-- 主要依赖库的版本定义 -->
<springside.version>4.1.0-SNAPSHOT</springside.version>
<spring.version>3.2.0.RELEASE</spring.version>
<spring.version>3.2.1.RELEASE</spring.version>
<hibernate.version>4.1.9.Final</hibernate.version>
<mybatis.version>3.1.1</mybatis.version>
<mybatis.version>3.2.0</mybatis.version>
<spring-data-jpa.version>1.2.0.RELEASE</spring-data-jpa.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<sitemesh.version>2.4.2</sitemesh.version>
<shiro.version>1.2.1</shiro.version>
<cxf.version>2.7.1</cxf.version>
<cxf.version>2.7.3</cxf.version>
<activemq.version>5.7.0</activemq.version>
<quartz.version>2.1.6</quartz.version>
<ehcache.version>2.6.2</ehcache.version>
<ehcache.version>2.6.5</ehcache.version>
<spymemcached.version>2.8.9</spymemcached.version>
<hibernate-validator.version>4.3.1.Final</hibernate-validator.version>
<jolokia.version>1.0.6</jolokia.version>
<jackson.version>2.1.2</jackson.version>
<jolokia.version>1.1.0</jolokia.version>
<jackson.version>2.1.4</jackson.version>
<slf4j.version>1.7.2</slf4j.version>
<logback.version>1.0.9</logback.version>
<commons-lang3.version>3.1</commons-lang3.version>
<commons-io.version>2.4</commons-io.version>
<guava.version>14.0-rc2</guava.version>
<guava.version>14.0</guava.version>
<joda-time.version>2.1</joda-time.version>
<dozer.version>5.4.0</dozer.version>
<httpclient.version>4.2.2</httpclient.version>
<httpclient.version>4.2.3</httpclient.version>
<freemarker.version>2.3.19</freemarker.version>
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<powermock.version>1.5</powermock.version>
<selenium.version>2.28.0</selenium.version>
<jetty.version>7.6.8.v20121106</jetty.version>
<selenium.version>2.31.0</selenium.version>
<jetty.version>7.6.9.v20130131</jetty.version>
<h2.version>1.3.170</h2.version>

<!-- Plugin的属性定义 -->
Expand Down Expand Up @@ -148,12 +148,12 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<scope>runtime</scope>
</dependency>
<!-- AOP end -->
Expand Down Expand Up @@ -198,7 +198,7 @@
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
<version>1.1.1</version>
<version>1.2.0</version>
</dependency>

<!-- spring orm -->
Expand Down Expand Up @@ -537,17 +537,11 @@
<artifactId>joda-time-jsptags</artifactId>
<version>1.1.1</version>
</dependency>
<!-- joda for hibernate -->
<dependency>
<groupId>org.jadira.usertype</groupId>
<artifactId>usertype.core</artifactId>
<version>3.0.0.GA</version>
</dependency>
<!-- joda for jackson -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson.version}</version>
<version>2.1.2</version>
</dependency>
<!-- GENERAL UTILS end -->

Expand Down Expand Up @@ -589,7 +583,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.5</version>
<version>1.4.6</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
Expand Down Expand Up @@ -754,7 +748,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
<version>2.13</version>
<configuration>
<includes>
<include>**/*Test.java</include>
Expand Down

0 comments on commit a4297ce

Please sign in to comment.