geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r430671 - in /geronimo/trunk: ./ applications/console/console-standard/ applications/uddi-server/ configs/activemq-broker/ configs/jsp-examples-jetty/ configs/jsp-examples-tomcat/ configs/servlets-examples-jetty/ configs/servlets-examples-t...
Date Fri, 11 Aug 2006 05:06:53 GMT
Author: jdillon
Date: Thu Aug 10 22:06:51 2006
New Revision: 430671

URL: http://svn.apache.org/viewvc?rev=430671&view=rev
Log:
Remove the m1 repos from the top-level pom, add only required m1 repos to specific modules
that need them

Modified:
    geronimo/trunk/applications/console/console-standard/pom.xml
    geronimo/trunk/applications/uddi-server/pom.xml
    geronimo/trunk/configs/activemq-broker/pom.xml
    geronimo/trunk/configs/jsp-examples-jetty/pom.xml
    geronimo/trunk/configs/jsp-examples-tomcat/pom.xml
    geronimo/trunk/configs/servlets-examples-jetty/pom.xml
    geronimo/trunk/configs/servlets-examples-tomcat/pom.xml
    geronimo/trunk/modules/activemq-embedded-rar/pom.xml
    geronimo/trunk/modules/activemq-gbean/pom.xml
    geronimo/trunk/modules/connector/pom.xml
    geronimo/trunk/modules/directory/pom.xml
    geronimo/trunk/modules/mail/pom.xml
    geronimo/trunk/modules/tomcat/pom.xml
    geronimo/trunk/pom.xml

Modified: geronimo/trunk/applications/console/console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-standard/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/applications/console/console-standard/pom.xml (original)
+++ geronimo/trunk/applications/console/console-standard/pom.xml Thu Aug 10 22:06:51 2006
@@ -177,5 +177,26 @@
             </plugin>
         </plugins>
     </build>
-
+    
+    <!--
+    HACK: Need to include the Apache m1 snapshot repo to pick up dwr:dwr:jar:1.1.1 and 
+          commons-fileupload:commons-fileupload:jar:1.1-dev
+    -->
+    <repositories>
+        <repository>
+            <id>apache-snapshots-m1</id>
+            <name>Apache Maven 1 Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
 </project>

Modified: geronimo/trunk/applications/uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/uddi-server/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/applications/uddi-server/pom.xml (original)
+++ geronimo/trunk/applications/uddi-server/pom.xml Thu Aug 10 22:06:51 2006
@@ -81,5 +81,25 @@
             </plugin>
         </plugins>
     </build>
-
+    
+    <!--
+    HACK: Need to include the Apache m1 snapshot repo to pick up juddi:juddi:jar:0.9rc4
+    -->
+    <repositories>
+        <repository>
+            <id>apache-snapshots-m1</id>
+            <name>Apache Maven 1 Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
 </project>

Modified: geronimo/trunk/configs/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/activemq-broker/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq-broker/pom.xml (original)
+++ geronimo/trunk/configs/activemq-broker/pom.xml Thu Aug 10 22:06:51 2006
@@ -59,4 +59,24 @@
         
     </dependencies>
     
+    <!--
+    HACK: Currently need to pickup the Codehaus m1 repo for activemq-*:3.2.4-SNAPSHOT
+    -->
+    <repositories>
+        <repository>
+            <id>codehaus-m1</id>
+            <name>Codehaus Maven 1 Repository</name>
+            <url>http://dist.codehaus.org</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
 </project>

Modified: geronimo/trunk/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jsp-examples-jetty/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/trunk/configs/jsp-examples-jetty/pom.xml Thu Aug 10 22:06:51 2006
@@ -89,4 +89,24 @@
         </plugins>
     </build>
     
+    <!--
+    HACK: Need to include the Apache m1 snapshot repo to pick up geronimo-samples:geronimo-jsp-examples-tomcat:war:5.5.15
+    -->
+    <repositories>
+        <repository>
+            <id>apache-snapshots-m1</id>
+            <name>Apache Maven 1 Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
 </project>

Modified: geronimo/trunk/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jsp-examples-tomcat/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/jsp-examples-tomcat/pom.xml Thu Aug 10 22:06:51 2006
@@ -84,4 +84,24 @@
         </plugins>
     </build>
     
+    <!--
+    HACK: Need to include the Apache m1 snapshot repo to pick up geronimo-samples:geronimo-jsp-examples-tomcat:war:5.5.15
+    -->
+    <repositories>
+        <repository>
+            <id>apache-snapshots-m1</id>
+            <name>Apache Maven 1 Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
 </project>

Modified: geronimo/trunk/configs/servlets-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-jetty/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-jetty/pom.xml (original)
+++ geronimo/trunk/configs/servlets-examples-jetty/pom.xml Thu Aug 10 22:06:51 2006
@@ -97,4 +97,24 @@
         </plugins>
     </build>
     
+    <!--
+    HACK: Need to include the Apache m1 snapshot repo to pick up geronimo-samples:geronimo-servlet-examples-tomcat:war:5.5.15
+    -->
+    <repositories>
+        <repository>
+            <id>apache-snapshots-m1</id>
+            <name>Apache Maven 1 Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
 </project>

