Skip to content

Commit d5f82b0

Browse files
anourianouri
authored
Merge pull request #105 from IBMStreams/develop
Merge hbase develop branch to master.
2 parents deab78f + c18cd3c commit d5f82b0

File tree

7 files changed

+39
-160
lines changed

7 files changed

+39
-160
lines changed

‎com.ibm.streamsx.hbase/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
This toolkit is for interacting with Apache HBASE. It assumes Apache HBASE
22
is already installed and running.
33

4-
To use the operators, you must set HADOOP_HOME and HBASE_HOME in your
5-
environment before compiling.
6-
74
This toolkit provides Streams operators to work with the HBASE API,
85
so the operators are named after the HBASE API calls. There is another
96
toolkit for HBASE that takes a more database-like approach.
@@ -45,4 +42,6 @@ https://www.ibm.com/support/knowledgecenter/en/SSPT3X_4.2.0/com.ibm.swg.im.infos
4542

4643
After enabling the Kerberos authentication, copy the hbase server keytab and hbase configuration file "hbase-site.xml" from hadoop server into your IBM Streams server in a directory and use them in your SPL application.
4744

45+
https://github.com/IBMStreams/streamsx.hbase/wiki/How-to-use-kerberos-authentication-in-streamsx.hbase-toolkit
46+
4847

‎com.ibm.streamsx.hbase/info.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,12 @@ Here is an example to connect to the HBase server with Kerberos Authentication:
170170

171171
* Add a new optional output port for error information. This port submits error message when an error occurs while HBase actions.
172172

173+
++ What is new in version 3.5.0
174+
175+
* The pom.xml file has been upgraded to use the Hadoop client version 2.8.5 and the HBase client version 1.4.9.
176+
173177
</info:description>
174-
<info:version>3.4.0</info:version>
178+
<info:version>3.5.0</info:version>
175179
<info:requiredProductVersion>4.0.0.0</info:requiredProductVersion>
176180
</info:identity>
177181
<info:dependencies/>

‎com.ibm.streamsx.hbase/pom-v1.2-hadoop2.xml renamed to ‎com.ibm.streamsx.hbase/pom-hbase-1-2-4.xml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<groupId>com.ibm.streamsx.hbase</groupId>
1616
<artifactId>streamsx.hbase</artifactId>
1717
<packaging>jar</packaging>
18-
<version>4.0.0</version>
18+
<version>3.2.0</version>
1919
<name>com.ibm.streamsx.hbase</name>
2020
<repositories>
2121
<repository>
@@ -102,18 +102,6 @@
102102
</exclusions>
103103
</dependency>
104104

105-
<dependency>
106-
<groupId>commons-logging</groupId>
107-
<artifactId>commons-logging</artifactId>
108-
<version>1.1.3</version>
109-
<exclusions>
110-
<exclusion>
111-
<groupId>*</groupId>
112-
<artifactId>*</artifactId>
113-
</exclusion>
114-
</exclusions>
115-
</dependency>
116-
117105
<dependency>
118106
<groupId>org.apache.htrace</groupId>
119107
<artifactId>htrace-core</artifactId>
@@ -287,11 +275,11 @@
287275
<artifactId>hbase-protocol</artifactId>
288276
<version>1.2.4</version>
289277
<exclusions>
290-
<exclusion>
291-
<groupId>*</groupId>
292-
<artifactId>*</artifactId>
293-
</exclusion>
294-
</exclusions>
278+
<exclusion>
279+
<groupId>*</groupId>
280+
<artifactId>*</artifactId>
281+
</exclusion>
282+
</exclusions>
295283
</dependency>
296284

297285
<dependency>
@@ -319,6 +307,19 @@
319307
</exclusions>
320308
</dependency>
321309

310+
<dependency>
311+
<groupId>io.netty</groupId>
312+
<artifactId>netty-all</artifactId>
313+
<version>4.0.52.Final </version>
314+
<exclusions>
315+
<exclusion>
316+
<groupId>*</groupId>
317+
<artifactId>*</artifactId>
318+
</exclusion>
319+
</exclusions>
320+
</dependency>
321+
322+
322323
</dependencies>
323324

