diff --git a/core/pom.xml b/core/pom.xml index e7a99f750..3b4136e9e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -35,11 +35,21 @@ jar + + + src/main/resources + + + ../src/conf + + driver.classes.default.props + + + org.apache.maven.plugins maven-compiler-plugin - 2.4 UTF-8 1.6 @@ -47,31 +57,11 @@ true - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - compile - - - - - - - - run - - - - org.apache.maven.plugins maven-jar-plugin - 2.4 @@ -85,7 +75,6 @@ org.apache.maven.plugins maven-assembly-plugin - 2.3 job @@ -113,7 +102,6 @@ org.apache.maven.plugins maven-remote-resources-plugin - 1.3 ../src/main/appended-resources diff --git a/distribution/pom.xml b/distribution/pom.xml index c7a652ab4..b02207b4d 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -23,9 +23,7 @@ 0.8-SNAPSHOT ../pom.xml - org.apache.mahout mahout-distribution - 0.8-SNAPSHOT Mahout Release Package Distribution Package pom @@ -38,7 +36,6 @@ org.apache.maven.plugins maven-assembly-plugin - 2.3 bin-assembly @@ -87,22 +84,18 @@ org.apache.mahout mahout-math - ${project.version} org.apache.mahout mahout-integration - ${project.version} org.apache.mahout mahout-core - ${project.version} org.apache.mahout mahout-examples - ${project.version} diff --git a/examples/pom.xml b/examples/pom.xml index 0c708b73e..e0ff916a8 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -40,7 +40,6 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 UTF-8 1.6 @@ -51,7 +50,6 @@ org.apache.maven.plugins maven-dependency-plugin - 2.4 copy-dependencies @@ -70,7 +68,6 @@ org.apache.maven.plugins maven-assembly-plugin - 2.3 job @@ -92,7 +89,6 @@ org.apache.maven.plugins maven-remote-resources-plugin - 1.3 ../src/main/appended-resources diff --git a/integration/pom.xml b/integration/pom.xml index 72db1ac97..fdae77223 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -40,7 +40,6 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 UTF-8 1.6 @@ -51,7 +50,6 @@ org.apache.maven.plugins maven-dependency-plugin - 2.4 copy-dependencies @@ -68,7 +66,6 @@ org.apache.maven.plugins maven-remote-resources-plugin - 1.3 ../src/main/appended-resources diff --git a/math/pom.xml b/math/pom.xml index 8bcb22f91..a3d3b2cb6 100644 --- a/math/pom.xml +++ b/math/pom.xml @@ -43,7 +43,6 @@ org.apache.maven.plugins maven-compiler-plugin - 2.4 1.6 1.6 @@ -53,9 +52,9 @@ org.apache.mahout mahout-collection-codegen-plugin - 1.0 + generate-sources generate @@ -68,6 +67,39 @@ + ${project.build.directory}/generated-sources/mahout + ${project.build.directory}/generated-test-sources/mahout + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/mahout + + + + + add-test-source + generate-sources + + add-test-source + + + + ${project.build.directory}/generated-test-sources/mahout + @@ -77,7 +109,6 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 @@ -99,7 +130,6 @@ org.apache.maven.plugins maven-remote-resources-plugin - 1.3 ../src/main/appended-resources diff --git a/pom.xml b/pom.xml index 3fc14d5d1..e0d9bcd01 100644 --- a/pom.xml +++ b/pom.xml @@ -158,6 +158,12 @@ ${project.version} + + mahout-examples + ${project.groupId} + ${project.version} + + org.apache.lucene @@ -442,6 +448,43 @@ install + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [2.4,) + + copy-dependencies + + + + + + + + + org.apache.mahout + mahout-collection-codegen-plugin + [1.0,) + + generate + + + + + + + + + + org.apache.maven.plugins maven-source-plugin @@ -476,6 +519,11 @@ maven-jar-plugin 2.4 + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + org.apache.maven.plugins maven-install-plugin @@ -637,6 +685,16 @@ + + org.apache.mahout + mahout-collection-codegen-plugin + 1.0 + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + diff --git a/src/conf/driver.classes.props b/src/conf/driver.classes.default.props similarity index 100% rename from src/conf/driver.classes.props rename to src/conf/driver.classes.default.props