Modified: geronimo/trunk/configs/servlets-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-tomcat/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/servlets-examples-tomcat/pom.xml Thu Aug 10 22:06:51 2006
@@ -98,4 +98,24 @@
         </plugins>
     </build>
     
+    <!--
+    HACK: Need to include the Apache m1 snapshot repo to pick up geronimo-samples:geronimo-servlet-examples-tomcat:war:5.5.15
+    -->
+    <repositories>
+        <repository>
+            <id>apache-snapshots-m1</id>
+            <name>Apache Maven 1 Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
 </project>

Modified: geronimo/trunk/modules/activemq-embedded-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-embedded-rar/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-embedded-rar/pom.xml (original)
+++ geronimo/trunk/modules/activemq-embedded-rar/pom.xml Thu Aug 10 22:06:51 2006
@@ -70,4 +70,25 @@
             <artifactId>activemq-ra</artifactId>
         </dependency>
     </dependencies>
+    
+    <!--
+    HACK: Currently need to pickup the Codehaus m1 repo for activemq-*:3.2.4-SNAPSHOT
+    -->
+    <repositories>
+        <repository>
+            <id>codehaus-m1</id>
+            <name>Codehaus Maven 1 Repository</name>
+            <url>http://dist.codehaus.org</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
 </project>

Modified: geronimo/trunk/modules/activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-gbean/pom.xml (original)
+++ geronimo/trunk/modules/activemq-gbean/pom.xml Thu Aug 10 22:06:51 2006
@@ -117,4 +117,24 @@
         <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
     </build>
     
+    <!--
+    HACK: Need the Apache m1 snapshot repo to pick up incubator-activemq:*
+    -->
+    <repositories>
+        <repository>
+            <id>apache-snapshots-m1</id>
+            <name>Apache Maven 1 Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
 </project>

Modified: geronimo/trunk/modules/connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/pom.xml (original)
+++ geronimo/trunk/modules/connector/pom.xml Thu Aug 10 22:06:51 2006
@@ -133,5 +133,25 @@
         
     </dependencies>
     
+    <!--
+    HACK: Currently need to pickup the Codehaus m1 repo for tranql-*:*
+    -->
+    <repositories>
+        <repository>
+            <id>codehaus-m1</id>
+            <name>Codehaus Maven 1 Repository</name>
+            <url>http://dist.codehaus.org</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
 </project>
 

Modified: geronimo/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/directory/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/pom.xml (original)
+++ geronimo/trunk/modules/directory/pom.xml Thu Aug 10 22:06:51 2006
@@ -84,6 +84,16 @@
             <groupId>directory-asn1</groupId>
             <artifactId>asn1-ber</artifactId>
             <version>${asn1Version}</version>
+            <exclusions>
+                <!--
+                NOTE: Exclude commons-test, no needed for compile, not deployed into any
m2 repo.
+                      Where are the sources for this artifact?
+                -->
+                <exclusion>
+                    <groupId>commons-test</groupId>
+                    <artifactId>commons-test</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/modules/mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/mail/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/modules/mail/pom.xml (original)
+++ geronimo/trunk/modules/mail/pom.xml Thu Aug 10 22:06:51 2006
@@ -101,5 +101,25 @@
         
     </dependencies>
     
+    <!--
+    HACK: Need to include the Apache m1 snapshot repo to pick up geronimo-javamail_1.3.1_provider
+    -->
+    <repositories>
+        <repository>
+            <id>apache-snapshots-m1</id>
+            <name>Apache Maven 1 Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
 </project>
 

Modified: geronimo/trunk/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/pom.xml (original)
+++ geronimo/trunk/modules/tomcat/pom.xml Thu Aug 10 22:06:51 2006
@@ -313,5 +313,25 @@
         </plugins>
     </build>
     
+    <!--
+    HACK: Need to include the Apache m1 snapshot repo to pick up commons-modeler
+    -->
+    <repositories>
+        <repository>
+            <id>apache-snapshots-m1</id>
+            <name>Apache Maven 1 Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
 </project>
 

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=430671&r1=430670&r2=430671&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Thu Aug 10 22:06:51 2006
@@ -775,7 +775,7 @@
         NOTE: The default repositories are picked up by Genesis, but need to
               specify where Genesis lives to pick it up + any additional repositories.
         -->
-
+        
         <repository>
             <id>apache</id>
             <name>Apache Repository</name>
@@ -803,56 +803,6 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
-
-        <!--
-        FIXME: Include the legacy Apache and Codehaus repositories... should eventually
-               ween ourselves off of them...
-        -->
-        <repository>
-            <id>apache-m1</id>
-            <name>Apache Maven 1 Repository</name>
-            <url>http://people.apache.org/repo/m1-ibiblio-rsync-repository</url>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-
-        <repository>
-            <id>apache-snapshots-m1</id>
-            <name>Apache Maven 1 Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m1-snapshot-repository</url>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-
-        <repository>
-            <id>codehaus-m1</id>
-            <name>Codehaus Maven 1 Repository</name>
-            <url>http://dist.codehaus.org</url>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-
     </repositories>
 
     <distributionManagement>
@@ -885,7 +835,7 @@
 
         <!--
         NOTE: The staged build is used to get around a problem with Maven
-              and extention plugins.
+              and extension plugins.
 
               See http://issues.apache.org/jira/browse/GERONIMO-2172 for more details.
         -->



Mime
View raw message