From 29b2d3f0ec4e0c1df1792cd611e9d6be45571a68 Mon Sep 17 00:00:00 2001 From: Calvin Date: Thu, 26 Jul 2012 00:36:06 +0800 Subject: [PATCH] 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 --- examples/quickstart/pom.xml | 25 ++++++++++++--- .../src/main/resources/applicationContext.xml | 2 +- .../src/main/resources/applicationContext.xml | 2 +- modules/parent/pom.xml | 31 ++++++++++--------- .../display-dependency-updates.bat | 4 +-- .../maven-scripts/display-plugin-updates.bat | 5 +++ support/sonar/README.txt | 1 - 7 files changed, 45 insertions(+), 25 deletions(-) create mode 100644 support/maven-scripts/display-plugin-updates.bat diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml index d7f2e269..3237fcb7 100644 --- a/examples/quickstart/pom.xml +++ b/examples/quickstart/pom.xml @@ -12,8 +12,9 @@ 4.0.0.RC4-SNAPSHOT 3.1.2.RELEASE - 4.1.4.Final - 1.1.0.RELEASE + 1.7.0 + 4.1.5.SP1 + 1.1.1.RELEASE 1.4 2.4.2 4.3.0.Final @@ -26,7 +27,7 @@ 1.3.167 4.10 1.9.0 - 2.24.1 + 2.25.0 UTF-8 @@ -38,6 +39,10 @@ ${h2.version} + + 3.0 + + + + org.springframework + spring-tx + ${spring.version} + org.springframework spring-aop @@ -82,7 +92,12 @@ - + + + org.aspectj + aspectjweaver + ${aspectj.version} + cglib cglib @@ -328,7 +343,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.5 + 2.5.1 ${jdk.version} ${jdk.version} diff --git a/examples/quickstart/src/main/resources/applicationContext.xml b/examples/quickstart/src/main/resources/applicationContext.xml index d1437e58..706c5dd0 100644 --- a/examples/quickstart/src/main/resources/applicationContext.xml +++ b/examples/quickstart/src/main/resources/applicationContext.xml @@ -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"> Spring公共配置 diff --git a/examples/showcase/src/main/resources/applicationContext.xml b/examples/showcase/src/main/resources/applicationContext.xml index 7854f621..90ecf22b 100644 --- a/examples/showcase/src/main/resources/applicationContext.xml +++ b/examples/showcase/src/main/resources/applicationContext.xml @@ -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"> Spring公共配置 diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml index bfd8ab9d..22b85787 100644 --- a/modules/parent/pom.xml +++ b/modules/parent/pom.xml @@ -12,19 +12,20 @@ 4.0.0.RC4-SNAPSHOT 3.1.2.RELEASE - 4.1.4.Final + 1.7.0 + 4.1.5.SP1 3.1.1 - 1.1.0.RELEASE + 1.1.1.RELEASE 1.4 2.4.2 1.2.0 2.6.1 5.5.1 2.1.5 - 2.5.2 + 2.6.0 2.8.1 4.3.0.Final - 1.0.4 + 1.0.5 2.0.4 1.6.6 1.2.17 @@ -33,18 +34,23 @@ 12.0 2.1 5.3.2 + 4.2.1 2.3.19 4.10 1.9.0 1.4.12 - 2.24.1 - 7.6.4.v20120524 - 1.3.167 + 2.25.0 + 7.6.5.v20120716 + 1.3.168 UTF-8 1.6 + + + 3.0 + @@ -144,15 +150,10 @@ spring-tx ${spring.version} - - org.aspectj - aspectjrt - 1.6.9 - org.aspectj aspectjweaver - 1.6.9 + ${aspectj.version} cglib @@ -559,7 +560,7 @@ org.apache.httpcomponents httpclient - 4.2 + ${httpclient.version} @@ -727,7 +728,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.5 + 2.5.1 ${jdk.version} ${jdk.version} diff --git a/support/maven-scripts/display-dependency-updates.bat b/support/maven-scripts/display-dependency-updates.bat index d0641557..100e87bd 100644 --- a/support/maven-scripts/display-dependency-updates.bat +++ b/support/maven-scripts/display-dependency-updates.bat @@ -1,5 +1,5 @@ @echo off -cd ../../modules/parent -call mvn versions:display-property-updates +cd ../../ +call mvn versions:display-dependency-updates pause \ No newline at end of file diff --git a/support/maven-scripts/display-plugin-updates.bat b/support/maven-scripts/display-plugin-updates.bat new file mode 100644 index 00000000..d1ef6d01 --- /dev/null +++ b/support/maven-scripts/display-plugin-updates.bat @@ -0,0 +1,5 @@ +@echo off + +cd ../../ +call mvn versions:display-plugin-updates +pause \ No newline at end of file diff --git a/support/sonar/README.txt b/support/sonar/README.txt index 2eb95d3f..b8bfff58 100644 --- a/support/sonar/README.txt +++ b/support/sonar/README.txt @@ -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 \ No newline at end of file