Repository: bigtop Updated Branches: refs/heads/master 55561bbfe -> 20d095a4c
BIGTOP-2649: Default Java8 blocks default debian jdk Signed-off-by: Olaf Flebbe <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/20d095a4 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/20d095a4 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/20d095a4 Branch: refs/heads/master Commit: 20d095a4c2ad8d3a2380f62ba18ad8b5c0ca54ab Parents: 55561bb Author: Arnaud Launay <[email protected]> Authored: Fri Jan 6 22:19:07 2017 +0100 Committer: Olaf Flebbe <[email protected]> Committed: Fri Jan 6 23:03:49 2017 +0100 ---------------------------------------------------------------------- BUILDING.txt | 20 ++++++++++++++++++++ .../src/common/crunch/do-component-build | 7 ++++++- .../src/common/hbase/do-component-build | 6 +++++- .../src/common/sqoop2/do-component-build | 6 +++++- bigtop.bom | 2 +- packages.gradle | 1 + 6 files changed, 38 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/20d095a4/BUILDING.txt ---------------------------------------------------------------------- diff --git a/BUILDING.txt b/BUILDING.txt index bb1ae4e..85ff0c2 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -81,4 +81,24 @@ A nightly build job can be created with For more background information on BIGTOP_BUILD_STAMP see ticket BIGTOP-1580. +Using a different JVM +===================== +By default, bigtop is compiled with a JDK version 8. If you want to change it, +for example to use JDK version 7, you just have to define the variable +BIGTOP_JDK: + +BIGTOP_JDK=7; export BIGTOP_JDK +./gradlew deb + + +Note on LC_ALL/LANG +=================== + +Compilation may fail if your locale is not in english. You might for example +see some strange errors with dpkg-buildpackage. In that case, you should reset +the language variables before compiling: + +LC_ALL=C; export LC_ALL +LANG=C; export LANG +./gradlew deb http://git-wip-us.apache.org/repos/asf/bigtop/blob/20d095a4/bigtop-packages/src/common/crunch/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/crunch/do-component-build b/bigtop-packages/src/common/crunch/do-component-build index 544a68e..b8642ae 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 http://git-wip-us.apache.org/repos/asf/bigtop/blob/20d095a4/bigtop-packages/src/common/hbase/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hbase/do-component-build b/bigtop-packages/src/common/hbase/do-component-build index 9baae77..353fb38 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 http://git-wip-us.apache.org/repos/asf/bigtop/blob/20d095a4/bigtop-packages/src/common/sqoop2/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/sqoop2/do-component-build b/bigtop-packages/src/common/sqoop2/do-component-build index a25c854..628ccf7 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" http://git-wip-us.apache.org/repos/asf/bigtop/blob/20d095a4/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index d02ab80..56a7661 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -72,7 +72,7 @@ bigtop { /** Base Configuration of the mirror and archives */ version = "1.2.0-SNAPSHOT" stack { - 'jdk' { version = '1.8'; version_base = version } + 'jdk' { version = "1." + ( System.getenv('BIGTOP_JDK') ?: "8" ); version_base = version } 'scala' { version = '2.11.8'; version_base = version } } apache { http://git-wip-us.apache.org/repos/asf/bigtop/blob/20d095a4/packages.gradle ---------------------------------------------------------------------- diff --git a/packages.gradle b/packages.gradle index c00efc6..f6b8543 100644 --- a/packages.gradle +++ b/packages.gradle @@ -302,6 +302,7 @@ def genTasks = { target -> --preserve-envvar MAVEN3_HOME \ --preserve-envvar MAVEN_OPTS \ --preserve-envvar JAVA_HOME \ +--preserve-envvar BIGTOP_JDK \ --set-envvar=HADOOP_VERSION=$HADOOP_VERSION \ --set-envvar=${toOldStyleName(target)}_BASE_VERSION=$BASE_VERSION \ --set-envvar=${toOldStyleName(target)}_VERSION=$PKG_VERSION \
