ODP-2324 - Changed dbcp version to 2.9.0 in testcase files

acceldata-io · Sep 24, 2024 · 7611475 · 7611475
1 parent 3ab59ef
commit 7611475
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/core/src/test/resources/spark-events/application_1516285256255_0012 b/core/src/test/resources/spark-events/application_1516285256255_0012
diff --git a/core/src/test/resources/spark-events/application_1553914137147_0018 b/core/src/test/resources/spark-events/application_1553914137147_0018
diff --git a/core/src/test/resources/spark-events/application_1628109047826_1317105 b/core/src/test/resources/spark-events/application_1628109047826_1317105
diff --git a/dev/deps/spark-deps-hadoop-2-hive-2.3 b/dev/deps/spark-deps-hadoop-2-hive-2.3
@@ -42,7 +42,7 @@ commons-compiler/3.1.9//commons-compiler-3.1.9.jar
 commons-compress/1.26.0//commons-compress-1.26.0.jar
 commons-configuration/1.6//commons-configuration-1.6.jar
 commons-crypto/1.1.0//commons-crypto-1.1.0.jar
-commons-dbcp/1.4//commons-dbcp-1.4.jar
+commons-dbcp2/2.9.0//commons-dbcp2-2.9.0.jar
 commons-digester/1.8//commons-digester-1.8.jar
 commons-httpclient/3.1//commons-httpclient-3.1.jar
 commons-io/2.4//commons-io-2.4.jar

diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -42,7 +42,7 @@ commons-collections4/4.4//commons-collections4-4.4.jar
 commons-compiler/3.1.9//commons-compiler-3.1.9.jar
 commons-compress/1.26//commons-compress-1.26.jar
 commons-crypto/1.1.0//commons-crypto-1.1.0.jar
-commons-dbcp/1.4//commons-dbcp-1.4.jar
+commons-dbcp2/2.9.0//commons-dbcp2-2.9.0.jar
 commons-io/2.11.0//commons-io-2.11.0.jar
 commons-lang/2.6//commons-lang-2.6.jar
 commons-lang3/3.12.0//commons-lang3-3.12.0.jar

diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml
@@ -62,7 +62,8 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>2.6.1</version>
+      <!-- <version>2.6.1</version> -->
+      <version>3.23.4</version>
       <!-- 
          We are being explicit about version here and overriding the 
          spark default of 2.5.0 because KCL appears to have introduced 

diff --git a/sql/core/src/test/resources/spark-events/local-1596020211915 b/sql/core/src/test/resources/spark-events/local-1596020211915