Repository: bigtop Updated Branches: refs/heads/master be9a183b4 -> cf2ca016e
BIGTOP-2944: Update hbase and fix compilation issue Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/cf2ca016 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/cf2ca016 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/cf2ca016 Branch: refs/heads/master Commit: cf2ca016e89827a1d69b3e91171a78d2326df780 Parents: be9a183 Author: Olaf Flebbe <[email protected]> Authored: Sat Dec 2 00:37:37 2017 +0100 Committer: Olaf Flebbe <[email protected]> Committed: Sat Dec 2 00:37:37 2017 +0100 ---------------------------------------------------------------------- .../src/common/hbase/do-component-build | 5 +- .../src/common/hbase/patch1-jasper-scope.diff | 63 ++++++++++++++++---- bigtop.bom | 2 +- 3 files changed, 57 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/cf2ca016/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 353fb38..4c7dde0 100644 --- a/bigtop-packages/src/common/hbase/do-component-build +++ b/bigtop-packages/src/common/hbase/do-component-build @@ -29,12 +29,15 @@ if [ $HOSTTYPE = "powerpc64le" ] ; then sed -i 's|<jruby.version>.*</jruby.version>|<jruby.version>1.7.23</jruby.version>|' pom.xml sed -i "s|<version>1.5.0-alpha.6</version>|<version>1.5.0-alpha.11</version>|" pom.xml fi + +rm -f hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java + mvn -DskipTests -Dslf4j.version=1.6.1 \ -Dhadoop-two.version=$HADOOP_VERSION \ -Dzookeeper.version=$ZOOKEEPER_VERSION \ -Dcheckstyle.skip=true \ ${MAVEN_ADDITIONAL} \ - clean site install assembly:single "$@" + install site assembly:single "$@" rm -rf build mkdir build http://git-wip-us.apache.org/repos/asf/bigtop/blob/cf2ca016/bigtop-packages/src/common/hbase/patch1-jasper-scope.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hbase/patch1-jasper-scope.diff b/bigtop-packages/src/common/hbase/patch1-jasper-scope.diff index 0c29f77..d3c53ec 100644 --- a/bigtop-packages/src/common/hbase/patch1-jasper-scope.diff +++ b/bigtop-packages/src/common/hbase/patch1-jasper-scope.diff @@ -1,11 +1,52 @@ ---- hbase-1.1.12/pom.xml_ 2017-11-25 21:30:50.000000000 +0100 -+++ hbase-1.1.12/pom.xml 2017-11-25 21:57:11.000000000 +0100 -@@ -1720,7 +1720,7 @@ - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <version>${jasper.version}</version> -- <scope>runtime</scope> -+ <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> +From 05ba85017ca12c71995b3d65a7690c0a1f861919 Mon Sep 17 00:00:00 2001 +From: Peter Somogyi <[email protected]> +Date: Sun, 26 Nov 2017 12:35:57 +0100 +Subject: [PATCH] HBASE-19188 Build fails on branch-1 using maven-3.5.2 + +Changing tomcat:jasper-runtime scope to compile in +hbase-server, hbase-rest and hbase-thrift +--- + hbase-rest/pom.xml | 1 + + hbase-server/pom.xml | 1 + + hbase-thrift/pom.xml | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml +index e85407c7e2..806f8055e0 100644 +--- a/hbase-rest/pom.xml ++++ b/hbase-rest/pom.xml +@@ -243,6 +243,7 @@ + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> ++ <scope>compile</scope> + </dependency> + <!-- REST dependencies --> + <dependency> +diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml +index 81e529f4f7..d3abf213e7 100644 +--- a/hbase-server/pom.xml ++++ b/hbase-server/pom.xml +@@ -536,6 +536,7 @@ + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> ++ <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jamon</groupId> +diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml +index 2987fdd824..957d644fdf 100644 +--- a/hbase-thrift/pom.xml ++++ b/hbase-thrift/pom.xml +@@ -329,6 +329,7 @@ + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> ++ <scope>compile</scope> + </dependency> + </dependencies> + +-- +2.15.0 + http://git-wip-us.apache.org/repos/asf/bigtop/blob/cf2ca016/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index 7d8d4bc..dbdb68e 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -165,7 +165,7 @@ bigtop { 'hbase' { name = 'hbase' relNotes = 'Apache HBase' - version { base = '1.1.9'; pkg = base; release = 1 } + version { base = '1.1.12'; pkg = base; release = 1 } tarball { destination = "${name}-${version.base}.tar.gz" source = "${name}-${version.base}-src.tar.gz" } url { download_path = "/$name/${version.base}/"
