[PATCH] pom tweaking (was Re: Building from source takes ages)

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] pom tweaking (was Re: Building from source takes ages)

Jorg Heymans-4
Including the patch inline here, hope that's OK. Some more optimizations can be done though. For example, for all poms where you define a custom <repository> or <pluginrepository> you should define repo1 as a repository *before* the custom one. The reasoning is that the custom repo will only serve a few jars, but will be contacted for all jars needed for that module. Therefore if we put repo1 before the custom one, it will still get called first for most dependencies.

Also, i noticed that the maven-hpi-plugin is referenced as 1.7 and 1.9 , and the codeviation pom probably contains too many repositories as well didn't verify that one properly.

HTH
Jorg

Index: pom.xml
===================================================================
RCS file: /cvs/hudson/hudson/pom.xml,v
retrieving revision 1.14
diff -u -r1.14 pom.xml
--- pom.xml    14 Jun 2007 17:03:43 -0000    1.14
+++ pom.xml    26 Jul 2007 18:40:32 -0000
@@ -16,39 +16,56 @@
  
   <pluginRepositories>
     <pluginRepository>
-      <id>java.net2</id>
-      <url> http://download.java.net/maven/2/</url>
+      <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>
     </pluginRepository>
     <pluginRepository>
-      <id>central</id>
-      <url> http://www.ibiblio.org/maven2</url>
+      <id>java.net2</id>
+      <url>http://download.java.net/maven/2/ </url>
     </pluginRepository>
   </pluginRepositories>
  
   <repositories>
-    <repository>
+    <!--repository>
+      <id>central</id>
+      <url> http://repo1.maven.org/maven2</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository-->
+    <!--repository>
       <id> java.net</id>
       <url>http://download.java.net/maven/1/</url>
       <layout>legacy</layout>
-    </repository>
-    <repository>
+    </repository-->
+    <!--repository>
       <id>java.net2</id>
       <url>http://download.java.net/maven/2/</url>
-    </repository>
-    <repository>
-      <id>central</id>
-      <url>http://www.ibiblio.org/maven2</url>
-    </repository>
-    <repository>
-      <id>central1</id>
-      <url>http://www.ibiblio.org/maven</url>
-      <layout>legacy</layout>
-    </repository>
-    <repository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository-->
+    <!---repository>
       <id>hudson-libs</id>
       <url> https://hudson.dev.java.net/source/browse/*checkout*/hudson/hudson/main/lib</url>
       <layout>legacy</layout>
-    </repository>
+    </repository-->
   </repositories>
 
   <distributionManagement>
Index: main/core/pom.xml
===================================================================
RCS file: /cvs/hudson/hudson/main/core/pom.xml,v
retrieving revision 1.198
diff -u -r1.198 pom.xml
--- main/core/pom.xml    15 Jul 2007 16:14:46 -0000    1.198
+++ main/core/pom.xml    26 Jul 2007 18:40:32 -0000
@@ -10,7 +10,37 @@
   <artifactId>hudson-core</artifactId>
   <packaging>stapler-jar</packaging>
   <name>Hudson core</name>

+
+  <repositories>
+    <repository>
+      <id>hudson-libs</id>
+      <url> https://hudson.dev.java.net/source/browse/*checkout*/hudson/hudson/main/lib</url>
+      <layout>legacy</layout>
+    </repository>
+    <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>
+    <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>
   <build>
     <plugins>
       <plugin>
@@ -258,4 +288,4 @@
       <version>20070616</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
Index: main/war/pom.xml
===================================================================
RCS file: /cvs/hudson/hudson/main/war/pom.xml,v
retrieving revision 1.169
diff -u -r1.169 pom.xml
--- main/war/pom.xml    15 Jul 2007 16:14:46 -0000    1.169
+++ main/war/pom.xml    26 Jul 2007 18:40:33 -0000
@@ -10,6 +10,20 @@
   <artifactId>hudson-war</artifactId>
   <packaging>war</packaging>
   <name>Hudson war</name>
+  <repositories>
+    <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>
  
   <build>
     <directory>target</directory>
@@ -293,4 +307,4 @@
   <properties>
     <HUDSON_HOME>${basedir}/work</HUDSON_HOME>
   </properties>
