Author: brianf Date: Mon May 5 06:46:40 2008 New Revision: 653481 URL: http://svn.apache.org/viewvc?rev=653481&view=rev Log: clean up the poms and move versions to dependencyManagement Issue id: c
Modified: maven/components/trunk/maven-core/pom.xml maven/components/trunk/maven-distribution/ (props changed) maven/components/trunk/maven-distribution/pom.xml maven/components/trunk/maven-embedder-integration-tests/pom.xml maven/components/trunk/maven-embedder/pom.xml maven/components/trunk/maven-plugin-api/pom.xml maven/components/trunk/maven-profile/pom.xml maven/components/trunk/maven-project/ (props changed) maven/components/trunk/maven-project/pom.xml maven/components/trunk/maven-toolchain/pom.xml maven/components/trunk/pom.xml Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=653481&r1=653480&r2=653481&view=diff ============================================================================== --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Mon May 5 06:46:40 2008 @@ -34,73 +34,48 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-workspace</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-lifecycle</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-reporting-api</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-profile</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven.artifact</groupId> <artifactId>maven-artifact</artifactId> </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.0</version> - <exclusions> - <exclusion> - <artifactId>commons-lang</artifactId> - <groupId>commons-lang</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> - <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-interactivity-api</artifactId> - <version>1.0-alpha-6</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </exclusion> - </exclusions> </dependency> + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> @@ -112,13 +87,11 @@ <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-file</artifactId> - <version>1.0-beta-2</version> <scope>test</scope> </dependency> <dependency> <groupId>easymock</groupId> <artifactId>easymock</artifactId> - <version>1.2_Java1.3</version> <scope>test</scope> </dependency> <dependency> @@ -132,7 +105,6 @@ <dependency> <groupId>aspectj</groupId> <artifactId>aspectjrt</artifactId> - <version>1.5.3</version> </dependency> </dependencies> <build> Propchange: maven/components/trunk/maven-distribution/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon May 5 06:46:40 2008 @@ -0,0 +1 @@ +target Modified: maven/components/trunk/maven-distribution/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-distribution/pom.xml?rev=653481&r1=653480&r2=653481&view=diff ============================================================================== --- maven/components/trunk/maven-distribution/pom.xml (original) +++ maven/components/trunk/maven-distribution/pom.xml Mon May 5 06:46:40 2008 @@ -33,22 +33,18 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-embedder</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-toolchain</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> @@ -59,16 +55,6 @@ <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <exclusions> - <exclusion> - <artifactId>commons-lang</artifactId> - <groupId>commons-lang</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> @@ -90,7 +76,6 @@ <dependency> <groupId>aspectj</groupId> <artifactId>aspectjrt</artifactId> - <version>1.5.3</version> </dependency> <dependency> <groupId>easymock</groupId> Modified: maven/components/trunk/maven-embedder-integration-tests/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder-integration-tests/pom.xml?rev=653481&r1=653480&r2=653481&view=diff ============================================================================== --- maven/components/trunk/maven-embedder-integration-tests/pom.xml (original) +++ maven/components/trunk/maven-embedder-integration-tests/pom.xml Mon May 5 06:46:40 2008 @@ -11,15 +11,8 @@ <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-embedder</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> </dependencies> Modified: maven/components/trunk/maven-embedder/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=653481&r1=653480&r2=653481&view=diff ============================================================================== --- maven/components/trunk/maven-embedder/pom.xml (original) +++ maven/components/trunk/maven-embedder/pom.xml Mon May 5 06:46:40 2008 @@ -33,17 +33,14 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-toolchain</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> @@ -54,16 +51,6 @@ <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <exclusions> - <exclusion> - <artifactId>commons-lang</artifactId> - <groupId>commons-lang</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> @@ -85,7 +72,6 @@ <dependency> <groupId>aspectj</groupId> <artifactId>aspectjrt</artifactId> - <version>1.5.3</version> </dependency> <dependency> <groupId>easymock</groupId> Modified: maven/components/trunk/maven-plugin-api/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-plugin-api/pom.xml?rev=653481&r1=653480&r2=653481&view=diff ============================================================================== --- maven/components/trunk/maven-plugin-api/pom.xml (original) +++ maven/components/trunk/maven-plugin-api/pom.xml Mon May 5 06:46:40 2008 @@ -38,12 +38,6 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> Modified: maven/components/trunk/maven-profile/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-profile/pom.xml?rev=653481&r1=653480&r2=653481&view=diff ============================================================================== --- maven/components/trunk/maven-profile/pom.xml (original) +++ maven/components/trunk/maven-profile/pom.xml Mon May 5 06:46:40 2008 @@ -45,7 +45,6 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> Propchange: maven/components/trunk/maven-project/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon May 5 06:46:40 2008 @@ -10,3 +10,4 @@ cobertura.ser .settings bin +dummy Modified: maven/components/trunk/maven-project/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/pom.xml?rev=653481&r1=653480&r2=653481&view=diff ============================================================================== --- maven/components/trunk/maven-project/pom.xml (original) +++ maven/components/trunk/maven-project/pom.xml Mon May 5 06:46:40 2008 @@ -35,17 +35,14 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-workspace</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-profile</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -66,7 +63,6 @@ <dependency> <groupId>aspectj</groupId> <artifactId>aspectjrt</artifactId> - <version>1.5.3</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> Modified: maven/components/trunk/maven-toolchain/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/pom.xml?rev=653481&r1=653480&r2=653481&view=diff ============================================================================== --- maven/components/trunk/maven-toolchain/pom.xml (original) +++ maven/components/trunk/maven-toolchain/pom.xml Mon May 5 06:46:40 2008 @@ -12,20 +12,12 @@ <url>http://maven.apache.org</url> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>2.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven.artifact</groupId> <artifactId>maven-artifact</artifactId> - <version>3.0-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: maven/components/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=653481&r1=653480&r2=653481&view=diff ============================================================================== --- maven/components/trunk/pom.xml (original) +++ maven/components/trunk/pom.xml Mon May 5 06:46:40 2008 @@ -241,6 +241,56 @@ <!--end--> <dependencies> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-workspace</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-lifecycle</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-reporting-api</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-profile</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-toolchain</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-embedder</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> <version>${plexusVersion}</version> @@ -311,7 +361,34 @@ <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>1.0</version> - </dependency> + <exclusions> + <exclusion> + <artifactId>commons-lang</artifactId> + <groupId>commons-lang</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + <!-- Needed for backward compat aspect. --> + <dependency> + <groupId>aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.5.3</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-interactivity-api</artifactId> + <version>1.0-alpha-6</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <!--start--> </dependencyManagement>