Alawn/springside4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spring 3.2.3->3.2.4, selenium 2.33->2.34, h2 1.3.172->1.3.173, jetty 7.6.11->7.6.12, jolokia 1.1.2->1.1.3

Browse Source
This commit is contained in:
Calvin
2013-08-08 23:59:29 +08:00
parent 9d859ce2c0
commit cfffa97fe6
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/quickstart/pom.xml
+6 -6
View File
@@ -11,7 +11,7 @@
<properties>
<!-- 主要依赖库的版本定义 -->
<springside.version>4.1.1-SNAPSHOT</springside.version>
<spring.version>3.2.3.RELEASE</spring.version>
<spring.version>3.2.4.RELEASE</spring.version>
<hibernate.version>4.2.3.Final</hibernate.version>
<spring-data-jpa.version>1.3.4.RELEASE</spring-data-jpa.version>
<tomcat-jdbc.version>7.0.42</tomcat-jdbc.version>
@@ -25,9 +25,9 @@
<guava.version>14.0.1</guava.version>
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<selenium.version>2.33.0</selenium.version>
<jetty.version>7.6.11.v20130520</jetty.version>
<h2.version>1.3.172</h2.version>
<selenium.version>2.34.0</selenium.version>
<jetty.version>7.6.12.v20130726</jetty.version>
<h2.version>1.3.173</h2.version>
<!-- Plugin的属性定义 -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -76,7 +76,7 @@
<version>${springside.version}</version>
</dependency>
<!-- AOP begin -->
<!-- Spring AOP begin -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
@@ -88,7 +88,7 @@
<version>1.7.3</version>
<scope>runtime</scope>
</dependency>
<!-- AOP end -->
<!-- Spring AOP end -->
<!-- PERSISTENCE begin -->
<!-- hibernate -->
modules/parent/pom.xml
+19 -19
View File
@@ -11,7 +11,7 @@
<properties>
<!-- 主要依赖库的版本定义 -->
<springside.version>4.1.1-SNAPSHOT</springside.version>
<spring.version>3.2.3.RELEASE</spring.version>
<spring.version>3.2.4.RELEASE</spring.version>
<hibernate.version>4.2.3.Final</hibernate.version>
<mybatis.version>3.2.2</mybatis.version>
<spring-data-jpa.version>1.3.4.RELEASE</spring-data-jpa.version>
@@ -25,7 +25,7 @@
<ehcache.version>2.6.6</ehcache.version>
<spymemcached.version>2.9.1</spymemcached.version>
<hibernate-validator.version>4.3.1.Final</hibernate-validator.version>
<jolokia.version>1.1.2</jolokia.version>
<jolokia.version>1.1.3</jolokia.version>
<jackson.version>2.2.2</jackson.version>
<slf4j.version>1.7.5</slf4j.version>
<logback.version>1.0.13</logback.version>
@@ -40,9 +40,9 @@
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<powermock.version>1.5.1</powermock.version>
<selenium.version>2.33.0</selenium.version>
<jetty.version>7.6.11.v20130520</jetty.version>
<h2.version>1.3.172</h2.version>
<selenium.version>2.34.0</selenium.version>
<jetty.version>7.6.12.v20130726</jetty.version>
<h2.version>1.3.173</h2.version>
<!-- Plugin的属性定义 -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -111,11 +111,24 @@
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<!-- aop/tx -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.7.3</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.7.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
@@ -128,20 +141,6 @@
<version>${spring.version}</version>
</dependency>
<!-- SPRING basic end -->
<!-- AOP begin-->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.7.3</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.7.3</version>
<scope>runtime</scope>
</dependency>
<!-- AOP end -->
<!-- PERSISTENCE begin -->
<!-- hibernate -->
@@ -316,6 +315,7 @@
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
<scope>runtime</scope>
</dependency>
<!-- JAX-RS end -->