geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r887824 - in /geronimo/server/trunk: framework/bundles/karaf-client/pom.xml framework/bundles/pom.xml framework/modules/geronimo-kernel/pom.xml framework/modules/geronimo-system/pom.xml framework/pom.xml pom.xml
Date Mon, 07 Dec 2009 02:30:48 GMT
Author: gawor
Date: Mon Dec  7 02:30:32 2009
New Revision: 887824

URL: http://svn.apache.org/viewvc?rev=887824&view=rev
Log:
tie down maven-antrun-plugin and add parent element to karaf-client bundle to fix weird build
issues related to maven-antrun-plugin

Modified:
    geronimo/server/trunk/framework/bundles/karaf-client/pom.xml
    geronimo/server/trunk/framework/bundles/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/bundles/karaf-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/karaf-client/pom.xml?rev=887824&r1=887823&r2=887824&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/karaf-client/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/karaf-client/pom.xml Mon Dec  7 02:30:32 2009
@@ -21,8 +21,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-
     <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>framework</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>karaf-client</artifactId>
     <packaging>jar</packaging>

Modified: geronimo/server/trunk/framework/bundles/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/pom.xml?rev=887824&r1=887823&r2=887824&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/pom.xml Mon Dec  7 02:30:32 2009
@@ -50,7 +50,6 @@
         <module>httpcore</module>
         <module>karaf-client</module>
         <!-- todo remove -->
-        <module>log4j</module>
         <module>sxc-jaxb</module>
         <module>sxc-runtime</module>
         <module>wadi-aop</module>

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=887824&r1=887823&r2=887824&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Mon Dec  7 02:30:32 2009
@@ -161,14 +161,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             
             <plugin>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=887824&r1=887823&r2=887824&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Mon Dec  7 02:30:32 2009
@@ -34,7 +34,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -155,14 +155,6 @@
                         </configuration>
                     </execution>
                 </executions>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=887824&r1=887823&r2=887824&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Mon Dec  7 02:30:32 2009
@@ -169,11 +169,6 @@
             <!--</dependency>-->
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.15_1-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>sxc-jaxb</artifactId>
                 <version>0.7.2_1-SNAPSHOT</version>
             </dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=887824&r1=887823&r2=887824&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Dec  7 02:30:32 2009
@@ -2181,6 +2181,21 @@
                     </configuration>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.3</version>
+
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.ant</groupId>
+                            <artifactId>ant-nodeps</artifactId>
+                            <version>1.7.1</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+
+
                 <!-- INTERNAL -->
 
                 <plugin>



Mime
View raw message