diff --git a/oxm-tiger/pom.xml b/oxm-tiger/pom.xml
index a885bab0..83bc48f9 100644
--- a/oxm-tiger/pom.xml
+++ b/oxm-tiger/pom.xml
@@ -8,14 +8,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-oxm-tiger</artifactId>
     <name>Spring O/X Mapping - Java 5</name>
-    <repositories>
-        <repository>
-            <id>maven-repository.dev.java.net</id>
-            <name>Java.net Repository for Maven</name>
-            <url>https://maven-repository.dev.java.net/nonav/repository</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
     <build>
         <plugins>
             <plugin>
diff --git a/oxm/pom.xml b/oxm/pom.xml
index 813dc47b..0f1a5929 100644
--- a/oxm/pom.xml
+++ b/oxm/pom.xml
@@ -154,12 +154,24 @@
             <version>1.0.6</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-libs</artifactId>
+            <version>1.0.6</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
             <version>1.0.6</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.sun.msv.datatype.xsd</groupId>
+            <artifactId>xsdlib</artifactId>
+            <version>20060615</version>
+            <scope>test</scope>
+        </dependency>
         <!-- XMLBeans -->
         <dependency>
             <groupId>xmlbeans</groupId>
diff --git a/pom.xml b/pom.xml
index 401b4192..0716667e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,8 @@
         <url>http://opensource2.atlassian.com/projects/spring/browse/SWS</url>
     </issueManagement>
     <ciManagement>
-        <system>continuum</system>
+        <system>bamboo</system>
+        <url>http://build.springframework.org:8085/bamboo/</url>
         <notifiers>
             <notifier>
                 <type>mail</type>
@@ -130,14 +131,9 @@
     </properties>
     <repositories>
         <repository>
-            <id>spring-ext</id>
-            <name>Spring External Dependencies Repository</name>
-            <url>https://svn.sourceforge.net/svnroot/springframework/repos/repo-ext/</url>
-        </repository>
-        <repository>
-            <id>maven2-repository.dev.java.net</id>
+            <id>java.net</id>
             <name>Java.net Repository for Maven2</name>
-            <url>https://maven-repository.dev.java.net/nonav/repository</url>
+            <url>http://download.java.net/maven/1/</url>
             <layout>legacy</layout>
         </repository>
     </repositories>
diff --git a/security/pom.xml b/security/pom.xml
index d83d4cc1..0c17dc83 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -10,6 +10,13 @@
     <packaging>jar</packaging>
     <name>Spring WS Security</name>
     <description>Spring-WS WS-Security implementation</description>
+    <repositories>
+        <repository>
+            <id>spring-ext</id>
+            <name>Spring External Dependencies Repository</name>
+            <url>https://svn.sourceforge.net/svnroot/springframework/repos/repo-ext/</url>
+        </repository>
+    </repositories>
     <dependencies>
         <!-- Spring-WS dependencies -->
         <dependency>