Author: bimargulies
Date: Thu Apr 7 20:14:52 2011
New Revision: 1089981
URL: http://svn.apache.org/viewvc?rev=1089981&view=rev
Log:
Merge branch 'pom-cleanup' into trunk
Modified:
mahout/trunk/.gitignore
mahout/trunk/buildtools/pom.xml
mahout/trunk/core/pom.xml
mahout/trunk/distribution/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/.gitignore
URL:
http://svn.apache.org/viewvc/mahout/trunk/.gitignore?rev=1089981&r1=1089980&r2=1089981&view=diff
==============================================================================
--- mahout/trunk/.gitignore (original)
+++ mahout/trunk/.gitignore Thu Apr 7 20:14:52 2011
@@ -10,3 +10,18 @@ buildtools/target/*
utils/target/*
eclipse/target/*
taste-web/target/*
+.settings/
+buildtools/.settings/
+core/.settings/
+core/build/
+core/input/
+core/output/
+core/testdata/
+distribution/.settings/
+eclipse/.settings/
+examples/.settings/
+foo
+math-tests/
+math/.settings/
+taste-web/.settings/
+utils/.settings/
Modified: mahout/trunk/buildtools/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/buildtools/pom.xml?rev=1089981&r1=1089980&r2=1089981&view=diff
==============================================================================
--- mahout/trunk/buildtools/pom.xml (original)
+++ mahout/trunk/buildtools/pom.xml Thu Apr 7 20:14:52 2011
@@ -34,9 +34,4 @@
<packaging>jar</packaging>
- <scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/buildtools</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/buildtools</developerConnection>
- <url>https://svn.apache.org/repos/asf/mahout/trunk/buildtools</url>
- </scm>
</project>
Modified: mahout/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/pom.xml?rev=1089981&r1=1089980&r2=1089981&view=diff
==============================================================================
--- mahout/trunk/core/pom.xml (original)
+++ mahout/trunk/core/pom.xml Thu Apr 7 20:14:52 2011
@@ -226,11 +226,4 @@
<artifactId>commons-collections</artifactId>
</dependency>
</dependencies>
-
-
- <scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/core</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/core</developerConnection>
- <url>https://svn.apache.org/repos/asf/mahout/trunk/core</url>
- </scm>
</project>
Modified: mahout/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/distribution/pom.xml?rev=1089981&r1=1089980&r2=1089981&view=diff
==============================================================================
--- mahout/trunk/distribution/pom.xml (original)
+++ mahout/trunk/distribution/pom.xml Thu Apr 7 20:14:52 2011
@@ -116,9 +116,4 @@
<type>war</type>
</dependency>
</dependencies>
- <scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/distribution</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/distribution</developerConnection>
- <url>https://svn.apache.org/repos/asf/mahout/trunk/distribution</url>
- </scm>
</project>
Modified: mahout/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/pom.xml?rev=1089981&r1=1089980&r2=1089981&view=diff
==============================================================================
--- mahout/trunk/examples/pom.xml (original)
+++ mahout/trunk/examples/pom.xml Thu Apr 7 20:14:52 2011
@@ -223,10 +223,4 @@
</properties>
</profile>
</profiles>
-
- <scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/examples</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/examples</developerConnection>
- <url>https://svn.apache.org/repos/asf/mahout/trunk/examples</url>
- </scm>
</project>
Modified: mahout/trunk/math/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/math/pom.xml?rev=1089981&r1=1089980&r2=1089981&view=diff
==============================================================================
--- mahout/trunk/math/pom.xml (original)
+++ mahout/trunk/math/pom.xml Thu Apr 7 20:14:52 2011
@@ -130,22 +130,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/math</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/math</developerConnection>
- <url>https://svn.apache.org/repos/asf/mahout/trunk/math</url>
- </scm>
- <repositories>
- <repository>
- <id>Apache snapshots</id>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: mahout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1089981&r1=1089980&r2=1089981&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Thu Apr 7 20:14:52 2011
@@ -23,6 +23,13 @@
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
<version>0.5-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>9</version>
+ </parent>
+
<packaging>pom</packaging>
<name>Apache Mahout</name>
<url>http://mahout.apache.org</url>
@@ -94,38 +101,11 @@
</properties>
<repositories>
<repository>
- <id>maven2-repository.maven.org</id>
- <name>Maven.org Repository for Maven</name>
- <url>http://repo1.maven.org/maven2</url>
- <layout>default</layout>
- </repository>
- <repository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Repository for Maven</name>
<url>http://download.java.net/maven/2</url>
<layout>default</layout>
</repository>
- <repository>
- <id>Apache snapshots</id>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- <repository>
- <id>Apache Releases</id>
- <url>https://repository.apache.org/content/repositories/releases</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
</repositories>
<issueManagement>
<system>Jira</system>
Modified: mahout/trunk/taste-web/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/taste-web/pom.xml?rev=1089981&r1=1089980&r2=1089981&view=diff
==============================================================================
--- mahout/trunk/taste-web/pom.xml (original)
+++ mahout/trunk/taste-web/pom.xml Thu Apr 7 20:14:52 2011
@@ -198,24 +198,4 @@
</dependency>
</dependencies>
-
- <repositories>
- <repository>
- <id>Apache snapshots</id>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/taste-webapp</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/taste-webapp</developerConnection>
- <url>https://svn.apache.org/repos/asf/mahout/trunk/taste-webapp</url>
- </scm>
-
</project>
Modified: mahout/trunk/utils/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/pom.xml?rev=1089981&r1=1089980&r2=1089981&view=diff
==============================================================================
--- mahout/trunk/utils/pom.xml (original)
+++ mahout/trunk/utils/pom.xml Thu Apr 7 20:14:52 2011
@@ -176,10 +176,4 @@
</dependency>
</dependencies>
-
- <scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/utils</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/utils</developerConnection>
- <url>https://svn.apache.org/repos/asf/mahout/trunk/utils</url>
- </scm>
</project>
