Updated Branches: refs/heads/master 1acc34a6e -> 11ecaacf4
CRUNCH-62: Update POM with latest plugin versions. Update to ASF Parent POM 11. Remove stuff we get from the ASF POM from our own config. Remove duplication by applying proper pluginManagement. Update m2e exclusions; build-helper-plugin works in Eclipse now. Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/11ecaacf Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/11ecaacf Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/11ecaacf Branch: refs/heads/master Commit: 11ecaacf41bf34f13441d4f9e3ac0fd9cc66cdee Parents: 1acc34a Author: Matthias Friedrich <[email protected]> Authored: Sun Sep 16 10:33:54 2012 +0200 Committer: Matthias Friedrich <[email protected]> Committed: Sun Sep 16 11:17:45 2012 +0200 ---------------------------------------------------------------------- crunch-hbase/pom.xml | 44 ------------------- crunch-test/pom.xml | 40 ------------------ crunch/pom.xml | 45 -------------------- pom.xml | 101 +++++++++++++++++++++++++++++--------------- 4 files changed, 66 insertions(+), 164 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/11ecaacf/crunch-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/crunch-hbase/pom.xml b/crunch-hbase/pom.xml index 74d63ae..45aed35 100644 --- a/crunch-hbase/pom.xml +++ b/crunch-hbase/pom.xml @@ -100,57 +100,13 @@ under the License. </execution> </executions> </plugin> - <!-- We put slow-running tests into src/it and run them during the - integration-test phase using the failsafe plugin. This way - developers can run unit tests conveniently from the IDE or via - "mvn package" from the command line without triggering time - consuming integration tests. --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - <phase>validate</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${basedir}/src/it/java</source> - </sources> - </configuration> - </execution> - <execution> - <id>add-test-resource</id> - <phase>validate</phase> - <goals> - <goal>add-test-resource</goal> - </goals> - <configuration> - <resources> - <resource> - <directory>${basedir}/src/it/resources</directory> - </resource> - </resources> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory> - </configuration> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/11ecaacf/crunch-test/pom.xml ---------------------------------------------------------------------- diff --git a/crunch-test/pom.xml b/crunch-test/pom.xml index 0c3cdaa..eeb2be0 100644 --- a/crunch-test/pom.xml +++ b/crunch-test/pom.xml @@ -73,53 +73,13 @@ under the License. <build> <plugins> - <!-- Same integration test setup as in crunch-core --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - <phase>validate</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${basedir}/src/it/java</source> - </sources> - </configuration> - </execution> - <execution> - <id>add-test-resource</id> - <phase>validate</phase> - <goals> - <goal>add-test-resource</goal> - </goals> - <configuration> - <resources> - <resource> - <directory>${basedir}/src/it/resources</directory> - </resource> - </resources> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory> - </configuration> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/11ecaacf/crunch/pom.xml ---------------------------------------------------------------------- diff --git a/crunch/pom.xml b/crunch/pom.xml index 07eeb94..912cd90 100644 --- a/crunch/pom.xml +++ b/crunch/pom.xml @@ -125,62 +125,17 @@ under the License. <build> <plugins> - <!-- We put slow-running tests into src/it and run them during the - integration-test phase using the failsafe plugin. This way - developers can run unit tests conveniently from the IDE or via - "mvn package" from the command line without triggering time - consuming integration tests. --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - <phase>validate</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${basedir}/src/it/java</source> - </sources> - </configuration> - </execution> - <execution> - <id>add-test-resource</id> - <phase>validate</phase> - <goals> - <goal>add-test-resource</goal> - </goals> - <configuration> - <resources> - <resource> - <directory>${basedir}/src/it/resources</directory> - </resource> - </resources> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory> - </configuration> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.avro</groupId> <artifactId>avro-maven-plugin</artifactId> - <version>${avro.version}</version> <executions> <execution> <id>schemas</id> http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/11ecaacf/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 792bef0..a7dd2d5 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ under the License. <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>10</version> + <version>11</version> </parent> <groupId>org.apache.crunch</groupId> @@ -612,13 +612,8 @@ under the License. </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>2.5</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.4</version> + <version>2.5.1</version> <configuration> <source>${java.source.version}</source> <target>${java.target.version}</target> @@ -638,22 +633,14 @@ under the License. </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <version>2.12</version> - <configuration> - <argLine>-Xmx512m</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> + <groupId>org.apache.avro</groupId> + <artifactId>avro-maven-plugin</artifactId> + <version>${avro.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.4</version> + <version>2.5.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -669,16 +656,6 @@ under the License. </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.7</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - </plugin> <!-- The m2eclipse plugin doesn't support all maven plugins we use, so we tell it to ignore them to avoid errors in Eclipse. --> <plugin> @@ -703,12 +680,11 @@ under the License. </pluginExecution> <pluginExecution> <pluginExecutionFilter> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> + <groupId>org.apache.avro</groupId> + <artifactId>avro-maven-plugin</artifactId> <versionRange>[1.0.0,)</versionRange> <goals> - <goal>add-test-source</goal> - <goal>add-test-resource</goal> + <goal>schema</goal> </goals> </pluginExecutionFilter> <action> @@ -775,17 +751,72 @@ under the License. <nohelp>true</nohelp> </configuration> <reportSets> - <reportSet> + <reportSet> <id>generate-javadoc</id> <reports> <report>aggregate</report> </reports> </reportSet> - </reportSets> + </reportSets> </plugin> </reportPlugins> </configuration> </plugin> + <!-- We put slow-running tests into src/it and run them during the + integration-test phase using the failsafe plugin. This way + developers can run unit tests conveniently from the IDE or via + "mvn package" from the command line without triggering time + consuming integration tests. --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <id>add-test-source</id> + <phase>validate</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>${basedir}/src/it/java</source> + </sources> + </configuration> + </execution> + <execution> + <id>add-test-resource</id> + <phase>validate</phase> + <goals> + <goal>add-test-resource</goal> + </goals> + <configuration> + <resources> + <resource> + <directory>${basedir}/src/it/resources</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.12</version> + <configuration> + <argLine>-Xmx512m</argLine> + <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory> + </configuration> + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> </build>
