Author: brett
Date: Thu Mar 4 05:05:27 2010
New Revision: 918853
URL: http://svn.apache.org/viewvc?rev=918853&view=rev
Log:
adjust Plexus components generation to correct phases so they work from the IDE
Added:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components-fragment.xml
- copied unchanged from r917398,
archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml
Removed:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml
Modified:
archiva/branches/archiva-1.3.x/ (props changed)
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-policies/pom.xml
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduled/pom.xml
archiva/branches/archiva-1.3.x/pom.xml
Propchange: archiva/branches/archiva-1.3.x/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 4 05:05:27 2010
@@ -7,3 +7,5 @@
.classpath
.project
.pom.xml.swp
+
+.idea
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml?rev=918853&r1=918852&r2=918853&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
Thu Mar 4 05:05:27 2010
@@ -60,19 +60,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml?rev=918853&r1=918852&r2=918853&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
Thu Mar 4 05:05:27 2010
@@ -51,20 +51,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <executions>
- <execution>
- <id>descriptor</id>
- <goals>
- <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-policies/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-policies/pom.xml?rev=918853&r1=918852&r2=918853&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-policies/pom.xml
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-policies/pom.xml
Thu Mar 4 05:05:27 2010
@@ -67,15 +67,8 @@
<artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
- <id>descriptor</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>generate-metadata</goal>
- </goals>
- </execution>
- <execution>
<id>merge</id>
- <phase>generate-resources</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>merge-metadata</goal>
</goals>
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-repository-layer/pom.xml?rev=918853&r1=918852&r2=918853&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
Thu Mar 4 05:05:27 2010
@@ -75,16 +75,11 @@
<artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
- <id>descriptor</id>
- <goals>
- <goal>generate-metadata</goal>
- </goals>
- </execution>
- <execution>
<id>merge</id>
<goals>
<goal>merge-metadata</goal>
</goals>
+ <phase>process-resources</phase>
<configuration>
<descriptors>
<descriptor>${basedir}/src/main/resources/META-INF/plexus/components-fragment.xml</descriptor>
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduled/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduled/pom.xml?rev=918853&r1=918852&r2=918853&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduled/pom.xml
(original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduled/pom.xml
Thu Mar 4 05:05:27 2010
@@ -102,9 +102,10 @@
<goals>
<goal>merge-metadata</goal>
</goals>
+ <phase>process-resources</phase>
<configuration>
<descriptors>
-
<descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
+
<descriptor>${basedir}/src/main/resources/META-INF/plexus/components-fragment.xml</descriptor>
<descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
</descriptors>
</configuration>
Modified: archiva/branches/archiva-1.3.x/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/pom.xml?rev=918853&r1=918852&r2=918853&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/pom.xml (original)
+++ archiva/branches/archiva-1.3.x/pom.xml Thu Mar 4 05:05:27 2010
@@ -103,6 +103,7 @@
<goals>
<goal>generate-metadata</goal>
</goals>
+ <phase>generate-resources</phase>
</execution>
</executions>
</plugin>