-</project>
\ No newline at end of file
+</project>
Index: plugins/pom.xml
===================================================================
RCS file: /cvs/hudson/hudson/plugins/pom.xml,v
retrieving revision 1.49
diff -u -r1.49 pom.xml
--- plugins/pom.xml    17 Jul 2007 00:51:27 -0000    1.49
+++ plugins/pom.xml    26 Jul 2007 18:40:34 -0000
@@ -11,6 +11,20 @@
   <artifactId>plugin</artifactId>
   <name>Hudson plugin POM</name>
   <packaging>pom</packaging>
+
+  <repositories>
+    <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>
  
   <!--
     We need the following because the artifactId=plugin but directoryName=plugins, and
@@ -80,7 +94,7 @@
     <module>clover</module>
     <module>codeviation</module>
     <module>emma</module>
-    <module>gant</module>
+    <!--module>gant</module-->
     <module>hello-world</module>
     <module>ircbot</module>
     <module>jabber</module>
Index: plugins/build-timeout/pom.xml
===================================================================
RCS file: /cvs/hudson/hudson/plugins/build-timeout/pom.xml,v
retrieving revision 1.12
diff -u -r1.12 pom.xml
--- plugins/build-timeout/pom.xml    23 Mar 2007 23:08:20 -0000    1.12
+++ plugins/build-timeout/pom.xml    26 Jul 2007 18:40:34 -0000
@@ -12,7 +12,7 @@
   <name>Hudson build timeout plugin</name>
   <description>Aborts a build if it's taking too long</description>
   <version>1.4-SNAPSHOT</version>

+
   <build>
     <plugins>
       <plugin>
@@ -40,4 +40,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
Index: plugins/javanet-uploader/pom.xml
===================================================================
RCS file: /cvs/hudson/hudson/plugins/javanet-uploader/pom.xml,v
retrieving revision 1.14
diff -u -r1.14 pom.xml
--- plugins/javanet-uploader/pom.xml    6 Mar 2007 22:02:54 -0000    1.14
+++ plugins/javanet-uploader/pom.xml    26 Jul 2007 18:40:34 -0000
@@ -11,6 +11,21 @@
   <packaging>hpi</packaging>
   <name>Hudson java.net uploader plugin</name>
   <version>1.6-SNAPSHOT</version>
+
+  <repositories>
+    <repository>
+      <id>java.net</id>
+      <url> http://download.java.net/maven/1/</url>
+      <layout>legacy</layout>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
  
   <dependencies>
     <dependency>
@@ -39,4 +54,4 @@
       <version>2.2.1</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
Index: plugins/mercurial/pom.xml
===================================================================
RCS file: /cvs/hudson/hudson/plugins/mercurial/pom.xml,v
retrieving revision 1.2
diff -u -r1.2 pom.xml
--- plugins/mercurial/pom.xml    6 Apr 2007 14:51:39 -0000    1.2
+++ plugins/mercurial/pom.xml    26 Jul 2007 18:40:35 -0000
@@ -66,14 +66,22 @@
       <id>java.net2</id>
       <url> https://maven2-repository.dev.java.net/nonav/repository</url>
     </pluginRepository>
-    <pluginRepository>
-      <id>central</id>
-      <url> http://www.ibiblio.org/maven2</url>
-    </pluginRepository>
   </pluginRepositories>
 
   <repositories>
     <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>
+    <repository>
       <id>java.net</id>
       <url>https://maven-repository.dev.java.net/nonav/repository </url>
       <layout>legacy</layout>
@@ -81,15 +89,14 @@
     <repository>
       <id>java.net2</id>
       <url> https://maven2-repository.dev.java.net/nonav/repository</url>
-    </repository>
-    <repository>
-      <id>central</id>
-      <url> http://www.ibiblio.org/maven2</url>
-    </repository>
-    <repository>
-      <id>central1</id>
-      <url>http://www.ibiblio.org/maven </url>
-      <layout>legacy</layout>
+      <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>
     <repository>
       <id>hudson-libs</id>
@@ -97,4 +104,4 @@
       <layout>legacy</layout>
     </repository>
   </repositories>
-</project>
\ No newline at end of file
+</project>
Index: tools/bootstrap/pom.xml
===================================================================
RCS file: /cvs/hudson/hudson/tools/bootstrap/pom.xml,v
retrieving revision 1.1
diff -u - r1.1 pom.xml
--- tools/bootstrap/pom.xml    11 Nov 2006 18:02:33 -0000    1.1
+++ tools/bootstrap/pom.xml    26 Jul 2007 18:40:35 -0000
@@ -27,6 +27,18 @@
  
   <repositories>
     <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>
