You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/01/18 12:26:42 UTC

svn commit: r125481 - /maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml /maven/maven-1/plugins/branches/scm-1.5-branch/project.xml

Author: brett
Date: Tue Jan 18 03:26:40 2005
New Revision: 125481

URL: http://svn.apache.org/viewcvs?view=rev&rev=125481
Log:
use released plexus jars

Modified:
   maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml
   maven/maven-1/plugins/branches/scm-1.5-branch/project.xml

Modified: maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml?view=diff&rev=125481&p1=maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml&r1=125480&p2=maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml&r2=125481
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml	(original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml	Tue Jan 18 03:26:40 2005
@@ -6,20 +6,15 @@
   <postGoal name="java:jar-resources">
     <j:set var="libdir" value="${maven.build.dest}/plugin-resources/lib" />
     <ant:mkdir dir="${libdir}" />
-    <ant:copy tofile="${libdir}/plexus-utils.jar" file="${pom.getDependencyPath('plexus:plexus-utils')}" />
-    <ant:copy tofile="${libdir}/plexus-container-default.jar" file="${pom.getDependencyPath('plexus:plexus-container-default')}" />
     <ant:copy tofile="${libdir}/maven-scm-api.jar" file="${pom.getDependencyPath('maven:maven-scm-api')}" />
     <ant:copy tofile="${libdir}/maven-scm-provider-cvs.jar" file="${pom.getDependencyPath('maven:maven-scm-provider-cvs')}" />
     <ant:copy tofile="${libdir}/maven-scm-provider-svn.jar" file="${pom.getDependencyPath('maven:maven-scm-provider-svn')}" />
 
     <!-- Workaround JAR override bug with SNAPSHOT versions in 1.0.2 -->
     <ant:replace file="${maven.build.dest}/project.xml" token="1.0-alpha-1-SNAPSHOT" value="1.0-alpha-1-dev" />
-    <ant:replace file="${maven.build.dest}/project.xml" token="1.0-alpha-2-SNAPSHOT" value="1.0-alpha-2-dev" />
 
     <j:file name="${maven.build.dest}/project.properties"><j:whitespace>
 maven.jar.override=on
-maven.jar.plexus-utils=$${basedir}/plugin-resources/lib/plexus-utils.jar
-maven.jar.plexus-container-default=$${basedir}/plugin-resources/lib/plexus-container-default.jar
 maven.jar.maven-scm-api=$${basedir}/plugin-resources/lib/maven-scm-api.jar
 maven.jar.maven-scm-provider-cvs=$${basedir}/plugin-resources/lib/maven-scm-provider-cvs.jar
 maven.jar.maven-scm-provider-svn=$${basedir}/plugin-resources/lib/maven-scm-provider-svn.jar

Modified: maven/maven-1/plugins/branches/scm-1.5-branch/project.xml
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/project.xml?view=diff&rev=125481&p1=maven/maven-1/plugins/branches/scm-1.5-branch/project.xml&r1=125480&p2=maven/maven-1/plugins/branches/scm-1.5-branch/project.xml&r2=125481
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/project.xml	(original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/project.xml	Tue Jan 18 03:26:40 2005
@@ -2,7 +2,7 @@
 
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -114,12 +114,12 @@
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-2-SNAPSHOT</version>
+      <version>1.0-alpha-1</version>
     </dependency>
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
+      <version>1.0-alpha-1</version>
     </dependency>
     <dependency>
       <groupId>classworlds</groupId>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org