mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ssla...@apache.org
Subject mahout git commit: MAHOUT-1278: Upgraded to apache parent pom version 16
Date Wed, 01 Apr 2015 22:08:09 GMT
Repository: mahout
Updated Branches:
  refs/heads/master 441460e77 -> adb0955f5


MAHOUT-1278: Upgraded to apache parent pom version 16


Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/adb0955f
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/adb0955f
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/adb0955f

Branch: refs/heads/master
Commit: adb0955f549dfa8f427ddb8273dd2f9d1f23a6c2
Parents: 441460e
Author: Stevo Slavic <sslavic@gmail.com>
Authored: Wed Apr 1 23:44:31 2015 +0200
Committer: Stevo Slavic <sslavic@gmail.com>
Committed: Wed Apr 1 23:44:52 2015 +0200

----------------------------------------------------------------------
 CHANGELOG          |   2 +
 buildtools/pom.xml |   2 +-
 pom.xml            | 178 +++++++-----------------------------------------
 3 files changed, 28 insertions(+), 154 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mahout/blob/adb0955f/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 45869e4..0259a4f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -234,6 +234,8 @@ Release 0.10.0 - unreleased
 
   MAHOUT-1310: Mahout support windows (Sergey Svinarchuk via ssc)
 
+  MAHOUT-1278: Upgraded to apache parent pom version 16 (sslavic)
+
 Release 0.9 - 2014-02-01
 
   MAHOUT-1387: Create page for release notes (ssc)

http://git-wip-us.apache.org/repos/asf/mahout/blob/adb0955f/buildtools/pom.xml
----------------------------------------------------------------------
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index 1636879..6ff4ac4 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>9</version>
+    <version>16</version>
     <relativePath />
   </parent>
 

http://git-wip-us.apache.org/repos/asf/mahout/blob/adb0955f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cb87850..23c775c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,16 +18,17 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.mahout</groupId>
-  <artifactId>mahout</artifactId>
-  <version>1.0-SNAPSHOT</version>
 
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>9</version>
+    <version>16</version>
   </parent>
 
+  <groupId>org.apache.mahout</groupId>
+  <artifactId>mahout</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
   <packaging>pom</packaging>
   <name>Apache Mahout</name>
   <url>http://mahout.apache.org</url>
@@ -47,17 +48,17 @@
     (hopefully) correct category. Frequent itemset mining takes a set of item groups (terms
in a query session,
     shopping cart content) and identifies, which individual items usually appear together.
   </description>
+  <organization>
+    <name>The Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
   <licenses>
     <license>
-      <name>The Apache Software License, Version 2.0</name>
+      <name>Apache License, Version 2.0</name>
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
   <mailingLists>
     <mailingList>
       <name>User list</name>
@@ -93,13 +94,22 @@
       </otherArchives>
     </mailingList>
   </mailingLists>
+  <prerequisites>
+    <maven>3.0</maven>
+  </prerequisites>
+  <scm>
+    <connection>scm:git:git@github.com:apache/mahout.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/mahout.git</developerConnection>
+    <url>scm:git:git@github.com:apache/mahout.git</url>
+    <tag>HEAD</tag>
+  </scm>
   <properties>
     <skipTests>false</skipTests>
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
     <maven.clover.multiproject>true</maven.clover.multiproject>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <msurefire.version>2.16</msurefire.version>
+    <msurefire.version>2.17</msurefire.version>
     <mpmd.version>3.0.1</mpmd.version>
     <mcheckstyle.version>2.10</mcheckstyle.version>
     <mfindbugs.version>2.5.2</mfindbugs.version>
@@ -138,10 +148,6 @@
     </repository>
   </repositories>
 
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
-
   <dependencyManagement>
     <dependencies>
 
@@ -549,55 +555,6 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.2.1</version>
-          <executions>
-            <execution>
-              <id>attach-sources</id>
-              <phase>verify</phase>
-              <goals>
-                <goal>jar-no-fork</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>${mjavadoc.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.7</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.8</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-eclipse-plugin</artifactId>
           <version>2.9</version>
           <configuration>
@@ -639,14 +596,13 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.4.1</version>
+          <version>2.5.1</version>
           <configuration>
             <useReleaseProfile>true</useReleaseProfile>
-            <releaseProfiles>release,mahout_release</releaseProfiles>
-            <remoteTagging>true</remoteTagging>
+            <releaseProfiles>release,apache-release</releaseProfiles>
             <goals>deploy</goals>
             <autoVersionSubmodules>true</autoVersionSubmodules>
-            <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
+            <arguments>${arguments}</arguments>
           </configuration>
         </plugin>
         <plugin>
@@ -662,31 +618,6 @@
           </configuration>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${msurefire.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-failsafe-plugin</artifactId>
-          <version>${msurefire.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-remote-resources-plugin</artifactId>
-          <version>1.4</version>
-          <configuration>
-            <skipTests>${skipTests}</skipTests>
-            <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.mahout</groupId>
           <artifactId>mahout-collection-codegen-plugin</artifactId>
           <version>1.0</version>
@@ -748,19 +679,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <inherited>false</inherited>
-        <configuration>
-          <resourceBundles>
-            <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-          </resourceBundles>
-          <supplementalModels>
-            <supplementalModel>supplemental-models.xml</supplementalModel>
-          </supplementalModels>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>com.atlassian.maven.plugins</groupId>
         <artifactId>maven-clover2-plugin</artifactId>
         <version>3.1.12</version>
@@ -826,7 +744,6 @@
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <version>0.10</version>
         <configuration>
           <licenses>
             <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
@@ -863,12 +780,6 @@
         </configuration>
       </plugin>
     </plugins>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
   </build>
   <modules>
     <module>buildtools</module>
@@ -926,42 +837,14 @@
       <build>
         <plugins>
           <plugin>
-            <inherited>true</inherited>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
+                <phase>verify</phase>
                 <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <inherited>true</inherited>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>${mjavadoc.version}</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <inherited>true</inherited>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.4</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>sign</goal>
+                  <goal>jar-no-fork</goal>
                 </goals>
               </execution>
             </executions>
@@ -1094,17 +977,6 @@
       </build>
     </profile>
   </profiles>
-  <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk</developerConnection>
-    <url>https://svn.apache.org/repos/asf/mahout</url>
-  </scm>
-  <distributionManagement>
-    <site>
-      <id>Website</id>
-      <url>scp://people.apache.org/home/isabel/public_html/mahout_site</url>
-    </site>
-  </distributionManagement>
   <reporting>
     <plugins>
       <!-- surefire runs unit tests -->


Mime
View raw message