You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by bi...@apache.org on 2010/10/25 02:24:45 UTC
svn commit: r1026922 - in /mahout/trunk: buildtools/pom.xml core/pom.xml
eclipse/pom.xml examples/pom.xml math/pom.xml pom.xml taste-web/pom.xml
utils/pom.xml
Author: bimargulies
Date: Mon Oct 25 00:24:45 2010
New Revision: 1026922
URL: http://svn.apache.org/viewvc?rev=1026922&view=rev
Log:
MAHOUT-532: update poms to resolve warnings from M3 and take relatively current plugin versions
Modified:
mahout/trunk/buildtools/pom.xml
mahout/trunk/core/pom.xml
mahout/trunk/eclipse/pom.xml
mahout/trunk/examples/pom.xml
mahout/trunk/math/pom.xml
mahout/trunk/pom.xml
mahout/trunk/taste-web/pom.xml
mahout/trunk/utils/pom.xml
Modified: mahout/trunk/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/buildtools/pom.xml?rev=1026922&r1=1026921&r2=1026922&view=diff
==============================================================================
--- mahout/trunk/buildtools/pom.xml (original)
+++ mahout/trunk/buildtools/pom.xml Mon Oct 25 00:24:45 2010
@@ -25,9 +25,10 @@
<version>0.5-SNAPSHOT</version>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>6</version>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<name>Mahout Build Tools</name>
Modified: mahout/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/core/pom.xml?rev=1026922&r1=1026921&r2=1026922&view=diff
==============================================================================
--- mahout/trunk/core/pom.xml (original)
+++ mahout/trunk/core/pom.xml Mon Oct 25 00:24:45 2010
@@ -71,7 +71,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<goals>
@@ -85,7 +84,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
<executions>
<execution>
<id>job</id>
@@ -104,7 +102,6 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
</plugin>
<plugin>
Modified: mahout/trunk/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/eclipse/pom.xml?rev=1026922&r1=1026921&r2=1026922&view=diff
==============================================================================
--- mahout/trunk/eclipse/pom.xml (original)
+++ mahout/trunk/eclipse/pom.xml Mon Oct 25 00:24:45 2010
@@ -22,12 +22,12 @@
<artifactId>mahout-eclipse-support</artifactId>
<version>0.5-SNAPSHOT</version>
<name>Mahout Eclipse</name>
- <!-- skips top level project for parent purposes, otherwise we get a cycle -->
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>6</version>
- </parent>
+ <parent>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<profiles>
<profile>
<id>setup-eclipse-workspace</id>
Modified: mahout/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/pom.xml?rev=1026922&r1=1026921&r2=1026922&view=diff
==============================================================================
--- mahout/trunk/examples/pom.xml (original)
+++ mahout/trunk/examples/pom.xml Mon Oct 25 00:24:45 2010
@@ -90,7 +90,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
<executions>
<execution>
<id>job</id>
Modified: mahout/trunk/math/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/math/pom.xml?rev=1026922&r1=1026921&r2=1026922&view=diff
==============================================================================
--- mahout/trunk/math/pom.xml (original)
+++ mahout/trunk/math/pom.xml Mon Oct 25 00:24:45 2010
@@ -54,7 +54,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<goals>
@@ -67,7 +66,6 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: mahout/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1026922&r1=1026921&r2=1026922&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Mon Oct 25 00:24:45 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
@@ -80,7 +80,6 @@
</mailingLists>
<properties>
<junit.version>4.7</junit.version>
- <tagBase>https://svn.apache.org/repos/asf/mahout/tags</tagBase>
<lucene.version>3.0.2</lucene.version>
<hadoop.version>0.20.2</hadoop.version>
<maven.clover.multiproject>true</maven.clover.multiproject>
@@ -119,13 +118,6 @@
<enabled>true</enabled>
</releases>
</repository>
- <!-- Needed for mail -->
- <repository>
- <id>java.net.legacy</id>
- <name>Java.net Repo for Maven 1</name>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
</repositories>
<issueManagement>
<system>Jira</system>
@@ -243,6 +235,36 @@
<defaultGoal>install</defaultGoal>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -286,7 +308,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
+ <version>2.1</version>
<configuration>
<useReleaseProfile>true</useReleaseProfile>
<releaseProfiles>release,mahout_release,release_perform</releaseProfiles>
@@ -300,7 +322,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.2</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.6</source>
@@ -311,7 +333,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<dependencies>
<dependency>
<groupId>org.apache.mahout</groupId>
@@ -344,7 +366,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.mahout</groupId>
@@ -375,13 +397,31 @@
</executions>
-->
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <appendedResourcesDirectory>./src/main/appended-resources</appendedResourcesDirectory>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <supplementalModels>
+ <supplementalModel>supplemental-models.xml</supplementalModel>
+ </supplementalModels>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
<configuration>
<forkMode>once</forkMode>
<argLine>-Xms256m -Xmx512m</argLine>
@@ -392,19 +432,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <configuration>
- <appendedResourcesDirectory>./src/main/appended-resources</appendedResourcesDirectory>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <supplementalModels>
- <supplementalModel>supplemental-models.xml</supplementalModel>
- </supplementalModels>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<resourceBundles>
@@ -457,7 +484,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
@@ -585,7 +611,9 @@
</plugin>
<!-- checkstyle -->
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.6</version>
<configuration>
<configLocation>${project.build.directory}/../../eclipse/src/main/resources/mahout-checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
@@ -639,7 +667,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3.1</version>
<configuration>
<xmlOutput>true</xmlOutput>
<xmlOutputDirectory>target/findbugs</xmlOutputDirectory>
@@ -656,7 +684,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<reportSets>
<reportSet>
<reports>
@@ -665,10 +693,20 @@
</reportSet>
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2</version>
<reportSets>
<reportSet>
<reports>
@@ -680,6 +718,16 @@
</reportSet>
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
</plugins>
</reporting>
</project>
Modified: mahout/trunk/taste-web/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/taste-web/pom.xml?rev=1026922&r1=1026921&r2=1026922&view=diff
==============================================================================
--- mahout/trunk/taste-web/pom.xml (original)
+++ mahout/trunk/taste-web/pom.xml Mon Oct 25 00:24:45 2010
@@ -78,6 +78,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
+ <version>7.1.2.v20100523</version>
<configuration>
<webApp>${project.build.directory}/${project.artifactId}-${project.version}.war</webApp>
</configuration>
Modified: mahout/trunk/utils/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/pom.xml?rev=1026922&r1=1026921&r2=1026922&view=diff
==============================================================================
--- mahout/trunk/utils/pom.xml (original)
+++ mahout/trunk/utils/pom.xml Mon Oct 25 00:24:45 2010
@@ -39,7 +39,6 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>