You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/07/05 23:59:30 UTC
svn commit: r1143210 - in /maven/archetype/trunk: archetype-common/pom.xml
archetype-models/pom.xml pom.xml
Author: hboutemy
Date: Tue Jul 5 21:59:29 2011
New Revision: 1143210
URL: http://svn.apache.org/viewvc?rev=1143210&view=rev
Log:
o reverted replacement of old plexus-maven-plugin with plexus-component-metadata since it fails with Maven 3 (works with 2.2)
o removed configuration already inherited
o added plexus-components report
Modified:
maven/archetype/trunk/archetype-common/pom.xml
maven/archetype/trunk/archetype-models/pom.xml
maven/archetype/trunk/pom.xml
Modified: maven/archetype/trunk/archetype-common/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=1143210&r1=1143209&r2=1143210&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/pom.xml (original)
+++ maven/archetype/trunk/archetype-common/pom.xml Tue Jul 5 21:59:29 2011
@@ -171,10 +171,8 @@ under the License.
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.4</version>
<configuration>
<version>1.0.0</version>
- <useJava5>true</useJava5>
<models>
<model>src/main/mdo/archetype.mdo</model>
</models>
@@ -398,16 +396,6 @@ under the License.
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<profile>
<id>internal-catalog</id>
Modified: maven/archetype/trunk/archetype-models/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-models/pom.xml?rev=1143210&r1=1143209&r2=1143210&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-models/pom.xml (original)
+++ maven/archetype/trunk/archetype-models/pom.xml Tue Jul 5 21:59:29 2011
@@ -72,39 +72,4 @@
</plugins>
</pluginManagement>
</build>
-
- <profiles>
- <profile>
- <id>m2e</id>
- <properties>
- <m2BuildDirectory>target</m2BuildDirectory>
- </properties>
- <activation>
- <property>
- <name>m2e.version</name>
- </property>
- </activation>
- <build>
- <directory>${m2BuildDirectory}</directory>
- <plugins>
- <plugin>
- <groupId>org.maven.ide.eclipse</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>0.12.0</version>
- <configuration>
- <mappingId>customizable</mappingId>
- <configurators>
- <configurator id="org.maven.ide.eclipse.jdt.javaConfigurator" />
- <configurator id="org.maven.ide.eclipse.modello.modelloConfigurator" />
- <configurator id="org.maven.ide.eclipse.plexus.annotations.plexusConfigurator" />
- </configurators>
- <mojoExecutions>
- <mojoExecution>org.apache.maven.plugins:maven-resources-plugin::</mojoExecution>
- </mojoExecutions>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Modified: maven/archetype/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/pom.xml?rev=1143210&r1=1143209&r2=1143210&view=diff
==============================================================================
--- maven/archetype/trunk/pom.xml (original)
+++ maven/archetype/trunk/pom.xml Tue Jul 5 21:59:29 2011
@@ -222,16 +222,6 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.8.1</version><!--With 2.4 2.4.1 2.4.2 2.4.3 test with proxy fails-->
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>${mavenPluginPluginVersion}</version>
</plugin>
@@ -250,11 +240,11 @@ under the License.
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <artifactId>plexus-maven-plugin</artifactId>
<executions>
<execution>
<goals>
- <goal>generate-metadata</goal>
+ <goal>descriptor</goal>
</goals>
</execution>
</executions>
@@ -280,6 +270,21 @@ under the License.
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.8</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
+
<!-- TODO remove when the parent will be released -->
<repositories>
<repository>