upgrade to spring 2.5.4

JumpMind · May 14, 2008 · 08beaab · 08beaab
1 parent 88d5214
commit 08beaab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 35 deletions.
diff --git a/symmetric/pom.xml b/symmetric/pom.xml
@@ -127,9 +127,11 @@
       <name>SymmetricDS Repo</name>
       <url>scp://shell.sourceforge.net/home/groups/s/sy/symmetricds/htdocs/repo</url>
     </snapshotRepository>
-  </distributionManagement>
-  <properties>
-    <springframework-release-version>2.5.2</springframework-release-version>
+  </distributionManagement>
+
+  <properties>
+    <wtpVersion>1.5</wtpVersion>
+    <springframework-release-version>2.5.4</springframework-release-version>
     <docbook.source>${basedir}/src/docbook</docbook.source>
     <docbook.target>${basedir}/target/site/guide</docbook.target>
   </properties>
@@ -323,37 +325,7 @@
     <!-- Spring Framework -->
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>${springframework-release-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>${springframework-release-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
-      <version>${springframework-release-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>${springframework-release-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-      <version>${springframework-release-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>${springframework-release-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
+      <artifactId>spring</artifactId>
       <version>${springframework-release-version}</version>
     </dependency>
     <dependency>

diff --git a/symmetric/src/changes/changes.xml b/symmetric/src/changes/changes.xml
@@ -37,7 +37,7 @@
         Added a thick client configuration and administration utility application.
         </action>
       -->
-      <action dev="chenson42" type="add">Upgrade to Spring Framework 2.5.1.</action>
+      <action dev="chenson42" type="add">Upgrade to Spring Framework 2.5.4.</action>
       <action dev="knaas" type="add">
         Make changes to the filter and servlet configuration so the web.xml does not contain dynamic
         configuration information. From this point forward we will provide a standard web.xml and