324325
<build>
@@ -328,3 +329,4 @@
328329
</build>
329330
</project>
330331

332+

‎com.ibm.streamsx.hbase/pom-v094.xml

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎com.ibm.streamsx.hbase/pom-v096-hadoop1.xml

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎com.ibm.streamsx.hbase/pom-v096-hadoop2.xml

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎com.ibm.streamsx.hbase/pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<groupId>com.ibm.streamsx.hbase</groupId>
1616
<artifactId>streamsx.hbase</artifactId>
1717
<packaging>jar</packaging>
18-
<version>3.2.0</version>
18+
<version>3.5.0</version>
1919
<name>com.ibm.streamsx.hbase</name>
2020
<repositories>
2121
<repository>
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>commons-codec</groupId>
4040
<artifactId>commons-codec</artifactId>
41-
<version>1.4</version>
41+
<version>1.9</version>
4242
<exclusions>
4343
<exclusion>
4444
<groupId>*</groupId>
@@ -104,8 +104,8 @@
104104

105105
<dependency>
106106
<groupId>org.apache.htrace</groupId>
107-
<artifactId>htrace-core</artifactId>
108-
<version>3.1.0-incubating</version>
107+
<artifactId>htrace-core4</artifactId>
108+
<version>4.2.0-incubating</version>
109109
<exclusions>
110110
<exclusion>
111111
<groupId>*</groupId>
@@ -204,7 +204,7 @@
204204
<dependency>
205205
<groupId>org.apache.hadoop</groupId>
206206
<artifactId>hadoop-common</artifactId>
207-
<version>2.7.3</version>
207+
<version>2.8.5</version>
208208
<exclusions>
209209
<exclusion>
210210
<groupId>*</groupId>
@@ -216,7 +216,7 @@
216216
<dependency>
217217
<groupId>org.apache.hadoop</groupId>
218218
<artifactId>hadoop-annotations</artifactId>
219-
<version>2.7.3</version>
219+
<version>2.8.5</version>
220220
<exclusions>
221221
<exclusion>
222222
<groupId>*</groupId>
@@ -227,7 +227,7 @@
227227
<dependency>
228228
<groupId>org.apache.hadoop</groupId>
229229
<artifactId>hadoop-auth</artifactId>
230-
<version>2.7.3</version>
230+
<version>2.8.5</version>
231231
<exclusions>
232232
<exclusion>
233233
<groupId>*</groupId>
@@ -239,7 +239,7 @@
239239
<dependency>
240240
<groupId>org.apache.hbase</groupId>
241241
<artifactId>hbase-client</artifactId>
242-
<version>1.2.4</version>
242+
<version>1.4.9</version>
243243
<exclusions>
244244
<exclusion>
245245
<groupId>*</groupId>
@@ -250,7 +250,7 @@
250250
<dependency>
251251
<groupId>org.apache.hbase</groupId>
252252
<artifactId>hbase-annotations</artifactId>
253-
<version>1.2.4</version>
253+
<version>1.4.9</version>
254254
<exclusions>
255255
<exclusion>
256256
<groupId>*</groupId>
@@ -261,7 +261,7 @@
261261
<dependency>
262262
<groupId>org.apache.hbase</groupId>
263263
<artifactId>hbase-common</artifactId>
264-
<version>1.2.4</version>
264+
<version>1.4.9</version>
265265
<exclusions>
266266
<exclusion>
267267
<groupId>*</groupId>
@@ -273,7 +273,7 @@
273273
<dependency>
274274
<groupId>org.apache.hbase</groupId>
275275
<artifactId>hbase-protocol</artifactId>
276-
<version>1.2.4</version>
276+
<version>1.4.9</version>
277277
<exclusions>
278278
<exclusion>
279279
<groupId>*</groupId>
@@ -298,7 +298,7 @@
298298
<dependency>
299299
<groupId>org.apache.zookeeper</groupId>
300300
<artifactId>zookeeper</artifactId>
301-
<version>3.4.6</version>
301+
<version>3.4.13</version>
302302
<exclusions>
303303
<exclusion>
304304
<groupId>*</groupId>

0 commit comments

Comments
 (0)