Skip to content

Commit 6c3a1c6

Browse files
meszibalupetersomogyi
authored andcommitted
HBASE-22210 Fix hbase-connectors-assembly to include every jar (apache#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
1 parent e0d4b3f commit 6c3a1c6

File tree

4 files changed

+16
-22
lines changed

4 files changed

+16
-22
lines changed

bin/hbase-connectors

+3-3
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ if [ "$COMMAND" = "kafkaproxy" ] ; then
237237
fi
238238

239239
# add the kafka proxy jars
240-
add_connector_jars_to_classpath "hbase-kafka-proxy"
240+
add_connector_jars_to_classpath "lib"
241241

242242
elif [ "$COMMAND" = "kafkaproxytest" ] ; then
243243
CLASS='org.apache.hadoop.hbase.kafka.DumpToStringListener'
@@ -246,7 +246,7 @@ elif [ "$COMMAND" = "kafkaproxytest" ] ; then
246246
fi
247247

248248
# add the kafka proxy jars
249-
add_connector_jars_to_classpath "hbase-kafka-proxy"
249+
add_connector_jars_to_classpath "lib"
250250

251251
else
252252
CLASS=$COMMAND
@@ -281,4 +281,4 @@ if [ "${HBASE_CONNECTOR_NOEXEC}" != "" ]; then
281281
"$JAVA" -Dproc_$COMMAND -XX:OnOutOfMemoryError="kill -9 %p" $HEAP_SETTINGS $HBASE_CONNECTOR_OPTS $CLASS "$@"
282282
else
283283
exec "$JAVA" -Dproc_$COMMAND -XX:OnOutOfMemoryError="kill -9 %p" $HEAP_SETTINGS $HBASE_CONNECTOR_OPTS $CLASS "$@"
284-
fi
284+
fi

hbase-connectors-assembly/pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767

6868
<descriptors>
6969
<descriptor>src/main/assembly/hbase-connectors-bin.xml</descriptor>
70-
7170
</descriptors>
7271
</configuration>
7372
</execution>
@@ -91,7 +90,6 @@
9190
</executions>
9291
</plugin>
9392

94-
9593
<!-- licensing info from our dependencies -->
9694
<plugin>
9795
<groupId>org.apache.maven.plugins</groupId>

hbase-connectors-assembly/src/main/assembly/connector-components.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<outputDirectory>bin</outputDirectory>
3737
<includes>
3838
<include>hbase-connectors</include>
39-
<include>hbase-connectors-config.sh</include>
39+
<include>hbase-connectors-config.sh</include>
4040
<include>hbase-connectors-daemon.sh</include>
41-
</includes>
41+
</includes>
4242
<fileMode>0755</fileMode>
4343
<directoryMode>0755</directoryMode>
4444
</fileSet>

hbase-connectors-assembly/src/main/assembly/hbase-connectors-bin.xml

+11-15
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
* limitations under the License.
2222
*/
2323
-->
24-
<!--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 -->
25-
<id>hbase-connectors-bin</id>
24+
<id>bin</id>
2625
<formats>
2726
<format>tar.gz</format>
2827
</formats>
@@ -33,21 +32,18 @@
3332
<moduleSets>
3433
<moduleSet>
3534
<useAllReactorProjects>true</useAllReactorProjects>
36-
<includes>
37-
<include>org.apache.hbase.connectors:hbase-kafka-proxy</include>
38-
</includes>
3935
<binaries>
4036
<unpack>false</unpack>
41-
<outputDirectory>hbase-kafka-proxy</outputDirectory>
42-
<dependencySets>
43-
<dependencySet>
44-
<excludes>
45-
<exclude>org.apache.yetus:audience-annotations</exclude>
46-
<exclude>org.slf4j:slf4j-api</exclude>
47-
<exclude>org.slf4j:slf4j-log4j12</exclude>
48-
</excludes>
49-
</dependencySet>
50-
</dependencySets>
37+
<outputDirectory>lib</outputDirectory>
38+
<dependencySets>
39+
<dependencySet>
40+
<excludes>
41+
<exclude>org.apache.yetus:audience-annotations</exclude>
42+
<exclude>org.slf4j:slf4j-api</exclude>
43+
<exclude>org.slf4j:slf4j-log4j12</exclude>
44+
</excludes>
45+
</dependencySet>
46+
</dependencySets>
5147
</binaries>
5248
</moduleSet>
5349
</moduleSets>

0 commit comments

Comments
 (0)