diff options
| author | Arnaud Launay <asl-github@launay.org> | 2017-01-06 22:19:07 +0100 |
|---|---|---|
| committer | Olaf Flebbe <of@oflebbe.de> | 2017-01-06 23:03:49 +0100 |
| commit | 20d095a4c2ad8d3a2380f62ba18ad8b5c0ca54ab (patch) | |
| tree | 7364c68426f99f4cf386b249686eb325262c23c0 /bigtop-packages | |
| parent | 55561bbfef861806b518134f4f38b61351e5ec11 (diff) | |
BIGTOP-2649: Default Java8 blocks default debian jdk
Signed-off-by: Olaf Flebbe <of@oflebbe.de>
Diffstat (limited to 'bigtop-packages')
| -rw-r--r-- | bigtop-packages/src/common/crunch/do-component-build | 7 | ||||
| -rw-r--r-- | bigtop-packages/src/common/hbase/do-component-build | 6 | ||||
| -rwxr-xr-x | bigtop-packages/src/common/sqoop2/do-component-build | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/bigtop-packages/src/common/crunch/do-component-build b/bigtop-packages/src/common/crunch/do-component-build index 544a68e6..b8642ae4 100644 --- a/bigtop-packages/src/common/crunch/do-component-build +++ b/bigtop-packages/src/common/crunch/do-component-build @@ -20,12 +20,17 @@ set -ex export MAVEN_OPTS="-Xmx1024m" +if [ "${BIGTOP_JDK:=8}" == "8" ]; then + MAVEN_ADDITIONAL="-Dadditionalparam=-Xdoclint:none" +fi + mvn -DskipTests -Dcrunch.platform=2 \ -Dhadoop.version=$HADOOP_VERSION \ -Dhbase.version=$HBASE_VERSION \ -Dspark.version=$SPARK1_VERSION \ -Papache-release -Ddependency.locations.enabled=false \ - -Dadditionalparam=-Xdoclint:none clean site:site package "$@" + ${MAVEN_ADDITIONAL} \ + clean site:site package "$@" rm -rf build mkdir build diff --git a/bigtop-packages/src/common/hbase/do-component-build b/bigtop-packages/src/common/hbase/do-component-build index 9baae77c..353fb38d 100644 --- a/bigtop-packages/src/common/hbase/do-component-build +++ b/bigtop-packages/src/common/hbase/do-component-build @@ -20,6 +20,10 @@ set -ex export MAVEN_OPTS="-Xmx512m" +if [ "${BIGTOP_JDK:=8}" == "8" ]; then + MAVEN_ADDITIONAL="-Dadditionalparam=-Xdoclint:none" +fi + if [ $HOSTTYPE = "powerpc64le" ] ; then sed -i "s|<asciidoctor.plugin.version>.*</asciidoctor.plugin.version>|<asciidoctor.plugin.version>1.5.3</asciidoctor.plugin.version>|" pom.xml sed -i 's|<jruby.version>.*</jruby.version>|<jruby.version>1.7.23</jruby.version>|' pom.xml @@ -29,7 +33,7 @@ mvn -DskipTests -Dslf4j.version=1.6.1 \ -Dhadoop-two.version=$HADOOP_VERSION \ -Dzookeeper.version=$ZOOKEEPER_VERSION \ -Dcheckstyle.skip=true \ - -Dadditionalparam=-Xdoclint:none \ + ${MAVEN_ADDITIONAL} \ clean site install assembly:single "$@" rm -rf build diff --git a/bigtop-packages/src/common/sqoop2/do-component-build b/bigtop-packages/src/common/sqoop2/do-component-build index a25c8543..628ccf76 100755 --- a/bigtop-packages/src/common/sqoop2/do-component-build +++ b/bigtop-packages/src/common/sqoop2/do-component-build @@ -16,6 +16,10 @@ set -ex +if [ "${BIGTOP_JDK:=8}" == "8" ]; then + MAVEN_ADDITIONAL="-Dadditionalparam=-Xdoclint:none" +fi + if [ -z "$GIT_REPO" ]; then export MAVEN_OPTS='-Xmx512m' if [ -z "${DO_MAVEN_DEPLOY}" ]; then @@ -25,7 +29,7 @@ if [ -z "$GIT_REPO" ]; then fi mvn -DskipTests=true source:jar-no-fork javadoc:jar \ - -P=binary -Dadditionalparam=-Xdoclint:none $@ $MAVEN_INST_DEPLOY + -P=binary ${MAVEN_ADDITIONAL} $@ $MAVEN_INST_DEPLOY # Repackaging and changing the name to "sqoop2" is necessary as long # as we continue to distribute a version of Sqoop 1.x as "sqoop" |