o Put all m2 core dependencies (plexus-container-default and plexus-utils)

under dependencyManagement of m2 and maven-plugins, and removed versions in all poms having either as a parent. Used version 1.0.2-SNAPSHOT for plexus-utils as that was used in maven-core and is not overridable. o Bumped maven-archiver version to 2.0-beta-1-SNAPSHOT for maven-ear-plugin git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227084 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 21:34:54 +00:00 · 2005-08-02 21:34:54 +00:00 · d396f24642
parent 6da771ab70
commit d396f24642
23 changed files with 29 additions and 31 deletions
--- a/maven-archetype/maven-archetype-core/pom.xml
+++ b/maven-archetype/maven-archetype-core/pom.xml
@ -16,12 +16,10 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
    </dependency>
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
    <dependency>
      <groupId>plexus</groupId>
--- a/maven-artifact-ant/pom.xml
+++ b/maven-artifact-ant/pom.xml
@ -42,7 +42,6 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
--- a/maven-artifact-manager/pom.xml
+++ b/maven-artifact-manager/pom.xml
@ -20,12 +20,10 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
    </dependency>
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
    <dependency>
      <groupId>org.apache.maven.wagon</groupId>
--- a/maven-artifact-test/pom.xml
+++ b/maven-artifact-test/pom.xml
@ -14,7 +14,6 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
    </dependency>
    <dependency>
      <groupId>org.apache.maven</groupId>
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@ -14,13 +14,11 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
  </dependencies>
 </project>
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@ -91,12 +91,10 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
    </dependency>
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
    </dependency>
    <dependency>
      <groupId>org.apache.maven.wagon</groupId>
--- a/maven-mboot2/pom.xml
+++ b/maven-mboot2/pom.xml
@ -29,7 +29,6 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
      <scope>runtime</scope>
    </dependency>
  </dependencies>
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@ -15,7 +15,6 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
  </dependencies>
  <build>
--- a/maven-plugin-descriptor/pom.xml
+++ b/maven-plugin-descriptor/pom.xml
@ -24,7 +24,6 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
    </dependency>
  </dependencies>
  <build>
--- a/maven-plugin-mapping/pom.xml
+++ b/maven-plugin-mapping/pom.xml
@ -30,7 +30,6 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
  </dependencies>
  <build>
--- a/maven-plugin-registry/pom.xml
+++ b/maven-plugin-registry/pom.xml
@ -14,12 +14,10 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
    </dependency>
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
  </dependencies>
  <build>
--- a/maven-plugin-tools/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-api/pom.xml
@ -27,7 +27,6 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
  </dependencies>
 </project>
--- a/maven-plugins/maven-ear-plugin/pom.xml
+++ b/maven-plugins/maven-ear-plugin/pom.xml
@ -14,7 +14,7 @@
    <dependency>
      <groupId>org.apache.maven</groupId>
      <artifactId>maven-archiver</artifactId>
-      <version>2.0-alpha-3</version>
+      <version>2.0-beta-1-SNAPSHOT</version>
    </dependency>
    <dependency>
      <groupId>org.apache.maven</groupId>
@ -24,7 +24,6 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
  </dependencies>
 </model>
--- a/maven-plugins/maven-eclipse-plugin/pom.xml
+++ b/maven-plugins/maven-eclipse-plugin/pom.xml
@ -28,12 +28,10 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
--- a/maven-plugins/maven-site-plugin/pom.xml
+++ b/maven-plugins/maven-site-plugin/pom.xml
@ -64,7 +64,6 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
  </dependencies>
  <developers>
--- a/maven-plugins/maven-source-plugin/pom.xml
+++ b/maven-plugins/maven-source-plugin/pom.xml
@ -19,7 +19,6 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
      <scope>test</scope>
    </dependency>
    <dependency>
--- a/maven-plugins/maven-verifier-plugin/pom.xml
+++ b/maven-plugins/maven-verifier-plugin/pom.xml
@ -26,7 +26,6 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@ -106,6 +106,20 @@
      </releases>
    </pluginRepository>
  </pluginRepositories>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
+        <version>1.0-alpha-4</version>
+      </dependency>
+      <dependency>
+        <groupId>plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>1.0.2-SNAPSHOT</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
  <modules>
    <module>maven-ant-plugin</module>
    <module>maven-assembly-plugin</module>
--- a/maven-profile/pom.xml
+++ b/maven-profile/pom.xml
@ -12,12 +12,10 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
    </dependency>
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
    <dependency>
      <groupId>org.apache.maven</groupId>
--- a/maven-project/pom.xml
+++ b/maven-project/pom.xml
@ -27,12 +27,10 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
    </dependency>
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
    <dependency>
      <groupId>org.apache.maven</groupId>
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@ -12,12 +12,10 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-4</version>
    </dependency>
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
    <dependency>
      <groupId>org.apache.maven</groupId>
--- a/pom.xml
+++ b/pom.xml
@ -147,6 +147,20 @@
      </releases>
    </pluginRepository>
  </pluginRepositories>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
+        <version>1.0-alpha-4</version>
+      </dependency>
+      <dependency>
+        <groupId>plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>1.0.2-SNAPSHOT</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
  <modules>
    <!-- module>maven-archetype</module -->
    <module>maven-archiver</module>
--- a/sandbox/maven-repository-checker/pom.xml
+++ b/sandbox/maven-repository-checker/pom.xml
@ -19,7 +19,6 @@
    <dependency>
      <groupId>plexus</groupId>
      <artifactId>plexus-utils</artifactId>
-      <version>1.0.1</version>
    </dependency>
  </dependencies>
  <build>