+    <repository>
       <id>java.net</id>
       <url> https://maven-repository.dev.java.net/nonav/repository</url>
       <layout>legacy</layout>
@@ -34,6 +46,14 @@
     <repository>
       <id>java.net2</id>
       <url> https://maven2-repository.dev.java.net/nonav/repository</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>
     <repository>
       <id>hudson-libs</id>
Index: tools/maven-hpi-plugin/pom.xml
===================================================================
RCS file: /cvs/hudson/hudson/tools/maven-hpi-plugin/pom.xml,v
retrieving revision 1.43
diff -u -r1.43 pom.xml
--- tools/maven-hpi-plugin/pom.xml    13 Jul 2007 12:50:17 -0000    1.43
+++ tools/maven-hpi-plugin/pom.xml    26 Jul 2007 18:40:35 -0000
@@ -21,6 +21,21 @@
     </license>
   </licenses>
 
+  <repositories>
+    <repository>
+      <id>java.net</id>
+      <url> http://download.java.net/maven/1/</url>
+      <layout>legacy</layout>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
   <build>
     <resources>
       <resource>

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] pom tweaking (was Re: Building from source takes ages)

Kohsuke Kawaguchi
Administrator
Thanks. I applied the change.

I couldn't convince my MUA not to wrap lines, so I had to manually tweak
the file to create a proper diff file. If there's a next time, it would
be nice if you can send it as an attachment.


Jorg Heymans wrote:

