maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r574838 - in /maven/components/branches/MNG-3205: maven-artifact-test/pom.xml maven-core/pom.xml maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java maven-plugin-descriptor/pom.xml maven-project/pom.xml pom.xml
Date Wed, 12 Sep 2007 08:24:53 GMT
Author: markh
Date: Wed Sep 12 01:24:52 2007
New Revision: 574838

URL: http://svn.apache.org/viewvc?rev=574838&view=rev
Log:
[MNG-3205] Switched dependencies to use maven-artifact 3.x

Modified:
    maven/components/branches/MNG-3205/maven-artifact-test/pom.xml
    maven/components/branches/MNG-3205/maven-core/pom.xml
    maven/components/branches/MNG-3205/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
    maven/components/branches/MNG-3205/maven-plugin-descriptor/pom.xml
    maven/components/branches/MNG-3205/maven-project/pom.xml
    maven/components/branches/MNG-3205/pom.xml

Modified: maven/components/branches/MNG-3205/maven-artifact-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3205/maven-artifact-test/pom.xml?rev=574838&r1=574837&r2=574838&view=diff
==============================================================================
--- maven/components/branches/MNG-3205/maven-artifact-test/pom.xml (original)
+++ maven/components/branches/MNG-3205/maven-artifact-test/pom.xml Wed Sep 12 01:24:52 2007
@@ -40,11 +40,7 @@
       <artifactId>maven-settings</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-manager</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.artifact</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
     <dependency>

Modified: maven/components/branches/MNG-3205/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3205/maven-core/pom.xml?rev=574838&r1=574837&r2=574838&view=diff
==============================================================================
--- maven/components/branches/MNG-3205/maven-core/pom.xml (original)
+++ maven/components/branches/MNG-3205/maven-core/pom.xml Wed Sep 12 01:24:52 2007
@@ -112,7 +112,7 @@
       <artifactId>maven-model</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.artifact</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
     <dependency>
@@ -125,10 +125,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-repository-metadata</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
       <artifactId>maven-error-diagnostics</artifactId>
     </dependency>
     <dependency>
@@ -177,10 +173,6 @@
           <groupId>org.codehaus.plexus</groupId>
         </exclusion>
       </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-manager</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

Modified: maven/components/branches/MNG-3205/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3205/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java?rev=574838&r1=574837&r2=574838&view=diff
==============================================================================
--- maven/components/branches/MNG-3205/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
(original)
+++ maven/components/branches/MNG-3205/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
Wed Sep 12 01:24:52 2007
@@ -42,7 +42,6 @@
         artifacts.add( "doxia-sink-api" );
         artifacts.add( "jsch" );
         artifacts.add( "maven-artifact" );
-        artifacts.add( "maven-artifact-manager" );
         artifacts.add( "maven-core" );
         artifacts.add( "maven-error-diagnoser" );
         artifacts.add( "maven-model" );
@@ -54,7 +53,6 @@
         artifacts.add( "maven-profile" );
         artifacts.add( "maven-project" );
         artifacts.add( "maven-reporting-api" );
-        artifacts.add( "maven-repository-metadata" );
         artifacts.add( "maven-settings" );
         artifacts.add( "plexus-container-default" );
         artifacts.add( "plexus-interactivity-api" );

Modified: maven/components/branches/MNG-3205/maven-plugin-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3205/maven-plugin-descriptor/pom.xml?rev=574838&r1=574837&r2=574838&view=diff
==============================================================================
--- maven/components/branches/MNG-3205/maven-plugin-descriptor/pom.xml (original)
+++ maven/components/branches/MNG-3205/maven-plugin-descriptor/pom.xml Wed Sep 12 01:24:52
2007
@@ -46,7 +46,7 @@
       <artifactId>maven-plugin-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.artifact</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
     <dependency>

Modified: maven/components/branches/MNG-3205/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3205/maven-project/pom.xml?rev=574838&r1=574837&r2=574838&view=diff
==============================================================================
--- maven/components/branches/MNG-3205/maven-project/pom.xml (original)
+++ maven/components/branches/MNG-3205/maven-project/pom.xml Wed Sep 12 01:24:52 2007
@@ -48,10 +48,6 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-manager</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -62,7 +58,7 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.artifact</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
     <dependency>

Modified: maven/components/branches/MNG-3205/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3205/pom.xml?rev=574838&r1=574837&r2=574838&view=diff
==============================================================================
--- maven/components/branches/MNG-3205/pom.xml (original)
+++ maven/components/branches/MNG-3205/pom.xml Wed Sep 12 01:24:52 2007
@@ -100,8 +100,6 @@
     </pluginManagement>
   </build>
   <modules>
-    <module>maven-artifact</module>
-    <module>maven-artifact-manager</module>
     <module>maven-artifact-test</module>
     <module>maven-core</module>
     <module>maven-error-diagnostics</module>
@@ -114,7 +112,6 @@
     <module>maven-profile</module>
     <module>maven-project</module>
     <module>maven-reporting</module>
-    <module>maven-repository-metadata</module>
     <module>maven-script</module>
     <module>maven-settings</module>
   </modules>
@@ -158,19 +155,9 @@
         <version>${mavenVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-repository-metadata</artifactId>
-        <version>${mavenVersion}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.artifact</groupId>
         <artifactId>maven-artifact</artifactId>
-        <version>${mavenVersion}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-artifact-manager</artifactId>
-        <version>${mavenVersion}</version>
+        <version>3.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
@@ -216,7 +203,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>



Mime
View raw message