Merge pull request #135 from IBMStreams/hadoop-3.3

streamsx.hbase Merge hadoop-3.3 branch to develop #133
IBMStreams · Sep 24, 2020 · d2d6f7d · d2d6f7d
2 parents 0006ece + b76f7bc
commit d2d6f7d
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 56 deletions.
diff --git a/com.ibm.streamsx.hbase/.classpath b/com.ibm.streamsx.hbase/.classpath
@@ -4,33 +4,31 @@
 	<classpathentry exported="true" kind="con" path="com.ibm.streams.java/com.ibm.streams.operator"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="opt/downloaded/commons-cli-1.4.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/commons-codec-1.12.jar"/>
+	<classpathentry kind="lib" path="opt/downloaded/commons-codec-1.15.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/commons-collections-3.2.2.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/commons-configuration2-2.5.jar"/>
+	<classpathentry kind="lib" path="opt/downloaded/commons-configuration2-2.7.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/commons-io-2.6.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/commons-lang-2.6.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/commons-logging-1.2.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/guava-13.0.1.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/hadoop-annotations-3.1.0.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/hadoop-auth-3.1.0.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/hadoop-common-3.1.0.jar"/>
+	<classpathentry kind="lib" path="opt/downloaded/guava-20.0.jar"/>
+	<classpathentry kind="lib" path="opt/downloaded/hadoop-annotations-3.3.0.jar"/>
+	<classpathentry kind="lib" path="opt/downloaded/hadoop-auth-3.3.0.jar"/>
+	<classpathentry kind="lib" path="opt/downloaded/hadoop-common-3.3.0.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/hbase-annotations-1.4.10.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/hbase-client-1.4.10.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/hbase-common-1.4.10.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/hbase-protocol-1.4.10.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/htrace-core-3.2.0-incubating.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/htrace-core4-4.2.0-incubating.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/jackson-core-asl-1.9.13.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/jackson-mapper-asl-1.9.13.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/javaee-api-7.0.jar"/>
+	<classpathentry kind="lib" path="opt/downloaded/javax.servlet-api-4.0.1.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/metrics-core-2.2.0.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/netty-all-4.1.42.Final.jar"/>
+	<classpathentry kind="lib" path="opt/downloaded/netty-all-4.1.52.Final.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/protobuf-java-2.5.0.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/servlet-api-2.5.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/slf4j-api-1.7.30.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/slf4j-log4j12-1.7.30.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/stax2-api-4.2.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/woodstox-core-5.0.3.jar"/>
+	<classpathentry kind="lib" path="opt/downloaded/woodstox-core-6.2.1.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/zookeeper-3.4.14.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/com.ibm.streamsx.hbase/CHANGELOG.md b/com.ibm.streamsx.hbase/CHANGELOG.md
@@ -1,8 +1,27 @@
 # Changes
 =======
