geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r930922 - in /geronimo/server/trunk: framework/configs/online-deployer/pom.xml framework/configs/plugin/pom.xml framework/modules/geronimo-deploy-jsr88/pom.xml framework/modules/geronimo-deployment/pom.xml framework/pom.xml pom.xml
Date Mon, 05 Apr 2010 17:55:36 GMT
Author: gawor
Date: Mon Apr  5 17:55:36 2010
New Revision: 930922

URL: http://svn.apache.org/viewvc?rev=930922&view=rev
Log:
some dependency updates + fixing -Dstage=bootstrap broken by nexus profile

Modified:
    geronimo/server/trunk/framework/configs/online-deployer/pom.xml
    geronimo/server/trunk/framework/configs/plugin/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=930922&r1=930921&r2=930922&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Mon Apr  5 17:55:36 2010
@@ -189,10 +189,6 @@
                             <groupId>com.thoughtworks.xstream</groupId>
                             <artifactId>xstream</artifactId>
                         </element>
-                        <element>
-                            <groupId>org.codehaus.plexus</groupId>
-                            <artifactId>plexus-archiver</artifactId>
-                        </element>
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>
                     <category>Deployment</category>

Modified: geronimo/server/trunk/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/pom.xml?rev=930922&r1=930921&r2=930922&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/pom.xml Mon Apr  5 17:55:36 2010
@@ -35,16 +35,6 @@
     <description>Plugin management services including the installer.</description>
 
     <dependencies>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-            <!--<artifactId>plexus-archiver</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-          <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-          <!--<artifactId>plexus-utils</artifactId>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
@@ -92,15 +82,6 @@
             <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.codehaus.plexus</groupId>-->
-            <!--<artifactId>plexus-container-default</artifactId>-->
-        <!--</dependency>-->
-        
-        <!--<dependency>-->
-            <!--<groupId>org.codehaus.plexus</groupId>-->
-            <!--<artifactId>plexus-component-api</artifactId>-->
-        <!--</dependency>-->
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml?rev=930922&r1=930921&r2=930922&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml Mon Apr  5 17:55:36
2010
@@ -56,19 +56,12 @@
             <artifactId>geronimo-deploy-config</artifactId>
             <version>${version}</version>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.codehaus.plexus</groupId>-->
-            <!--<artifactId>plexus-archiver</artifactId>-->
-        <!--</dependency>-->
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </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-crypto</artifactId>

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml?rev=930922&r1=930921&r2=930922&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml Mon Apr  5 17:55:36
2010
@@ -43,10 +43,6 @@
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-            <!--<artifactId>plexus-archiver</artifactId>-->
-        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=930922&r1=930921&r2=930922&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Mon Apr  5 17:55:36 2010
@@ -146,26 +146,18 @@
             <!--</exclusions>-->
             <!--</dependency>-->
 
-            <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-            <!--<artifactId>plexus-archiver</artifactId>-->
-            <!--<version>1.0.9_1-SNAPSHOT</version>-->
-            <!--</dependency>-->
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>sxc-jaxb</artifactId>
                 <version>0.7.2_1-SNAPSHOT</version>
             </dependency>
+
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>sxc-runtime</artifactId>
                 <version>0.7.2_1-SNAPSHOT</version>
             </dependency>
-            <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-            <!--<artifactId>plexus-utils</artifactId>-->
-            <!--<version>1.5.15_1-SNAPSHOT</version>-->
-            <!--</dependency>-->
+
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
@@ -215,27 +207,6 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0.3-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jaxb_2.2_spec</artifactId>
-                <version>1.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-saaj_1.3_spec</artifactId>
-                <version>1.0.2-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-core</artifactId>
                 <version>2.2.1</version>
@@ -246,9 +217,9 @@
                 <version>1.0-alpha-3</version>
             </dependency>
 
-
         </dependencies>
     </dependencyManagement>
+
     <build>
         <pluginManagement>
             <plugins>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=930922&r1=930921&r2=930922&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Apr  5 17:55:36 2010
@@ -264,6 +264,13 @@
                 <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
                 <version>1.1.3-SNAPSHOT</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-saaj_1.3_spec</artifactId>
+                <version>1.0.2-SNAPSHOT</version>
+            </dependency>
+
             <!--
             NOTE: The full source for this artifact is private due to Sun licensing issues.
                   To view the generated XmlBeans source please see the -src artifact in the
repository:
@@ -2368,22 +2375,21 @@ only found in cxf
     </pluginRepositories>
 
     <profiles>
-        <!--<profile>-->
-        <!-- replaced by nexus profiles -->
-            <!--<id>default</id>-->
-
-            <!--<activation>-->
-                <!--<activeByDefault>true</activeByDefault>-->
-            <!--</activation>-->
-
-            <!--<modules>-->
-                <!--<module>testsupport</module>-->
-                <!--<module>framework</module>-->
-                <!--<module>plugins</module>-->
-                <!--<module>plugingroups</module>-->
-                <!--<module>assemblies</module>-->
-            <!--</modules>-->
-        <!--</profile>-->
+        <profile>
+            <id>default</id>
+
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <modules>
+                <module>testsupport</module>
+                <module>framework</module>
+                <module>plugins</module>
+                <module>plugingroups</module>
+                <module>assemblies</module>
+            </modules>
+        </profile>
 
         <profile>
             <id>it</id>
@@ -2435,34 +2441,12 @@ only found in cxf
         </profile>
 
         <profile>
-            <id>nexus</id>
-            <activation>
-                <property>
-                    <name>nexus</name>
-                </property>
-            </activation>
-            <modules>
-                <module>testsupport</module>
-                <module>framework</module>
-                <module>plugins</module>
-                <module>plugingroups</module>
-                <module>assemblies</module>
-            </modules>
-        </profile>
-        <profile>
             <id>explicit-repos</id>
             <activation>
                 <property>
                     <name>!nexus</name>
                 </property>
             </activation>
-            <modules>
-                <module>testsupport</module>
-                <module>framework</module>
-                <module>plugins</module>
-                <module>plugingroups</module>
-                <module>assemblies</module>
-            </modules>
             <repositories>
                 <repository>
                     <!-- org.ops4j routing -->



Mime
View raw message