diff --git a/symmetric/pom.xml b/symmetric/pom.xml
index ec3734eda8..102e756a09 100644
--- a/symmetric/pom.xml
+++ b/symmetric/pom.xml
@@ -118,7 +118,7 @@
2.4
- 2.0.7
+ 2.5.1
${basedir}/src/docbook
${basedir}/target/site/guide
@@ -137,11 +137,6 @@
-
- org.apache.maven.plugins
- maven-scm-plugin
- 1.0
-
maven-compiler-plugin
@@ -154,8 +149,6 @@
maven-surefire-plugin
${surefire-report-release-version}
-
- true
javassist-write-dir
@@ -167,18 +160,6 @@
${user.home}\.symmetricds\lib\ojdbc14.jar
-
-
- integration-test
-
- test
-
-
- false
- continuous
-
-
-
maven-assembly-plugin
@@ -199,28 +180,8 @@
symmetric-ds-${pom.version}
-
-
- maven-jar-plugin
-
org.apache.maven.plugins
maven-site-plugin
@@ -337,19 +298,6 @@
-
- org.apache.maven.plugins
- maven-changes-plugin
-
-
-
- announcement-generate
-
- announcement-generate
-
-
-
-
@@ -415,18 +363,6 @@
-
-
- java.net
- http://download.java.net/maven/2/
-
-
-
-
- apache.snapshots
- http://people.apache.org/repo/m2-snapshot-repository/
-
-
org.springframework
- spring-jdbc
- ${springframework-release-version}
-
-
- org.springframework
- spring-web
- ${springframework-release-version}
-
-
- org.springframework
- spring-aop
- ${springframework-release-version}
-
-
- org.springframework
- spring-jmx
+ spring
${springframework-release-version}
@@ -479,7 +400,7 @@
javax.servlet
servlet-api
- 2.4
+ 2.5
net.sourceforge.javawebparts
@@ -492,6 +413,11 @@
commons-io
1.3.2
+
+ commons-logging
+ commons-logging
+ 1.1.1
+
commons-lang
commons-lang
@@ -516,6 +442,7 @@
rome
rome
0.9
+ provided
@@ -528,13 +455,6 @@
TableLayout
20050920
-
org.apache.derby
diff --git a/symmetric/src/changes/changes.xml b/symmetric/src/changes/changes.xml
index 07611bd958..c24ab01796 100644
--- a/symmetric/src/changes/changes.xml
+++ b/symmetric/src/changes/changes.xml
@@ -9,6 +9,9 @@
Added a thick client configuration and administration utility application.
+
+ Upgrade to Spring Framework 2.5.1.
+
The oracle dialect should select from user_objects vs. all_objects to determine if the
package variable has been installed.
diff --git a/symmetric/src/shortcuts/Symmetric Compile and Package Only.launch b/symmetric/src/shortcuts/Symmetric Compile and Package Only.launch
index 2d0bd7d2c0..a9b1797161 100644
--- a/symmetric/src/shortcuts/Symmetric Compile and Package Only.launch
+++ b/symmetric/src/shortcuts/Symmetric Compile and Package Only.launch
@@ -6,6 +6,6 @@
-
+
diff --git a/symmetric/src/shortcuts/Symmetric Eclipse.launch b/symmetric/src/shortcuts/Symmetric Eclipse.launch
index 940fcae37b..49375dcb5b 100644
--- a/symmetric/src/shortcuts/Symmetric Eclipse.launch
+++ b/symmetric/src/shortcuts/Symmetric Eclipse.launch
@@ -1,10 +1,11 @@
+
-
+
diff --git a/symmetric/src/shortcuts/Symmetric Test And Package.launch b/symmetric/src/shortcuts/Symmetric Test And Package.launch
index c99555d19d..b033a68523 100644
--- a/symmetric/src/shortcuts/Symmetric Test And Package.launch
+++ b/symmetric/src/shortcuts/Symmetric Test And Package.launch
@@ -6,6 +6,6 @@
-
+
diff --git a/symmetric/src/shortcuts/Symmetric Test.launch b/symmetric/src/shortcuts/Symmetric Test.launch
deleted file mode 100644
index e10bd75a98..0000000000
--- a/symmetric/src/shortcuts/Symmetric Test.launch
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-