> Including the patch inline here, hope that's OK. Some more optimizations can
> be done though. For example, for all poms where you define a custom
> <repository> or <pluginrepository> you should define repo1 as a repository
> *before* the custom one. The reasoning is that the custom repo will only
> serve a few jars, but will be contacted for all jars needed for that module.
> Therefore if we put repo1 before the custom one, it will still get called
> first for most dependencies.
>
> Also, i noticed that the maven-hpi-plugin is referenced as 1.7 and 1.9 , and
> the codeviation pom probably contains too many repositories as well didn't
> verify that one properly.
>
> HTH
> Jorg
>
> Index: pom.xml
> ===================================================================
> RCS file: /cvs/hudson/hudson/pom.xml,v
> retrieving revision 1.14
> diff -u -r1.14 pom.xml
> --- pom.xml    14 Jun 2007 17:03:43 -0000    1.14
> +++ pom.xml    26 Jul 2007 18:40:32 -0000
> @@ -16,39 +16,56 @@
>
>    <pluginRepositories>
>      <pluginRepository>
> -      <id>java.net2</id>
> -      <url>http://download.java.net/maven/2/</url>
> +      <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>
>      </pluginRepository>
>      <pluginRepository>
> -      <id>central</id>
> -      <url>http://www.ibiblio.org/maven2</url>
> +      <id>java.net2</id>
> +      <url>http://download.java.net/maven/2/</url>
>      </pluginRepository>
>    </pluginRepositories>
>
>    <repositories>
> -    <repository>
> +    <!--repository>
> +      <id>central</id>
> +      <url>http://repo1.maven.org/maven2</url>
> +      <releases>
> +        <enabled>true</enabled>
> +        <updatePolicy>never</updatePolicy>
> +      </releases>
> +      <snapshots>
> +        <enabled>false</enabled>
> +      </snapshots>
> +    </repository-->
> +    <!--repository>
>        <id>java.net</id>
>        <url>http://download.java.net/maven/1/</url>
>        <layout>legacy</layout>
> -    </repository>
> -    <repository>
> +    </repository-->
> +    <!--repository>
>        <id>java.net2</id>
>        <url>http://download.java.net/maven/2/</url>
> -    </repository>
> -    <repository>
> -      <id>central</id>
> -      <url>http://www.ibiblio.org/maven2</url>
> -    </repository>
> -    <repository>
> -      <id>central1</id>
> -      <url>http://www.ibiblio.org/maven</url>
> -      <layout>legacy</layout>
> -    </repository>
> -    <repository>
> +      <releases>
> +        <enabled>true</enabled>
> +        <updatePolicy>never</updatePolicy>
> +      </releases>
> +      <snapshots>
> +        <enabled>false</enabled>
> +      </snapshots>
> +    </repository-->
> +    <!---repository>
>        <id>hudson-libs</id>
>        <url>
> https://hudson.dev.java.net/source/browse/*checkout*/hudson/hudson/main/lib
> </url>
>        <layout>legacy</layout>
> -    </repository>
> +    </repository-->
>    </repositories>
>
>    <distributionManagement>
> Index: main/core/pom.xml
> ===================================================================
> RCS file: /cvs/hudson/hudson/main/core/pom.xml,v
> retrieving revision 1.198
> diff -u -r1.198 pom.xml
> --- main/core/pom.xml    15 Jul 2007 16:14:46 -0000    1.198
> +++ main/core/pom.xml    26 Jul 2007 18:40:32 -0000
> @@ -10,7 +10,37 @@
>    <artifactId>hudson-core</artifactId>
>    <packaging>stapler-jar</packaging>
>    <name>Hudson core</name>
> -
> +
> +  <repositories>
> +    <repository>
> +      <id>hudson-libs</id>
> +      <url>
> https://hudson.dev.java.net/source/browse/*checkout*/hudson/hudson/main/lib
> </url>
> +      <layout>legacy</layout>
> +    </repository>
> +    <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>
> +    <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>
>    <build>
>      <plugins>
>        <plugin>
> @@ -258,4 +288,4 @@
>        <version>20070616</version>
>      </dependency>
>    </dependencies>
> -</project>
> \ No newline at end of file
> +</project>
> Index: main/war/pom.xml
> ===================================================================
> RCS file: /cvs/hudson/hudson/main/war/pom.xml,v
> retrieving revision 1.169
> diff -u -r1.169 pom.xml
> --- main/war/pom.xml    15 Jul 2007 16:14:46 -0000    1.169
> +++ main/war/pom.xml    26 Jul 2007 18:40:33 -0000
> @@ -10,6 +10,20 @@
>    <artifactId>hudson-war</artifactId>
>    <packaging>war</packaging>
>    <name>Hudson war</name>
> +  <repositories>
> +    <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>
>
>    <build>
>      <directory>target</directory>
> @@ -293,4 +307,4 @@
>    <properties>
>      <HUDSON_HOME>${basedir}/work</HUDSON_HOME>
>    </properties>
> -</project>
> \ No newline at end of file
> +</project>
> Index: plugins/pom.xml
> ===================================================================
> RCS file: /cvs/hudson/hudson/plugins/pom.xml,v
> retrieving revision 1.49
> diff -u -r1.49 pom.xml
> --- plugins/pom.xml    17 Jul 2007 00:51:27 -0000    1.49
> +++ plugins/pom.xml    26 Jul 2007 18:40:34 -0000
> @@ -11,6 +11,20 @@
>    <artifactId>plugin</artifactId>
>    <name>Hudson plugin POM</name>
>    <packaging>pom</packaging>
> +
> +  <repositories>
> +    <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>
>
>    <!--
>      We need the following because the artifactId=plugin but
> directoryName=plugins, and
> @@ -80,7 +94,7 @@
>      <module>clover</module>
>      <module>codeviation</module>
>      <module>emma</module>
> -    <module>gant</module>
> +    <!--module>gant</module-->
>      <module>hello-world</module>
>      <module>ircbot</module>
>      <module>jabber</module>
> Index: plugins/build-timeout/pom.xml
> ===================================================================
> RCS file: /cvs/hudson/hudson/plugins/build-timeout/pom.xml,v
> retrieving revision 1.12
> diff -u -r1.12 pom.xml
> --- plugins/build-timeout/pom.xml    23 Mar 2007 23:08:20 -0000    1.12
> +++ plugins/build-timeout/pom.xml    26 Jul 2007 18:40:34 -0000
> @@ -12,7 +12,7 @@
>    <name>Hudson build timeout plugin</name>
>    <description>Aborts a build if it's taking too long</description>
>    <version>1.4-SNAPSHOT</version>
> -
> +
>    <build>
>      <plugins>
>        <plugin>
> @@ -40,4 +40,4 @@
>        </plugin>
>      </plugins>
>    </build>
> -</project>
> \ No newline at end of file
> +</project>
> Index: plugins/javanet-uploader/pom.xml
> ===================================================================
> RCS file: /cvs/hudson/hudson/plugins/javanet-uploader/pom.xml,v
> retrieving revision 1.14
> diff -u -r1.14 pom.xml
> --- plugins/javanet-uploader/pom.xml    6 Mar 2007 22:02:54 -0000    1.14
> +++ plugins/javanet-uploader/pom.xml    26 Jul 2007 18:40:34 -0000
> @@ -11,6 +11,21 @@
>    <packaging>hpi</packaging>
>    <name>Hudson java.net uploader plugin</name>
>    <version>1.6-SNAPSHOT</version>
> +
> +  <repositories>
> +    <repository>
> +      <id>java.net</id>
> +      <url>http://download.java.net/maven/1/</url>
> +      <layout>legacy</layout>
> +      <releases>
> +        <enabled>true</enabled>
> +        <updatePolicy>never</updatePolicy>
> +      </releases>
> +      <snapshots>
> +        <enabled>false</enabled>
> +      </snapshots>
> +    </repository>
> +  </repositories>
>
>    <dependencies>
>      <dependency>
> @@ -39,4 +54,4 @@
>        <version>2.2.1</version>
>      </dependency>
>    </dependencies>
> -</project>
> \ No newline at end of file
> +</project>
> Index: plugins/mercurial/pom.xml
> ===================================================================
> RCS file: /cvs/hudson/hudson/plugins/mercurial/pom.xml,v
> retrieving revision 1.2
> diff -u -r1.2 pom.xml
> --- plugins/mercurial/pom.xml    6 Apr 2007 14:51:39 -0000    1.2
> +++ plugins/mercurial/pom.xml    26 Jul 2007 18:40:35 -0000
> @@ -66,14 +66,22 @@
>        <id>java.net2</id>
>        <url>https://maven2-repository.dev.java.net/nonav/repository</url>
>      </pluginRepository>
> -    <pluginRepository>
> -      <id>central</id>
> -      <url>http://www.ibiblio.org/maven2</url>
> -    </pluginRepository>
>    </pluginRepositories>
>
>    <repositories>
>      <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>
> +    <repository>
>        <id>java.net</id>
>        <url>https://maven-repository.dev.java.net/nonav/repository</url>
>        <layout>legacy</layout>
> @@ -81,15 +89,14 @@
>      <repository>
>        <id>java.net2</id>
>        <url>https://maven2-repository.dev.java.net/nonav/repository</url>
> -    </repository>
> -    <repository>
> -      <id>central</id>
> -      <url>http://www.ibiblio.org/maven2</url>
> -    </repository>
> -    <repository>
> -      <id>central1</id>
> -      <url>http://www.ibiblio.org/maven</url>
> -      <layout>legacy</layout>
> +      <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>
>      <repository>
>        <id>hudson-libs</id>
> @@ -97,4 +104,4 @@
>        <layout>legacy</layout>
>      </repository>
>    </repositories>
> -</project>
> \ No newline at end of file
> +</project>
> Index: tools/bootstrap/pom.xml
> ===================================================================
> RCS file: /cvs/hudson/hudson/tools/bootstrap/pom.xml,v
> retrieving revision 1.1
> diff -u -r1.1 pom.xml
> --- tools/bootstrap/pom.xml    11 Nov 2006 18:02:33 -0000    1.1
> +++ tools/bootstrap/pom.xml    26 Jul 2007 18:40:35 -0000
> @@ -27,6 +27,18 @@
>
>    <repositories>
>      <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>
> +    <repository>
>        <id>java.net</id>
>        <url>https://maven-repository.dev.java.net/nonav/repository</url>
>        <layout>legacy</layout>
> @@ -34,6 +46,14 @@
>      <repository>
>        <id>java.net2</id>
>        <url>https://maven2-repository.dev.java.net/nonav/repository</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>
>      <repository>
>        <id>hudson-libs</id>
> Index: tools/maven-hpi-plugin/pom.xml
> ===================================================================
> RCS file: /cvs/hudson/hudson/tools/maven-hpi-plugin/pom.xml,v
> retrieving revision 1.43
> diff -u -r1.43 pom.xml
> --- tools/maven-hpi-plugin/pom.xml    13 Jul 2007 12:50:17 -0000    1.43
> +++ tools/maven-hpi-plugin/pom.xml    26 Jul 2007 18:40:35 -0000
> @@ -21,6 +21,21 @@
>      </license>
>    </licenses>
>
> +  <repositories>
> +    <repository>
> +      <id>java.net</id>
> +      <url>http://download.java.net/maven/1/</url>
> +      <layout>legacy</layout>
> +      <releases>
> +        <enabled>true</enabled>
> +        <updatePolicy>never</updatePolicy>
> +      </releases>
> +      <snapshots>
> +        <enabled>false</enabled>
> +      </snapshots>
> +    </repository>
> +  </repositories>
> +
>    <build>
>      <resources>
>        <resource>
>

--
Kohsuke Kawaguchi
Sun Microsystems                   [hidden email]

smime.p7s (4K) Download Attachment