Author: brett
Date: Wed Jul 9 07:33:16 2014
New Revision: 1609038
URL: http://svn.apache.org/r1609038
Log:
Revert "upgrade plexus metadata generator"
This reverts commit f8e0a5e2acd6aa0ac3a32ddfa0e44f17584f5e32. The change
was causing significant differences in the way that the components were
resolved, and failing to load the proper vendor information. This can be
investgated at a later time, but for now the solution to the original
problem turned out to be different anyway.
Modified:
incubator/npanday/trunk/components/dotnet-assembler/pom.xml
incubator/npanday/trunk/components/dotnet-assembler/src/main/resources/META-INF/plexus/components.xml
incubator/npanday/trunk/components/dotnet-executable/pom.xml
incubator/npanday/trunk/components/dotnet-msbuild/pom.xml
incubator/npanday/trunk/components/dotnet-nuget/pom.xml
incubator/npanday/trunk/components/dotnet-packaging/pom.xml
incubator/npanday/trunk/components/dotnet-plugin/pom.xml
incubator/npanday/trunk/components/dotnet-registry/pom.xml
incubator/npanday/trunk/components/dotnet-vendor/pom.xml
incubator/npanday/trunk/pom.xml
Modified: incubator/npanday/trunk/components/dotnet-assembler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-assembler/pom.xml?rev=1609038&r1=1609037&r2=1609038&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-assembler/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-assembler/pom.xml Wed Jul 9
07:33:16 2014
@@ -50,7 +50,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <artifactId>plexus-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified:
incubator/npanday/trunk/components/dotnet-assembler/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-assembler/src/main/resources/META-INF/plexus/components.xml?rev=1609038&r1=1609037&r2=1609038&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-assembler/src/main/resources/META-INF/plexus/components.xml
(original)
+++
incubator/npanday/trunk/components/dotnet-assembler/src/main/resources/META-INF/plexus/components.xml
Wed Jul 9 07:33:16 2014
@@ -17,5 +17,5 @@
~ under the License.
-->
<component-set>
- <!-- generated -->
+ <!-- generated by plexus-maven-plugin -->
</component-set>
Modified: incubator/npanday/trunk/components/dotnet-executable/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/pom.xml?rev=1609038&r1=1609037&r2=1609038&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-executable/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-executable/pom.xml Wed Jul 9
07:33:16 2014
@@ -59,7 +59,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <artifactId>plexus-maven-plugin</artifactId>
</plugin>
<plugin>
<!-- enable groovy testing -->
Modified: incubator/npanday/trunk/components/dotnet-msbuild/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-msbuild/pom.xml?rev=1609038&r1=1609037&r2=1609038&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-msbuild/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-msbuild/pom.xml Wed Jul 9
07:33:16 2014
@@ -65,7 +65,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <artifactId>plexus-maven-plugin</artifactId>
</plugin>
<plugin>
<!-- enable groovy testing -->
Modified: incubator/npanday/trunk/components/dotnet-nuget/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-nuget/pom.xml?rev=1609038&r1=1609037&r2=1609038&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-nuget/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-nuget/pom.xml Wed Jul 9 07:33:16
2014
@@ -66,7 +66,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <artifactId>plexus-maven-plugin</artifactId>
</plugin>
<plugin>
<!-- enable groovy testing -->
Modified: incubator/npanday/trunk/components/dotnet-packaging/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-packaging/pom.xml?rev=1609038&r1=1609037&r2=1609038&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-packaging/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-packaging/pom.xml Wed Jul 9
07:33:16 2014
@@ -50,7 +50,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <artifactId>plexus-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: incubator/npanday/trunk/components/dotnet-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-plugin/pom.xml?rev=1609038&r1=1609037&r2=1609038&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-plugin/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-plugin/pom.xml Wed Jul 9
07:33:16 2014
@@ -53,7 +53,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <artifactId>plexus-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: incubator/npanday/trunk/components/dotnet-registry/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-registry/pom.xml?rev=1609038&r1=1609037&r2=1609038&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-registry/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-registry/pom.xml Wed Jul 9
07:33:16 2014
@@ -52,7 +52,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <artifactId>plexus-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: incubator/npanday/trunk/components/dotnet-vendor/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-vendor/pom.xml?rev=1609038&r1=1609037&r2=1609038&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-vendor/pom.xml (original)
+++ incubator/npanday/trunk/components/dotnet-vendor/pom.xml Wed Jul 9
07:33:16 2014
@@ -41,7 +41,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <artifactId>plexus-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: incubator/npanday/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1609038&r1=1609037&r2=1609038&view=diff
==============================================================================
--- incubator/npanday/trunk/pom.xml (original)
+++ incubator/npanday/trunk/pom.xml Wed Jul 9 07:33:16 2014
@@ -378,14 +378,33 @@ under the License.
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <version>1.5.5</version>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.8</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.thoughtworks.qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>1.12</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
- <goal>generate-metadata</goal>
+ <goal>descriptor</goal>
+ <goal>merge-descriptors</goal>
</goals>
+ <configuration>
+ <!-- descriptor config -->
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <fileName>plexus/auto-components.xml</fileName>
+
+ <!-- merge config -->
+ <descriptors>
+
<descriptor>${project.build.directory}/plexus/auto-components.xml</descriptor>
+
<descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
</execution>
</executions>
</plugin>
