From 86036d9e51a2bc0572ce2542d2fab18370c3dc95 Mon Sep 17 00:00:00 2001 From: Mike Drob Date: Thu, 7 Jun 2018 17:51:48 -0500 Subject: [PATCH] HBASE-13583 Compile jruby during build --- bin/hbase | 2 +- hbase-assembly/src/main/assembly/components.xml | 1 + hbase-shell/pom.xml | 141 +++++++++--------------- 3 files changed, 53 insertions(+), 91 deletions(-) diff --git a/bin/hbase b/bin/hbase index 4f1c854dfa..85ce0bff13 100755 --- a/bin/hbase +++ b/bin/hbase @@ -362,7 +362,7 @@ if [ "$COMMAND" = "shell" ] ; then if [ -d "$HBASE_HOME/lib/ruby" ]; then HBASE_OPTS="$HBASE_OPTS -Dhbase.ruby.sources=$HBASE_HOME/lib/ruby" else - HBASE_OPTS="$HBASE_OPTS -Dhbase.ruby.sources=$HBASE_HOME/hbase-shell/src/main/ruby" + HBASE_OPTS="$HBASE_OPTS -Dhbase.ruby.sources=$HBASE_HOME/hbase-shell/target/hbase-shell-3.0.0-SNAPSHOT.jar" fi HBASE_OPTS="$HBASE_OPTS $HBASE_SHELL_OPTS" CLASS="org.jruby.Main -X+O ${JRUBY_OPTS} ${HBASE_HOME}/bin/hirb.rb" diff --git a/hbase-assembly/src/main/assembly/components.xml b/hbase-assembly/src/main/assembly/components.xml index 59502d67b4..465663941c 100644 --- a/hbase-assembly/src/main/assembly/components.xml +++ b/hbase-assembly/src/main/assembly/components.xml @@ -70,6 +70,7 @@ + ${project.basedir}/../hbase-shell/src/main/ruby lib/ruby 0644 diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index 8eaefaab83..3ff0071105 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -30,25 +30,6 @@ Apache HBase - Shell Shell for HBase - - - - - ${project.build.directory} - - hbase-webapps/** - - - - - - src/test/resources - - **/** - - - - - org/apache/jute/** - org/apache/zookeeper/** - **/*.jsp - hbase-site.xml - hdfs-site.xml - log4j.properties - mapred-queues.xml - mapred-site.xml - - - org.apache.maven.plugins maven-source-plugin - + - org.codehaus.mojo - build-helper-maven-plugin + de.saumya.mojo + jruby-maven-plugin + 1.1.5 - - jspcSource-packageInfo-source generate-sources - add-source + compile - - - ${project.build.directory}/generated-jamon - ${project.build.directory}/generated-sources/java - - @@ -116,23 +66,29 @@ org.codehaus.mojo findbugs-maven-plugin - - net.revelc.code - warbucks-maven-plugin - - - maven-surefire-plugin - ${surefire.version} - - - ${surefire.firstPartGroups} - - + + maven-surefire-plugin + ${surefire.version} + + + ${surefire.firstPartGroups} + + + + + org.apache.maven.plugins + maven-jar-plugin + + + **/*.rb + + + @@ -161,6 +117,33 @@ + + + + + + com.sun.jersey + jersey-server + + + asm + asm + + + + + + net.minidev + accessors-smart + + + org.ow2.asm + asm + + + + + @@ -304,28 +287,6 @@ - - org.apache.hadoop - hadoop-mapreduce-client-core - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-mapreduce-client-jobclient - test-jar - test - - - com.google.guava - guava - - - org.apache.hadoop hadoop-hdfs -- 2.16.1