You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by dj...@apache.org on 2010/02/28 00:11:58 UTC

svn commit: r917077 - in /incubator/aries/trunk: eba-maven-plugin/pom.xml parent/default-parent/pom.xml pom.xml

Author: djencks
Date: Sat Feb 27 23:11:58 2010
New Revision: 917077

URL: http://svn.apache.org/viewvc?rev=917077&view=rev
Log:
ARIES-173 update eba-maven-plugin to be a top level subproject, and don't allow auromatic version upgrades

Modified:
    incubator/aries/trunk/eba-maven-plugin/pom.xml
    incubator/aries/trunk/parent/default-parent/pom.xml
    incubator/aries/trunk/pom.xml

Modified: incubator/aries/trunk/eba-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/eba-maven-plugin/pom.xml?rev=917077&r1=917076&r2=917077&view=diff
==============================================================================
--- incubator/aries/trunk/eba-maven-plugin/pom.xml (original)
+++ incubator/aries/trunk/eba-maven-plugin/pom.xml Sat Feb 27 23:11:58 2010
@@ -24,12 +24,12 @@
          xmlns='http://maven.apache.org/POM/4.0.0'>
     <modelVersion>4.0.0</modelVersion>
 
-
     <parent>
-        <groupId>org.apache.aries.application</groupId>
-        <artifactId>application</artifactId>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
         <version>1.0.0-incubating-SNAPSHOT</version>
     </parent>
+    
     <artifactId>eba-maven-plugin</artifactId>
     <version>1.0.0-incubating-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
@@ -38,26 +38,32 @@
     <description>Builds an eba (Enterprise Bundle Archive) from the project for deployment to an aries server.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/eba-maven-plugin</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/eba-maven-plugin</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/aries/trunk/eba-maven-plugin</url>
+    </scm>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.0-alpha-6</version>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
-            <version>3.0-alpha-2</version>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
-            <version>3.0-alpha-6</version>
+            <version>2.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-archiver</artifactId>
-            <version>2.4</version>
+            <version>2.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.shared</groupId>

Modified: incubator/aries/trunk/parent/default-parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/parent/default-parent/pom.xml?rev=917077&r1=917076&r2=917077&view=diff
==============================================================================
--- incubator/aries/trunk/parent/default-parent/pom.xml (original)
+++ incubator/aries/trunk/parent/default-parent/pom.xml Sat Feb 27 23:11:58 2010
@@ -224,6 +224,11 @@
                             <exclude>org.eclipse:osgi</exclude>
                             <!-- 2.0.0-SNAPSHOT < 2.0.0-beta -->
                             <exclude>org.apache.openjpa:openjpa</exclude>
+                            <!-- maven 3.0 components don't work with 2.0 -->
+                            <exclude>org.apache.maven:maven-plugin-api</exclude>
+                            <exclude>org.apache.maven:maven-project</exclude>
+                            <exclude>org.apache.maven:maven-artifact</exclude>
+                            <exclude>org.apache.maven:maven-archiver</exclude>
                         </excludes>
 
                     </configuration>

Modified: incubator/aries/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/pom.xml?rev=917077&r1=917076&r2=917077&view=diff
==============================================================================
--- incubator/aries/trunk/pom.xml (original)
+++ incubator/aries/trunk/pom.xml Sat Feb 27 23:11:58 2010
@@ -38,6 +38,7 @@
 
     <modules>
         <module>parent</module>
+        <module>eba-maven-plugin</module>
         <module>testsupport</module>
         <module>util</module>
         <module>blueprint</module>