+## v3.9.0:
+* [#133](https://github.com/IBMStreams/streamsx.hbase/issues/133) The Vulnerability issues for 3rd party libraries: 
+```
+jackson-mapper-asl-1.9.13.jar
+netty-all-4.1.42.Final.jar
+hadoop-common-3.1.0.jar
+guava-13.0.1.jar
+```
+have been fixed. 
+
+The maven pom.xml file has been upgraded to use hadoop clinet version 3.3 and hbase 2.3.1 libraries. 
+
 ## v3.8.5:
 * [#132](https://github.com/IBMStreams/streamsx.hbase/issues/132) The Vulnerability issue for 3rd party library commons-codec version 1.12 has been fixed. The maven pom.xml file has been upgraded to use commons-codec version 1.14 
 
+
 ## v3.8.4:
 * [#127](https://github.com/IBMStreams/streamsx.hbase/issues/127) The Vulnerability issue for 3rd party library commons-configuration2 version 2.5 has been fixed.
 The maven pom.xml file has been upgraded to use commons-configuration2 version 2.7.
+
+
+ackson-mapper-asl-1.9.13.jar
+netty-all-4.1.42.Final.jar
+hadoop-common-3.1.0.jar
+guava-13.0.1.jar
diff --git a/com.ibm.streamsx.hbase/impl/java/src/com/ibm/streamsx/hbase/HBASEIncrement.java b/com.ibm.streamsx.hbase/impl/java/src/com/ibm/streamsx/hbase/HBASEIncrement.java
@@ -4,7 +4,6 @@
 package com.ibm.streamsx.hbase;
 
 import org.apache.hadoop.hbase.TableNotFoundException;
-import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.log4j.Logger;
 

diff --git a/com.ibm.streamsx.hbase/impl/java/src/com/ibm/streamsx/hbase/HBASEPut.java b/com.ibm.streamsx.hbase/impl/java/src/com/ibm/streamsx/hbase/HBASEPut.java
@@ -20,9 +20,7 @@
 import com.ibm.streams.operator.StreamingData.Punctuation;
 import com.ibm.streams.operator.StreamSchema;
 import com.ibm.streams.operator.StreamingInput;
-import com.ibm.streams.operator.StreamingOutput;
 import com.ibm.streams.operator.Tuple;
-import com.ibm.streams.operator.TupleAttribute;
 import com.ibm.streams.operator.Type.MetaType;
 import com.ibm.streams.operator.compile.OperatorContextChecker;
 import com.ibm.streams.operator.meta.TupleType;

diff --git a/com.ibm.streamsx.hbase/impl/java/src/com/ibm/streamsx/hbase/HBASEScan.java b/com.ibm.streamsx.hbase/impl/java/src/com/ibm/streamsx/hbase/HBASEScan.java
@@ -22,7 +22,6 @@
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.filter.PrefixFilter;
-import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.log4j.Logger;
 

diff --git a/com.ibm.streamsx.hbase/info.xml b/com.ibm.streamsx.hbase/info.xml
@@ -219,8 +219,12 @@ The jar library zookeeper-3.4.13.jar has been replaced with **zookeeper-3.4.6.ja
 
 * pom.xml updated to use commons-codec JAR library version 1.14
 
+++ What is new in version 3.9.0
+
+* The Vulnerability issues for 3rd party libraries have been fixed and the pom.xml updated to use hadoop client version 3.3 JAR libraries.
+
 </info:description>
-    <info:version>3.8.5</info:version>
+    <info:version>3.9.0</info:version>
     <info:requiredProductVersion>4.0.0.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies/>

diff --git a/com.ibm.streamsx.hbase/pom.xml b/com.ibm.streamsx.hbase/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>com.ibm.streamsx.hbase</groupId>
 	<artifactId>streamsx.hbase</artifactId>
 	<packaging>jar</packaging>
-	<version>3.8.5</version>
+	<version>3.9.0</version> 
 	<name>com.ibm.streamsx.hbase</name>
 	<repositories>
 		<repository>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.14</version>
+			<version>1.15</version>
 			<exclusions>
 				<exclusion>
 					<groupId>*</groupId>
@@ -156,8 +156,8 @@
 
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>4.0.1</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -167,33 +167,6 @@
 			</exclusions>
 		</dependency>
 
-
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.13</version>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
-			<version>1.9.13</version>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-
-
 		<dependency>
 			<groupId>javax</groupId>
 			<artifactId>javaee-api</artifactId>
@@ -210,7 +183,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>13.0.1</version>
+			<version>20.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>*</groupId>
@@ -243,10 +216,13 @@
 			</exclusions>
 		</dependency>
 
+
+
+
 		<dependency>
 			<groupId>org.apache.hadoop</groupId>
-			<artifactId>hadoop-common</artifactId>
-			<version>3.1.0</version>
+			<artifactId>hadoop-annotations</artifactId>
+			<version>3.3.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>*</groupId>
@@ -257,8 +233,8 @@
 
 		<dependency>
 			<groupId>org.apache.hadoop</groupId>
-			<artifactId>hadoop-annotations</artifactId>
-			<version>3.1.0</version>
+			<artifactId>hadoop-auth</artifactId>
+			<version>3.3.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>*</groupId>
@@ -269,8 +245,8 @@
 
 		<dependency>
 			<groupId>org.apache.hadoop</groupId>
-			<artifactId>hadoop-auth</artifactId>
-			<version>3.1.0</version>
+			<artifactId>hadoop-common</artifactId>
+			<version>3.3.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>*</groupId>
@@ -279,6 +255,8 @@
 			</exclusions>
 		</dependency>
 
+
+
 		<dependency>
 			<groupId>org.apache.hbase</groupId>
 			<artifactId>hbase-client</artifactId>
@@ -342,7 +320,7 @@
 		<dependency>
 			<groupId>com.fasterxml.woodstox</groupId>
 			<artifactId>woodstox-core</artifactId>
-			<version>5.0.3</version>
+			<version>6.2.1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>*</groupId>
@@ -366,7 +344,7 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
-			<version>4.1.42.Final </version>
+			<version>4.1.52.Final </version>
 			<exclusions>
 				<exclusion>
 					<groupId>*</groupId>