merged the changes from the RC branch needed to pass the tests

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@19034 71c3de6d-444a-0410-be80-ed276b4c234a

core/pom.xml

@@ -564,17 +564,17 @@ THE SOFTWARE.
       -->
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>2.5.6</version>
+      <version>2.5</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>2.5.6</version>
+      <version>2.5</version>
     </dependency>
     <dependency><!-- Hudson core doesn't use it but HUDSON-3811 requires us to put it. -->
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>2.5.6</version>
+      <version>2.5</version>
     </dependency>
     <dependency>
       <groupId>xpp3</groupId>

war/pom.xml

@@ -112,7 +112,7 @@ THE SOFTWARE.
                 <!-- bundled plugins -->
                 <resolveArtifact groupId="${project.groupId}" artifactId="maven-plugin" version="${project.version}" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/maven-plugin.hpi" />
                 <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="ssh-slaves" version="0.5.2" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/ssh-slaves.hpi" />
-                <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="subversion" version="1.0" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/subversion.hpi" />
+                <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="subversion" version="1.1" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/subversion.hpi" />
               </tasks>
             </configuration>
           </execution>