diff --git a/core/pom.xml b/core/pom.xml
index d3adf668ee9ca7c48d23b14e115b7bead982e44b..fa1e30090a182a78614666b12917fcf295c87456 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -146,97 +146,6 @@
         </plugins>
       </reporting>
     </profile>
-    <profile>
-      <id>hudson-libs-local</id>
-      <!-- if we have the libs checked out of CVS, use them directly -->
-      <activation>
-        <file>
-          <exists>main/lib</exists>
-          <!-- this is relative to the current directory where you start
-             maven.  Most likely if building for the first time
-             you will be in ../.. relative to this pom.xml. So we
-             use that path in order to speed you up.
-        -->
-        </file>
-      </activation>
-      <repositories>
-        <!-- checking the file system is fastest of all -->
-        <repository>
-          <id>hudson-libs</id>
-          <url>file:main/lib</url>
-          <layout>legacy</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <!-- put central second to speed majority artifact resolution -->
-        <repository>
-          <id>central</id>
-          <url>http://repo1.maven.org/maven2</url>
-          <releases>
-            <enabled>true</enabled>
-            <!-- only look for jars here when they are not present locally -->
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <!-- last, but not least -->
-        <repository>
-          <id>java.net2</id>
-          <url>http://download.java.net/maven/2/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-    <profile>
-      <id>hudson-libs-remote</id>
-      <!-- otherwise, we'll have to use the slower route -->
-      <activation>
-        <file>
-          <missing>main/lib</missing>
-        </file>
-      </activation>
-      <repositories>
-        <!-- put central first to speed majority artifact resolution -->
-        <repository>
-          <id>central</id>
-          <url>http://repo1.maven.org/maven2</url>
-          <releases>
-            <enabled>true</enabled>
-            <!-- only look for jars here when they are not present locally -->
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <!-- put hudson-libs last as it is the slowest to access -->
-        <repository>
-          <id>hudson-libs</id>
-          <url>https://hudson.dev.java.net/source/browse/*checkout*/hudson/hudson/main/lib</url>
-          <layout>legacy</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
   </profiles>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index eef85ae9554b81a4fae5e16f6e4bd80c0171f6fa..720c598d124be7d0efa746c9afa0c6457cc40b7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,11 +104,10 @@
   
   <repositories>
     <repository>
-      <id>java.net2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>m.g.o-public</id>
+      <url>http://maven.glassfish.org/content/groups/public/</url>
       <releases>
         <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
       </releases>
       <snapshots>
         <enabled>false</enabled>
@@ -116,6 +115,19 @@
     </repository>
   </repositories>
 
+  <pluginRepositories>
+    <pluginRepository>
+      <id>m.g.o-public</id>
+      <url>http://maven.glassfish.org/content/groups/public/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <licenses>
     <license>
       <name>The MIT license</name>
diff --git a/war/pom.xml b/war/pom.xml
index f7ef22d6a623def04e0367c4a6ba10016d3193a6..8f5d77074f79fa9f904a647403e2e8f716a55dca 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -265,104 +265,6 @@
   </pluginRepositories>
 
   <profiles>
-    <profile>
-      <id>hudson-libs-local</id>
-      <!-- if we have the libs checked out of CVS, use them directly -->
-      <activation>
-        <file>
-          <exists>main/lib</exists>
-        </file>
-      </activation>
-      <repositories>
-        <!-- checking the file system is fastest of all -->
-        <repository>
-          <id>hudson-libs</id>
-          <url>file:main/lib</url>
-          <layout>legacy</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <!-- put central second to speed majority artifact resolution -->
-        <repository>
-          <id>central</id>
-          <url>http://repo1.maven.org/maven2</url>
-          <releases>
-            <enabled>true</enabled>
-            <!-- only look for jars here when they are not present locally -->
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <!-- last, but not least -->
-        <repository>
-          <id>java.net2</id>
-          <url>http://download.java.net/maven/2</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-    <profile>
-      <id>hudson-libs-remote</id>
-      <!-- otherwise, we'll have to use the slower route -->
-      <activation>
-        <file>
-          <missing>main/lib</missing>
-        </file>
-      </activation>
-      <repositories>
-        <!-- put central first to speed majority artifact resolution -->
-        <repository>
-          <id>central</id>
-          <url>http://repo1.maven.org/maven2</url>
-          <releases>
-            <enabled>true</enabled>
-            <!-- only look for jars here when they are not present locally -->
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <!-- put java.net2 second, as it's faster than the https CVS access -->
-        <repository>
-          <id>java.net2</id>
-          <url>http://download.java.net/maven/2/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <!-- put hudson-libs last as it is the slowest to access -->
-        <repository>
-          <id>hudson-libs</id>
-          <url>https://hudson.dev.java.net/source/browse/*checkout*/hudson/hudson/main/lib</url>
-          <layout>legacy</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
     <profile>
       <!-- profile for creating Hudson IPS package -->
       <id>ips</id>