You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ps...@apache.org on 2019/04/12 12:54:32 UTC
[hbase-connectors] branch master updated: HBASE-22210 Fix
hbase-connectors-assembly to include every jar (#20)
This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 6c3a1c6 HBASE-22210 Fix hbase-connectors-assembly to include every jar (#20)
6c3a1c6 is described below
commit 6c3a1c60eaddbc5ce9ce7f044cf5ee28f18201ea
Author: meszibalu <gi...@bali.budape.st>
AuthorDate: Fri Apr 12 14:54:28 2019 +0200
HBASE-22210 Fix hbase-connectors-assembly to include every jar (#20)
Assembly layout and name is harmonized with the main project:
* jar files are placed under lib
* final assembly name is hbase-connectors-<version>-bin.tar.gz
---
bin/hbase-connectors | 6 ++---
hbase-connectors-assembly/pom.xml | 2 --
.../src/main/assembly/connector-components.xml | 4 ++--
.../src/main/assembly/hbase-connectors-bin.xml | 26 +++++++++-------------
4 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/bin/hbase-connectors b/bin/hbase-connectors
index 50d1b4f..bce71a7 100755
--- a/bin/hbase-connectors
+++ b/bin/hbase-connectors
@@ -237,7 +237,7 @@ if [ "$COMMAND" = "kafkaproxy" ] ; then
fi
# add the kafka proxy jars
- add_connector_jars_to_classpath "hbase-kafka-proxy"
+ add_connector_jars_to_classpath "lib"
elif [ "$COMMAND" = "kafkaproxytest" ] ; then
CLASS='org.apache.hadoop.hbase.kafka.DumpToStringListener'
@@ -246,7 +246,7 @@ elif [ "$COMMAND" = "kafkaproxytest" ] ; then
fi
# add the kafka proxy jars
- add_connector_jars_to_classpath "hbase-kafka-proxy"
+ add_connector_jars_to_classpath "lib"
else
CLASS=$COMMAND
@@ -281,4 +281,4 @@ if [ "${HBASE_CONNECTOR_NOEXEC}" != "" ]; then
"$JAVA" -Dproc_$COMMAND -XX:OnOutOfMemoryError="kill -9 %p" $HEAP_SETTINGS $HBASE_CONNECTOR_OPTS $CLASS "$@"
else
exec "$JAVA" -Dproc_$COMMAND -XX:OnOutOfMemoryError="kill -9 %p" $HEAP_SETTINGS $HBASE_CONNECTOR_OPTS $CLASS "$@"
-fi
\ No newline at end of file
+fi
diff --git a/hbase-connectors-assembly/pom.xml b/hbase-connectors-assembly/pom.xml
index d695975..af7356f 100755
--- a/hbase-connectors-assembly/pom.xml
+++ b/hbase-connectors-assembly/pom.xml
@@ -67,7 +67,6 @@
<descriptors>
<descriptor>src/main/assembly/hbase-connectors-bin.xml</descriptor>
-
</descriptors>
</configuration>
</execution>
@@ -91,7 +90,6 @@
</executions>
</plugin>
-
<!-- licensing info from our dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/hbase-connectors-assembly/src/main/assembly/connector-components.xml b/hbase-connectors-assembly/src/main/assembly/connector-components.xml
index a645f20..a1d2f5e 100755
--- a/hbase-connectors-assembly/src/main/assembly/connector-components.xml
+++ b/hbase-connectors-assembly/src/main/assembly/connector-components.xml
@@ -36,9 +36,9 @@
<outputDirectory>bin</outputDirectory>
<includes>
<include>hbase-connectors</include>
- <include>hbase-connectors-config.sh</include>
+ <include>hbase-connectors-config.sh</include>
<include>hbase-connectors-daemon.sh</include>
- </includes>
+ </includes>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
diff --git a/hbase-connectors-assembly/src/main/assembly/hbase-connectors-bin.xml b/hbase-connectors-assembly/src/main/assembly/hbase-connectors-bin.xml
index 3e2472b..2c238bf 100755
--- a/hbase-connectors-assembly/src/main/assembly/hbase-connectors-bin.xml
+++ b/hbase-connectors-assembly/src/main/assembly/hbase-connectors-bin.xml
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-->
- <!--This 'all' id is not appended to the produced bundle because we do this: http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers -->
- <id>hbase-connectors-bin</id>
+ <id>bin</id>
<formats>
<format>tar.gz</format>
</formats>
@@ -33,21 +32,18 @@
<moduleSets>
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
- <includes>
- <include>org.apache.hbase.connectors:hbase-kafka-proxy</include>
- </includes>
<binaries>
<unpack>false</unpack>
- <outputDirectory>hbase-kafka-proxy</outputDirectory>
- <dependencySets>
- <dependencySet>
- <excludes>
- <exclude>org.apache.yetus:audience-annotations</exclude>
- <exclude>org.slf4j:slf4j-api</exclude>
- <exclude>org.slf4j:slf4j-log4j12</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
+ <outputDirectory>lib</outputDirectory>
+ <dependencySets>
+ <dependencySet>
+ <excludes>
+ <exclude>org.apache.yetus:audience-annotations</exclude>
+ <exclude>org.slf4j:slf4j-api</exclude>
+ <exclude>org.slf4j:slf4j-log4j12</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
</binaries>
</moduleSet>
</moduleSets>