continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1655878 - in /continuum/trunk: ./ continuum-artifact-manager/ continuum-buildagent/continuum-buildagent-core/ continuum-core/ continuum-data-management/data-management-cli/ continuum-notifiers/continuum-notifier-wagon/ continuum-release/
Date Thu, 29 Jan 2015 22:15:58 GMT
Author: batkinson
Date: Thu Jan 29 22:15:57 2015
New Revision: 1655878

URL: http://svn.apache.org/r1655878
Log:
Tweaked dependencies so IDE support works without extra configuration.

Modified:
    continuum/trunk/continuum-artifact-manager/pom.xml
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/pom.xml
    continuum/trunk/continuum-core/pom.xml
    continuum/trunk/continuum-data-management/data-management-cli/pom.xml
    continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml
    continuum/trunk/continuum-release/pom.xml
    continuum/trunk/pom.xml

Modified: continuum/trunk/continuum-artifact-manager/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-artifact-manager/pom.xml?rev=1655878&r1=1655877&r2=1655878&view=diff
==============================================================================
--- continuum/trunk/continuum-artifact-manager/pom.xml (original)
+++ continuum/trunk/continuum-artifact-manager/pom.xml Thu Jan 29 22:15:57 2015
@@ -35,6 +35,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact-manager</artifactId>
+      <scope>compile</scope>
     </dependency>
     <!-- Promoted transitive dependencies -->
     <dependency>

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/pom.xml?rev=1655878&r1=1655877&r2=1655878&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/pom.xml (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/pom.xml Thu Jan 29 22:15:57
2015
@@ -108,6 +108,16 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
+    <!-- start - order matters, requires maven 2.0.9+ -->
+    <dependency>
+      <groupId>org.apache.continuum</groupId>
+      <artifactId>continuum-artifact-manager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact-manager</artifactId>
+    </dependency>
+    <!-- end - order matters, requires maven 2.0.9+ -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>

Modified: continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/pom.xml?rev=1655878&r1=1655877&r2=1655878&view=diff
==============================================================================
--- continuum/trunk/continuum-core/pom.xml (original)
+++ continuum/trunk/continuum-core/pom.xml Thu Jan 29 22:15:57 2015
@@ -89,6 +89,16 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
+    <!-- start - order matters, requires maven 2.0.9+ -->
+    <dependency>
+      <groupId>org.apache.continuum</groupId>
+      <artifactId>continuum-artifact-manager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact-manager</artifactId>
+    </dependency>
+    <!-- end - order matters -->
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-api</artifactId>

Modified: continuum/trunk/continuum-data-management/data-management-cli/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-cli/pom.xml?rev=1655878&r1=1655877&r2=1655878&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/data-management-cli/pom.xml (original)
+++ continuum/trunk/continuum-data-management/data-management-cli/pom.xml Thu Jan 29 22:15:57
2015
@@ -36,12 +36,18 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
+    <!-- start - order matters, requires maven 2.0.9+ -->
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-artifact-manager</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact-manager</artifactId>
+    </dependency>
+    <!-- end - order matters -->
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
     </dependency>
     <dependency>

Modified: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml?rev=1655878&r1=1655877&r2=1655878&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml Thu Jan 29 22:15:57
2015
@@ -32,12 +32,18 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
+    <!-- start - order matters, requires maven 2.0.9+ -->
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-artifact-manager</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact-manager</artifactId>
+    </dependency>
+    <!-- end - order matters -->
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
     </dependency>
     <dependency>

Modified: continuum/trunk/continuum-release/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/pom.xml?rev=1655878&r1=1655877&r2=1655878&view=diff
==============================================================================
--- continuum/trunk/continuum-release/pom.xml (original)
+++ continuum/trunk/continuum-release/pom.xml Thu Jan 29 22:15:57 2015
@@ -81,11 +81,17 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
+    <!-- start - order matters, requires maven 2.0.9+ -->
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-artifact-manager</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact-manager</artifactId>
+    </dependency>
+    <!-- end - order matters, requires maven 2.0.9+ -->
+    <dependency>
       <groupId>org.apache.maven.release</groupId>
       <artifactId>maven-release-manager</artifactId>
     </dependency>

Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=1655878&r1=1655877&r2=1655878&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Thu Jan 29 22:15:57 2015
@@ -35,7 +35,7 @@
   <version>1.4.3-SNAPSHOT</version>
 
   <prerequisites>
-    <maven>2.0.7</maven>
+    <maven>2.0.9</maven>
   </prerequisites>
 
   <properties>
@@ -257,7 +257,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.0-alpha-4</version>
+        <version>1.3.1</version>
         <executions>
           <execution>
             <goals>
@@ -265,6 +265,9 @@
             </goals>
             <configuration>
               <rules>
+                <requireMavenVersion>
+                  <version>2.0.9</version>
+                </requireMavenVersion>
                 <bannedDependencies>
                   <excludes>
                     <exclude>velocity:velocity-dep</exclude>
@@ -283,6 +286,9 @@
                     <exclude>jdom:jdom</exclude>
                     <exclude>org.apache.maven:maven-artifact-manager</exclude>
                   </excludes>
+                  <includes>
+                    <include>org.apache.maven:maven-artifact-manager:*:jar:provided</include>
+                  </includes>
                 </bannedDependencies>
               </rules>
             </configuration>
@@ -470,6 +476,7 @@
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-artifact-manager</artifactId>
         <version>${maven.version}</version>
+        <scope>provided</scope>
         <exclusions>
           <exclusion>
             <groupId>org.codehaus.plexus</groupId>



Mime
View raw message