Author: hboutemy
Date: Wed Apr 2 01:26:19 2014
New Revision: 1583847
URL: http://svn.apache.org/r1583847
Log:
updated parent pom
Modified:
maven/archetype/trunk/maven-archetype-plugin/pom.xml
maven/archetype/trunk/pom.xml
Modified: maven/archetype/trunk/maven-archetype-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/pom.xml?rev=1583847&r1=1583846&r2=1583847&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-plugin/pom.xml (original)
+++ maven/archetype/trunk/maven-archetype-plugin/pom.xml Wed Apr 2 01:26:19
2014
@@ -126,7 +126,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>${mavenPluginPluginVersion}</version>
<configuration>
<goalPrefix>archetype</goalPrefix>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
Modified: maven/archetype/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/pom.xml?rev=1583847&r1=1583846&r2=1583847&view=diff
==============================================================================
--- maven/archetype/trunk/pom.xml (original)
+++ maven/archetype/trunk/pom.xml Wed Apr 2 01:26:19 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>23</version>
+ <version>24</version>
</parent>
<groupId>org.apache.maven.archetype</groupId>
@@ -224,9 +224,9 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>1.7</version><!-- regression in Modello 1.8 causing build
failure -->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -244,20 +244,6 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <!-- TODO remove when upgrading parent -->
- <version>3.3</version>
- <configuration>
-
<stagingSiteURL>scp://people.apache.org/www/maven.apache.org/archetype-${project.version}</stagingSiteURL>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
</plugin>
@@ -266,19 +252,6 @@ under the License.
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.6</version>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
-
<checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
- <tryUpdate>true</tryUpdate>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -335,21 +308,6 @@ under the License.
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<profile>
<id>reporting</id>
