geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r795946 - in /geronimo/server/trunk: ./ framework/configs/ framework/modules/geronimo-security/ framework/plugingroups/ plugingroups/ plugins/ plugins/activemq/activemq-webconsole-jetty/ plugins/activemq/activemq-webconsole-tomcat/ plugins/...
Date Mon, 20 Jul 2009 18:21:27 GMT
Author: djencks
Date: Mon Jul 20 18:21:26 2009
New Revision: 795946

URL: http://svn.apache.org/viewvc?rev=795946&view=rev
Log:
GERONIMO-4753 and snapshot and source-repository cleanup

Modified:
    geronimo/server/trunk/framework/configs/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
    geronimo/server/trunk/framework/plugingroups/pom.xml
    geronimo/server/trunk/plugingroups/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-webconsole/pom.xml
    geronimo/server/trunk/plugins/client/pom.xml
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml
    geronimo/server/trunk/plugins/jetty7/jetty7/pom.xml
    geronimo/server/trunk/plugins/jetty7/pom.xml
    geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsuite/pom.xml

Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Mon Jul 20 18:21:26 2009
@@ -86,7 +86,6 @@
                             <source-repository>~/.m2/repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
                             <artifact-alias key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </commonInstance>

Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Mon Jul 20 18:21:26
2009
@@ -33,38 +33,6 @@
     
     <dependencies>
 
-        <!-- for GERONIMO_SERVICE constant string -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-j2ee</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<scope>provided</scope>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-kernel</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-system</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-common</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-crypto</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-management</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>rmi-naming</artifactId>
@@ -95,18 +63,6 @@
             <artifactId>geronimo-jaspi</artifactId>
         </dependency>
 
-<!--
-        <dependency>
-            <groupId>org.soter.rbac</groupId>
-            <artifactId>rbac-xml-model</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.soter.rbac</groupId>
-            <artifactId>rbac-jacc</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
--->
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
             <artifactId>testsupport-common</artifactId>

Modified: geronimo/server/trunk/framework/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/plugingroups/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/framework/plugingroups/pom.xml (original)
+++ geronimo/server/trunk/framework/plugingroups/pom.xml Mon Jul 20 18:21:26 2009
@@ -61,7 +61,6 @@
                             <source-repository>~/.m2/repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
                         </plugin-artifact>
                     </commonInstance>
                 </configuration>

Modified: geronimo/server/trunk/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/pom.xml Mon Jul 20 18:21:26 2009
@@ -71,7 +71,6 @@
                             <source-repository>~/.m2/repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
                         </plugin-artifact>
                     </commonInstance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml Mon Jul 20 18:21:26
2009
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-web</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>${activemqVersion}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -117,7 +117,7 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-xmpp</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>${activemqVersion}</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.xml.bind</groupId>
@@ -128,7 +128,7 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-console</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>${activemqVersion}</version>
         </dependency>
 
         <!-- SiteMesh for layout -->

Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml Mon Jul 20 18:21:26
2009
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-web</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>${activemqVersion}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -128,7 +128,7 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-xmpp</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>${activemqVersion}</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.xml.bind</groupId>
@@ -139,7 +139,7 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-console</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>${activemqVersion}</version>
         </dependency>
 
         <!-- SiteMesh for layout -->

Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-webconsole/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-webconsole/pom.xml Mon Jul 20 18:21:26
2009
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-web-console</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>${activemqVersion}</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/trunk/plugins/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/pom.xml Mon Jul 20 18:21:26 2009
@@ -55,11 +55,9 @@
                             <geronimo-version>${geronimoVersion}</geronimo-version>
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
-                            <!--<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>-->
                             <source-repository>~/.m2/repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
 
                             <artifact-alias server="client" key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                         </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml Mon Jul 20 18:21:26
2009
@@ -69,7 +69,6 @@
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-jaspi</artifactId>
-            <version>1.0-SNAPSHOT</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>

Modified: geronimo/server/trunk/plugins/jetty7/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7/pom.xml Mon Jul 20 18:21:26 2009
@@ -114,7 +114,6 @@
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-jaspi</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

Modified: geronimo/server/trunk/plugins/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/pom.xml Mon Jul 20 18:21:26 2009
@@ -100,6 +100,17 @@
             <!--<version>${jettyVersion}</version>-->
             <!--</dependency>-->
 
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-jaspi</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-jaspi</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <classifier>tests</classifier>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -132,7 +143,7 @@
         -->
         <repository>
             <id>jetty-releases.oss.sonatype.org</id>
