File maven-shared-pom.patch of Package maven-shared
Index: pom.xml
===================================================================
--- pom.xml.orig
+++ pom.xml
@@ -114,16 +114,17 @@ under the License.
<modules>
<module>file-management</module>
<module>maven-ant</module>
- <module>maven-archiver</module>
+ <!--<module>maven-archiver</module>-->
<module>maven-common-artifact-filters</module>
+ <module>maven-invoker</module>
+ <module>maven-reporting-api</module>
<module>maven-dependency-analyzer</module>
<module>maven-dependency-tree</module>
<module>maven-downloader</module>
- <module>maven-doxia-tools</module>
+ <!--<module>maven-doxia-tools</module>-->
<module>maven-filtering</module>
- <module>maven-invoker</module>
- <module>maven-model-converter</module>
- <module>maven-osgi</module>
+ <!--<module>maven-model-converter</module>-->
+ <!--<module>maven-osgi</module>-->
<module>maven-reporting-impl</module>
<module>maven-repository-builder</module>
<module>maven-runtime</module>
Index: maven-common-artifact-filters/pom.xml
===================================================================
--- maven-common-artifact-filters/pom.xml.orig
+++ maven-common-artifact-filters/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
+ <version>1.0-alpha-8</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -76,9 +76,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
+ <groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>1.1</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Index: maven-invoker/pom.xml
===================================================================
--- maven-invoker/pom.xml.orig
+++ maven-invoker/pom.xml
@@ -78,14 +78,14 @@ under the License.
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.8</version>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.4</version>
<executions>
<execution>
<id>create-component-descriptor</id>
<phase>generate-resources</phase>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Index: maven-dependency-analyzer/pom.xml
===================================================================
--- maven-dependency-analyzer/pom.xml.orig
+++ maven-dependency-analyzer/pom.xml
@@ -105,11 +105,12 @@
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.4</version>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Index: maven-dependency-tree/pom.xml
===================================================================
--- maven-dependency-tree/pom.xml.orig
+++ maven-dependency-tree/pom.xml
@@ -76,11 +76,11 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Index: maven-downloader/pom.xml
===================================================================
--- maven-downloader/pom.xml.orig
+++ maven-downloader/pom.xml
@@ -63,11 +63,12 @@ under the License.
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.4</version>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Index: maven-filtering/pom.xml
===================================================================
--- maven-filtering/pom.xml.orig
+++ maven-filtering/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9-stable-1</version>
+ <version>1.0-alpha-8</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -120,12 +120,12 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.4</version>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.4</version>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Index: maven-model-converter/pom.xml
===================================================================
--- maven-model-converter/pom.xml.orig
+++ maven-model-converter/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
+ <version>1.0-alpha-8</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
@@ -80,11 +80,11 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Index: maven-osgi/pom.xml
===================================================================
--- maven-osgi/pom.xml.orig
+++ maven-osgi/pom.xml
@@ -55,11 +55,12 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.4</version>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Index: maven-repository-builder/pom.xml
===================================================================
--- maven-repository-builder/pom.xml.orig
+++ maven-repository-builder/pom.xml
@@ -56,7 +56,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -103,12 +103,13 @@ under the License.
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.4</version>
<executions>
<execution>
<id>create-component-descriptor</id>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Index: maven-runtime/pom.xml
===================================================================
--- maven-runtime/pom.xml.orig
+++ maven-runtime/pom.xml
@@ -102,12 +102,12 @@
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.2</version>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5/4</version>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Index: maven-shared-jar/pom.xml
===================================================================
--- maven-shared-jar/pom.xml.orig
+++ maven-shared-jar/pom.xml
@@ -83,17 +83,17 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.5</version>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.4</version>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
</plugin>
- <plugin>
+ <!--<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.0</version>
@@ -104,7 +104,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>-->
</plugins>
</build>
Index: maven-artifact-resolver/pom.xml
===================================================================
--- maven-artifact-resolver/pom.xml.orig
+++ maven-artifact-resolver/pom.xml
@@ -113,14 +113,14 @@ under the License.
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.8</version>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.4</version>
<executions>
<execution>
<id>create-component-descriptor</id>
<phase>generate-resources</phase>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Index: maven-shared-io/pom.xml
===================================================================
--- maven-shared-io/pom.xml.orig
+++ maven-shared-io/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
+ <version>1.0-alpha-8</version>
<optional>true</optional>
</dependency>
Index: file-management/pom.xml
===================================================================
--- file-management/pom.xml.orig
+++ file-management/pom.xml
@@ -73,7 +73,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
+ <version>1.0-alpha-8</version>
</dependency>
<!-- Test -->
Index: maven-ant/pom.xml
===================================================================
--- maven-ant/pom.xml.orig
+++ maven-ant/pom.xml
@@ -55,6 +55,11 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
<version>1.0-alpha-13</version>
</dependency>
<dependency>
Index: maven-shared-monitor/pom.xml
===================================================================
--- maven-shared-monitor/pom.xml.orig
+++ maven-shared-monitor/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
+ <version>1.0-alpha-8</version>
<optional>true</optional>
</dependency>
<dependency>
