Author: stephenc
Date: Wed Jul 6 12:39:44 2011
New Revision: 1143382
URL: http://svn.apache.org/viewvc?rev=1143382&view=rev
Log:
Upgrade to plexus-archiver 2.0
o Requires careful dancing in what dependencies you upgrade in order to ensure
that the tests continue to pass.
o Seems m-common-artifact-filters 1.3 causes a lot of breakage
Added:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/Interpolator.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/RegexBasedInterpolator.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1143382&r1=1143381&r2=1143382&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Wed Jul 6 12:39:44 2011
@@ -154,12 +154,12 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.1</version>
+ <version>3.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -174,7 +174,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
- <version>1.0-alpha-5</version>
+ <version>2.0</version>
</dependency>
<!-- shared -->
@@ -230,28 +230,20 @@ under the License.
<scope>test</scope>
<version>${pluginTestingVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ <version>1.9</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.1</version>
+ <version>2.6</version>
<scope>compile</scope>
</dependency>
</dependencies>
- <!-- @todo Temporary until plexus-archiver 1.3 is released -->
- <repositories>
- <repository>
- <id>Plexus Snapshots</id>
-
<url>https://oss.sonatype.org/content/repositories/plexus-snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
<build>
<pluginManagement>
<plugins>
Added:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/Interpolator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/Interpolator.java?rev=1143382&view=auto
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/Interpolator.java
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/Interpolator.java
Wed Jul 6 12:39:44 2011
@@ -0,0 +1,15 @@
+package org.codehaus.plexus.util.interpolation;
+
+/**
+ * COPIED FROM plexus-utils-1.5.15 TO SATISFY TESTS
+ *
+ * Interpolator interface. Based on existing RegexBasedInterpolator interface.
+ *
+ * @author cstamas
+ * @deprecated Use plexus-interpolation APIs instead.
+ * @version $Id: Interpolator.java 12174 2010-05-16 21:04:35Z rfscholte $
+ */
+public interface Interpolator
+ extends org.codehaus.plexus.interpolation.Interpolator
+{
+}
\ No newline at end of file
Added:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/RegexBasedInterpolator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/RegexBasedInterpolator.java?rev=1143382&view=auto
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/RegexBasedInterpolator.java
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/RegexBasedInterpolator.java
Wed Jul 6 12:39:44 2011
@@ -0,0 +1,47 @@
+package org.codehaus.plexus.util.interpolation;
+
+import java.util.List;
+
+/**
+ * COPIED FROM plexus-utils-1.5.15 TO SATISFY TESTS
+ *
+ * @version $Id: RegexBasedInterpolator.java 12174 2010-05-16 21:04:35Z
rfscholte $
+ * @deprecated Use plexus-interpolation APIs instead.
+ */
+public class RegexBasedInterpolator
+ extends org.codehaus.plexus.interpolation.RegexBasedInterpolator
+ implements Interpolator
+{
+ public RegexBasedInterpolator()
+ {
+ super();
+ }
+
+ public RegexBasedInterpolator( List valueSources )
+ {
+ super( valueSources );
+ }
+
+ public RegexBasedInterpolator( String startRegex,
+ String endRegex,
+ List valueSources )
+ {
+ super( startRegex, endRegex, valueSources );
+ }
+
+ public RegexBasedInterpolator( String startRegex,
+ String endRegex )
+ {
+ super( startRegex, endRegex );
+ }
+
+ public void addValueSource( ValueSource valueSource )
+ {
+ super.addValueSource( valueSource );
+ }
+
+ public void removeValuesSource( ValueSource valueSource )
+ {
+ super.removeValuesSource( valueSource );
+ }
+}
\ No newline at end of file
Added:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java?rev=1143382&view=auto
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/codehaus/plexus/util/interpolation/ValueSource.java
Wed Jul 6 12:39:44 2011
@@ -0,0 +1,13 @@
+package org.codehaus.plexus.util.interpolation;
+
+/**
+ * COPIED FROM plexus-utils-1.5.15 TO SATISFY TESTS
+ *
+ * @author jdcasey
+ * @deprecated Use plexus-interpolation APIs instead.
+ * @version $Id: ValueSource.java 12174 2010-05-16 21:04:35Z rfscholte $
+ */
+public interface ValueSource extends
org.codehaus.plexus.interpolation.ValueSource
+{
+
+}
\ No newline at end of file