-            <name>Jetty-Releases Snapshot Repository</name>
+            <name>Jetty-Releases Repository</name>
             <layout>default</layout>
             <url>http://oss.sonatype.org/content/repositories/jetty-releases/</url>
             <snapshots>

Modified: geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml Mon Jul 20 18:21:26 2009
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-jar</artifactId>
-            <version>2.2-SNAPSHOT</version>
+            <version>${version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/pom.xml
Mon Jul 20 18:21:26 2009
@@ -32,7 +32,6 @@
     <groupId>org.apache.geronimo.plugins.monitoring.itest</groupId>
     <artifactId>mconsole-itest-simple</artifactId>
     <packaging>jar</packaging>
-    <version>2.2-SNAPSHOT</version>
     <name>mconsole-itest-simple</name>
 
     <dependencies>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml Mon Jul 20 18:21:26
2009
@@ -93,20 +93,20 @@
         <!--</dependency>-->
     </dependencies>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>codehaus</id>
-            <name>Codehaus Release Repository</name>
-            <url>http://repository.codehaus.org</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
+    <!--<pluginRepositories>-->
+        <!--<pluginRepository>-->
+            <!--<id>codehaus</id>-->
+            <!--<name>Codehaus Release Repository</name>-->
+            <!--<url>http://repository.codehaus.org</url>-->
+            <!--<layout>default</layout>-->
+            <!--<snapshots>-->
+                <!--<enabled>false</enabled>-->
+            <!--</snapshots>-->
+            <!--<releases>-->
+                <!--<enabled>true</enabled>-->
+            <!--</releases>-->
+        <!--</pluginRepository>-->
+    <!--</pluginRepositories>-->
     
     <build>
         <pluginManagement>

Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml Mon Jul 20 18:21:26 2009
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
-            <version>2.2-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Mon Jul 20 18:21:26 2009
@@ -144,7 +144,6 @@
                             <source-repository>~/.m2/repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
                             <artifact-alias key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </commonInstance>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Jul 20 18:21:26 2009
@@ -96,7 +96,7 @@
         <txmanagerVersion>2.2-SNAPSHOT</txmanagerVersion>-->
         <servletSpec>geronimo-servlet_2.5_spec</servletSpec>
 
-        <monitoringConsoleVersion>2.2-SNAPSHOT</monitoringConsoleVersion>
+        <monitoringConsoleVersion>${version}</monitoringConsoleVersion>
 
         <!-- Deployers -->
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car
@@ -342,12 +342,6 @@
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-jaspi</artifactId>
                 <version>1.0-SNAPSHOT</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
 
             <dependency>
@@ -1051,7 +1045,13 @@
             <dependency>
                 <groupId>org.directwebremoting</groupId>
                 <artifactId>dwr</artifactId>
-                <version>2.0.5</version>
+                <version>3.0.M1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>cometd</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -1351,26 +1351,6 @@
                 <version>1.0-SNAPSHOT</version>
             </dependency>
 
-            <!--<dependency>-->
-            <!--<groupId>javax.xml.bind</groupId>-->
-            <!--<artifactId>jaxb-api</artifactId>-->
-            <!--<version>2.1</version>-->
-            <!--<exclusions>-->
-            <!--<exclusion>-->
-            <!--<groupId>javax.xml.bind</groupId>-->
-            <!--<artifactId>jsr173_api</artifactId>-->
-            <!--</exclusion>-->
-            <!--<exclusion>-->
-            <!--<groupId>javax.xml.stream</groupId>-->
-            <!--<artifactId>stax-api</artifactId>-->
-            <!--</exclusion>-->
-            <!--<exclusion>-->
-            <!--<groupId>javax.activation</groupId>-->
-            <!--<artifactId>activation</artifactId>-->
-            <!--</exclusion>-->
-            <!--</exclusions>-->
-            <!--</dependency>-->
-
             <dependency>
                 <groupId>com.sun.xml.messaging.saaj</groupId>
                 <artifactId>saaj-impl</artifactId>
@@ -1831,20 +1811,6 @@
                 <version>1.1.6</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.dojotoolkit</groupId>
-                <artifactId>dojo-mini</artifactId>
-                <version>1.1.1</version>
-                <type>zip</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.dojotoolkit</groupId>
-                <artifactId>dojo-ajax</artifactId>
-                <version>0.4.3</version>
-                <type>zip</type>
-            </dependency>
-
             <!-- archive support -->
             <!-- archiver version matches maven 2.0.7.  Upgrading maven may require upgrading
this version -->
             <dependency>
@@ -1965,26 +1931,6 @@
     <build>
         <pluginManagement>
             <plugins>
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-resources-plugin</artifactId>-->
-                <!--<version>2.3</version>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-assembly-plugin</artifactId>-->
-                <!--<version>2.2-beta-2</version>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-javadoc-plugin</artifactId>-->
-                <!--<version>2.4</version>-->
-                <!--<configuration>-->
-                <!--<source>1.5</source>-->
-                <!--</configuration>-->
-                <!--</plugin>-->
 
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -2009,18 +1955,6 @@
                     </configuration>
                 </plugin>
 
-                <!--<plugin>-->
-                <!--<groupId>org.codehaus.groovy.maven</groupId>-->
-                <!--<artifactId>gmaven-plugin</artifactId>-->
-                <!--<version>1.0-rc-2</version>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-plugin-plugin</artifactId>-->
-                <!--<version>2.4.1</version>-->
-                <!--</plugin>-->
-
                 <plugin>
                     <groupId>org.codehaus.mojo.jspc</groupId>
                     <artifactId>jspc-maven-plugin</artifactId>
@@ -2103,42 +2037,6 @@
                     </configuration>
                 </plugin>
 
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-ear-plugin</artifactId>-->
-                <!--<version>2.3</version>-->
-                <!--<configuration>-->
-                <!--<archive>-->
-                <!-- Do not include META-INF/maven to avoid long file problems on windows
-->
-                <!--<addMavenDescriptor>false</addMavenDescriptor>-->
-                <!--</archive>-->
-                <!--</configuration>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-rar-plugin</artifactId>-->
-                <!--<version>2.2</version>-->
-                <!--<configuration>-->
-                <!--<archive>-->
-                <!-- Do not include META-INF/maven to avoid long file problems on windows
-->
-                <!--<addMavenDescriptor>false</addMavenDescriptor>-->
-                <!--</archive>-->
-                <!--</configuration>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-jar-plugin</artifactId>-->
-                <!--<version>2.1</version>-->
-                <!--<configuration>-->
-                <!--<archive>-->
-                <!-- Do not include META-INF/maven to avoid long file problems on windows
-->
-                <!--<addMavenDescriptor>false</addMavenDescriptor>-->
-                <!--</archive>-->
-                <!--</configuration>-->
-                <!--</plugin>-->
-
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -2149,108 +2047,12 @@
                     </configuration>
                 </plugin>
 
-                <!--<plugin>-->
-                <!--<groupId>org.codehaus.mojo</groupId>-->
-                <!--<artifactId>shitty-maven-plugin</artifactId>-->
-                <!--<version>1.0-alpha-3</version>-->
-                <!--</plugin>-->
-
                 <plugin>
                     <groupId>org.apache.geronimo.gshell</groupId>
                     <artifactId>gshell-maven-plugin</artifactId>
                     <version>1.0-alpha-1</version>
                 </plugin>
 
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-deploy-plugin</artifactId>-->
-                <!--<version>2.3</version>-->
-                <!--<inherited>true</inherited>-->
-                <!--<configuration>-->
-                <!--<updateReleaseInfo>true</updateReleaseInfo>-->
-                <!--<altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>-->
-                <!--</configuration>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-gpg-plugin</artifactId>-->
-                <!--<version>1.0-alpha-3</version>-->
-                <!--<configuration>-->
-                <!--<passphrase>${gpg.passphrase}</passphrase>-->
-                <!--</configuration>-->
-                <!--<executions>-->
-                <!--<execution>-->
-                <!--<goals>-->
-                <!--<goal>sign</goal>-->
-                <!--</goals>-->
-                <!--</execution>-->
-                <!--</executions>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-release-plugin</artifactId>-->
-                <!--<version>2.0-beta-9</version>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.codehaus.plexus</groupId>-->
-                <!--<artifactId>plexus-maven-plugin</artifactId>-->
-                <!--<version>1.3.6</version>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-enforcer-plugin</artifactId>-->
-                <!--<version>1.0-alpha-3</version>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-dependency-plugin</artifactId>-->
-                <!--<version>2.0</version>-->
-                <!--<configuration>-->
-                <!--<silent>true</silent>-->
-                <!--</configuration>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-reactor-plugin</artifactId>-->
-                <!--<version>1.0</version>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-remote-resources-plugin</artifactId>-->
-                <!--<version>1.0</version>-->
-                <!--<executions>-->
-                <!--<execution>-->
-                <!--<goals>-->
-                <!--<goal>process</goal>-->
-                <!--</goals>-->
-                <!--<configuration>-->
-                <!--<resourceBundles>-->
-                <!--<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>-->
-                <!--</resourceBundles>-->
-                <!--</configuration>-->
-                <!--</execution>-->
-                <!--</executions>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.codehaus.mojo</groupId>-->
-                <!--<artifactId>ianal-maven-plugin</artifactId>-->
-                <!--<version>1.0-alpha-1</version>-->
-                <!--</plugin>-->
-
-                <!--<plugin>-->
-                <!--<groupId>org.codehaus.mojo</groupId>-->
-                <!--<artifactId>jaxb2-maven-plugin</artifactId>-->
-                <!--<version>1.2</version>-->
-                <!--</plugin>-->
-
                 <!-- INTERNAL -->
 
                 <plugin>
@@ -2391,7 +2193,6 @@
             </activation>
 
             <modules>
-                <module>repository</module>
                 <module>testsupport</module>
                 <module>framework</module>
                 <module>plugins</module>
@@ -2404,7 +2205,6 @@
             <id>it</id>
 
             <modules>
-                <module>repository</module>
                 <module>testsupport</module>
                 <module>framework</module>
                 <module>plugins</module>
@@ -2454,9 +2254,6 @@
             </activation>
 
             <modules>
-                <module>repository</module>
-                <!--<module>buildsupport</module>-->
-                <!--<module>testsupport</module>-->
                 <module>framework</module>
             </modules>
         </profile>
@@ -2490,8 +2287,6 @@
             </activation>
 
             <modules>
-                <module>repository</module>
-                <!--<module>buildsupport</module>-->
                 <module>testsupport</module>
                 <module>framework</module>
                 <module>plugins</module>
@@ -2509,41 +2304,11 @@
             </activation>
 
             <modules>
-                <!--<module>buildsupport</module>-->
                 <module>testsupport</module>
                 <module>framework/modules</module>
             </modules>
         </profile>
 
-        <!--<profile>-->
-        <!--<id>idea</id>-->
-
-        <!--<build>-->
-        <!--<defaultGoal>validate</defaultGoal>-->
-
-        <!--<plugins>-->
-        <!--<plugin>-->
-        <!--<groupId>org.apache.maven.plugins</groupId>-->
-        <!--<artifactId>maven-idea-plugin</artifactId>-->
-        <!--<configuration>-->
-        <!--<overwrite>true</overwrite>-->
-        <!--<downloadSources>true</downloadSources>-->
-        <!--<downloadJavadocs>true</downloadJavadocs>-->
-        <!--</configuration>-->
-        <!--<executions>-->
-        <!--<execution>-->
-        <!--<phase>validate</phase>-->
-        <!--<goals>-->
-        <!--<goal>clean</goal>-->
-        <!--<goal>idea</goal>-->
-        <!--</goals>-->
-        <!--</execution>-->
-        <!--</executions>-->
-        <!--</plugin>-->
-        <!--</plugins>-->
-        <!--</build>-->
-        <!--</profile>-->
-
         <profile>
             <id>makeeclipse</id>
 
@@ -2594,7 +2359,6 @@
                 <txmanagerVersion>2.2-SNAPSHOT</txmanagerVersion>
             </properties>
             <modules>
-                <module>repository</module>
                 <module>testsupport</module>
                 <module>framework</module>
                 <module>plugins</module>

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=795946&r1=795945&r2=795946&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Mon Jul 20 18:21:26 2009
@@ -280,20 +280,20 @@
         </site>
     </distributionManagement>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>codehaus</id>
-            <name>Codehaus Release Repository</name>
-            <url>http://repository.codehaus.org</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
+    <!--<pluginRepositories>-->
+        <!--<pluginRepository>-->
+            <!--<id>codehaus</id>-->
+            <!--<name>Codehaus Release Repository</name>-->
+            <!--<url>http://repository.codehaus.org</url>-->
+            <!--<layout>default</layout>-->
+            <!--<snapshots>-->
+                <!--<enabled>false</enabled>-->
+            <!--</snapshots>-->
+            <!--<releases>-->
+                <!--<enabled>true</enabled>-->
+            <!--</releases>-->
+        <!--</pluginRepository>-->
+    <!--</pluginRepositories>-->
     
     <profiles>
         <profile>



Mime
View raw message