Skip to content

Commit

Permalink
[ADAM-518] Move distribution stage into a profile.
Browse files Browse the repository at this point in the history
  • Loading branch information
fnothaft committed Dec 5, 2014
1 parent f7338c4 commit 55c161b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
12 changes: 10 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
<module>adam-core</module>
<module>adam-apis</module>
<module>adam-cli</module>
<!-- distribution should be last -->
<module>distribution</module>
</modules>

<licenses>
Expand Down Expand Up @@ -468,6 +466,16 @@
</dependencyManagement>

<profiles>
<profile>
<id>distribution</id>
<modules>
<module>adam-core</module>
<module>adam-apis</module>
<module>adam-cli</module>
<!-- distribution should be last -->
<module>distribution</module>
</modules>
</profile>
<!-- Only build coverage in when we want to run coverage -->
<profile>
<id>coverage</id>
Expand Down
2 changes: 1 addition & 1 deletion scripts/jenkins-test
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ HADOOP_VERSION="$(grep "<hadoop.version>" "$PROJECT_ROOT/pom.xml" | head -2 | t
echo "Testing ADAM version ${VERSION} on Hadoop ${HADOOP_VERSION}"

export MAVEN_OPTS="-Xmx1536m -XX:MaxPermSize=1g"
mvn test -Dnetworkconnected -Dhadoop.version="${HADOOP_VERSION}"
mvn test -P distribution -Dnetworkconnected -Dhadoop.version="${HADOOP_VERSION}"

ADAM_TMP_DIR="$(mktemp -d -t "adamTestXXXXXXX")"
# Just to be paranoid.. use a directory internal to the ADAM_TMP_DIR
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/release.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh

mvn -Dresume=false release:clean release:prepare release:perform
mvn -P distribution -Dresume=false release:clean release:prepare release:perform
2 changes: 1 addition & 1 deletion scripts/release/rollback.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh

mvn release:rollback
mvn -P distribution release:rollback

0 comments on commit 55c161b

Please sign in to comment.