From 34a8aef8e1c556dfa56fec3ba24548d667fc8ff6 Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 30 May 2005 05:43:43 +0000
Subject: [PATCH] update to scm alpha-1 release, upgrade plexus to latest
 released

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@179015 13f79535-47bb-0310-9956-ffa450edef68
---
 scm/maven.xml   | 24 ------------------------
 scm/project.xml | 16 ++++++++--------
 2 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 scm/maven.xml

diff --git a/scm/maven.xml b/scm/maven.xml
deleted file mode 100644
index 12563bde..00000000
--- a/scm/maven.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<project xmlns:ant="jelly:ant" xmlns:j="jelly:core">
-  <!--
-    TEMPORARY!!!
-    Remove before release - just simplifies the bundling of the beta version
-  -->
-  <postGoal name="java:jar-resources">
-    <j:set var="libdir" value="${maven.build.dest}/plugin-resources/lib" />
-    <ant:mkdir dir="${libdir}" />
-    <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" />
-
-    <j:file name="${maven.build.dest}/project.properties"><j:whitespace>
-maven.jar.override=on
-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
-    </j:whitespace></j:file>
-  </postGoal>
-</project>
-
diff --git a/scm/project.xml b/scm/project.xml
index a896dddd..b64c13bf 100644
--- a/scm/project.xml
+++ b/scm/project.xml
@@ -119,12 +119,12 @@
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-1</version>
+      <version>1.0-alpha-3</version>
     </dependency>
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0-alpha-1</version>
+      <version>1.0-alpha-3</version>
     </dependency>
     <dependency>
       <groupId>classworlds</groupId>
@@ -132,19 +132,19 @@
       <version>1.1-alpha-1</version>
     </dependency>
     <dependency>
-      <groupId>maven</groupId>
+      <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-api</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
+      <version>1.0-alpha-1</version>
     </dependency>
     <dependency>
-      <groupId>maven</groupId>
+      <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-cvs</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
+      <version>1.0-alpha-1</version>
     </dependency>
     <dependency>
-      <groupId>maven</groupId>
+      <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-svn</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
+      <version>1.0-alpha-1</version>
     </dependency>
   </dependencies>
 </project>