Updated Branches: refs/heads/master 82a978299 -> 298fbaa0a
CRUNCH-100: Fix release build. Don't run archetype integration test during release as this won't work. Move scrunch assemblies to profile. Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/298fbaa0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/298fbaa0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/298fbaa0 Branch: refs/heads/master Commit: 298fbaa0a8b8ac9be861ca2a9bbc56ee8596228b Parents: 82a9782 Author: Matthias Friedrich <[email protected]> Authored: Sat Oct 20 17:52:56 2012 +0200 Committer: Matthias Friedrich <[email protected]> Committed: Sat Oct 20 20:17:04 2012 +0200 ---------------------------------------------------------------------- crunch-archetype/pom.xml | 31 +++++++ .../src/test/resources/projects/basic/goal.txt | 2 +- crunch-scrunch/pom.xml | 71 +++++++++------ 3 files changed, 73 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/298fbaa0/crunch-archetype/pom.xml ---------------------------------------------------------------------- diff --git a/crunch-archetype/pom.xml b/crunch-archetype/pom.xml index 985141a..c53a913 100644 --- a/crunch-archetype/pom.xml +++ b/crunch-archetype/pom.xml @@ -33,6 +33,10 @@ under the License. Create a basic, self-contained job for Apache Crunch. </description> + <properties> + <test.goals>clean test</test.goals> + </properties> + <build> <plugins> <plugin> @@ -66,6 +70,33 @@ under the License. </excludes> </resource> </resources> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/goal.txt</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/goal.txt</exclude> + </excludes> + </testResource> + </testResources> </build> + <profiles> + <profile> + <id>apache-release</id> + <properties> + <!-- Don't run the archetype's integration test during release + because it doesn't work with Maven's release plugin. --> + <test.goals /> + </properties> + </profile> + </profiles> + </project> http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/298fbaa0/crunch-archetype/src/test/resources/projects/basic/goal.txt ---------------------------------------------------------------------- diff --git a/crunch-archetype/src/test/resources/projects/basic/goal.txt b/crunch-archetype/src/test/resources/projects/basic/goal.txt index 3b85e6a..6996861 100644 --- a/crunch-archetype/src/test/resources/projects/basic/goal.txt +++ b/crunch-archetype/src/test/resources/projects/basic/goal.txt @@ -1 +1 @@ -clean package +${test.goals} http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/298fbaa0/crunch-scrunch/pom.xml ---------------------------------------------------------------------- diff --git a/crunch-scrunch/pom.xml b/crunch-scrunch/pom.xml index fa837b4..9008c06 100644 --- a/crunch-scrunch/pom.xml +++ b/crunch-scrunch/pom.xml @@ -79,36 +79,6 @@ under the License. <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>jar-with-dependencies</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>${basedir}/src/main/assembly/release.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.scala-tools</groupId> <artifactId>maven-scala-plugin</artifactId> <executions> @@ -200,4 +170,45 @@ under the License. </plugin> </plugins> </build> + + <profiles> + <profile> + <id>scrunch</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>jar-with-dependencies</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> + </execution> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>${basedir}/src/main/assembly/release.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project>
