Merge pull request #406 from Acxiom/develop

Removed JMS Dependency and Upgraded GCP Libraries
Acxiom · Apr 5, 2024 · 4237225 · 4237225
2 parents 2f6803a + 465de41
commit 4237225
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 39 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        spark: [ '2.4_2.11', '2.4_2.12', '3.0_2.12', '3.1_2.12', '3.2_2.12', '3.3_2.12' ]
+        spark: ['3.0_2.12', '3.1_2.12', '3.2_2.12', '3.3_2.12' ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Source Checkout

diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        spark: [ '2.4_2.11', '2.4_2.12', '3.0_2.12', '3.1_2.12', '3.2_2.12', '3.3_2.12' ]
+        spark: [ '3.0_2.12', '3.1_2.12', '3.2_2.12', '3.3_2.12' ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Source Checkout

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        spark: [ '2.4_2.11', '2.4_2.12', '3.0_2.12', '3.1_2.12', '3.2_2.12', '3.3_2.12' ]
+        spark: [  '3.0_2.12', '3.1_2.12', '3.2_2.12', '3.3_2.12' ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Source Checkout

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        spark: [ '2.4_2.11', '2.4_2.12', '3.0_2.12', '3.1_2.12', '3.2_2.12', '3.3_2.12' ]
+        spark: [ '3.0_2.12', '3.1_2.12', '3.2_2.12', '3.3_2.12' ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Source Checkout
@@ -98,7 +98,7 @@ jobs:
     needs: code_quality
     strategy:
       matrix:
-        spark: [ '2.4_2.11', '2.4_2.12', '3.0_2.12', '3.1_2.12', '3.2_2.12', '3.3_2.12' ]
+        spark: [ '3.0_2.12', '3.1_2.12', '3.2_2.12', '3.3_2.12' ]
     runs-on: ubuntu-latest
     steps:
       - name: Source Checkout

diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -1 +0,0 @@
--s./.mvn/local-settings.xml

diff --git a/metalus-application/pom.xml b/metalus-application/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.acxiom</groupId>
         <artifactId>metalus</artifactId>
-        <version>1.9.5-SNAPSHOT</version>
+        <version>1.9.6-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/metalus-aws/pom.xml b/metalus-aws/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.acxiom</groupId>
         <artifactId>metalus</artifactId>
-        <version>1.9.5-SNAPSHOT</version>
+        <version>1.9.6-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/metalus-common/pom.xml b/metalus-common/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.acxiom</groupId>
         <artifactId>metalus</artifactId>
-        <version>1.9.5-SNAPSHOT</version>
+        <version>1.9.6-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/metalus-core/pom.xml b/metalus-core/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.acxiom</groupId>
         <artifactId>metalus</artifactId>
-        <version>1.9.5-SNAPSHOT</version>
+        <version>1.9.6-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/metalus-delta/pom.xml b/metalus-delta/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.acxiom</groupId>
         <artifactId>metalus</artifactId>
-        <version>1.9.5-SNAPSHOT</version>
+        <version>1.9.6-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/metalus-examples/pom.xml b/metalus-examples/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.acxiom</groupId>
         <artifactId>metalus</artifactId>
-        <version>1.9.5-SNAPSHOT</version>
+        <version>1.9.6-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/metalus-gcp/pom.xml b/metalus-gcp/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.acxiom</groupId>
         <artifactId>metalus</artifactId>
-        <version>1.9.5-SNAPSHOT</version>
+        <version>1.9.6-SNAPSHOT</version>
     </parent>
 
     <dependencyManagement>
@@ -48,12 +48,12 @@
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty-shaded</artifactId>
-            <version>1.31.1</version>
+            <version>1.39.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>28.2-jre</version>
+            <version>32.0.1-jre</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>
@@ -64,49 +64,49 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-datastore</artifactId>
-            <version>1.104.0</version>
+            <version>1.107.1</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-core</artifactId>
-            <version>1.31.1</version>
+            <version>1.39.0</version>
         </dependency>
         <dependency>
             <groupId>io.opencensus</groupId>
             <artifactId>opencensus-api</artifactId>
-            <version>0.26.0</version>
+            <version>0.31.1</version>
         </dependency>
         <dependency>
             <groupId>io.opencensus</groupId>
             <artifactId>opencensus-contrib-http-util</artifactId>
-            <version>0.26.0</version>
+            <version>0.31.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-pubsub</artifactId>
-            <version>1.104.1</version>
+            <version>1.128.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.grpc</groupId>
                     <artifactId>grpc-netty-shaded</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.google.cloud.bigdataoss</groupId>
-            <artifactId>gcs-connector</artifactId>
-            <version>hadoop2-1.9.17</version>
-            <scope>provided</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.google.cloud.bigdataoss</groupId>-->
+<!--            <artifactId>gcs-connector</artifactId>-->
+<!--            <version>hadoop3-1.9.17</version>-->
+<!--            <scope>provided</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-storage</artifactId>
-            <version>1.108.0</version>
+            <version>1.118.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-secretmanager</artifactId>
-            <version>1.1.0</version>
+            <version>2.40.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.grpc</groupId>
@@ -117,7 +117,7 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-nio</artifactId>
-            <version>0.121.0</version>
+            <version>0.127.8</version>
         </dependency>
     </dependencies>
 

diff --git a/metalus-kafka/pom.xml b/metalus-kafka/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.acxiom</groupId>
         <artifactId>metalus</artifactId>
-        <version>1.9.5-SNAPSHOT</version>
+        <version>1.9.6-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/metalus-mongo/pom.xml b/metalus-mongo/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.acxiom</groupId>
         <artifactId>metalus</artifactId>
-        <version>1.9.5-SNAPSHOT</version>
+        <version>1.9.6-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/metalus-utils/pom.xml b/metalus-utils/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.acxiom</groupId>
         <artifactId>metalus</artifactId>
-        <version>1.9.5-SNAPSHOT</version>
+        <version>1.9.6-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.acxiom</groupId>
     <artifactId>metalus</artifactId>
-    <version>1.9.5-SNAPSHOT</version>
+    <version>1.9.6-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <packaging>pom</packaging>
     <description>Metalus Pipeline Library</description>
@@ -586,12 +586,12 @@
                 </dependency>
             </dependencies>
             <!-- TODO This should be removed when we figure out what is pulling in the jms libraries -->
-            <repositories>
-                <repository>
-                    <id>JMS Stuff</id>
-                    <url>http://builds.archive.org/maven2</url>
-                </repository>
-            </repositories>
+<!--            <repositories>-->
+<!--                <repository>-->
+<!--                    <id>JMS Stuff</id>-->
+<!--                    <url>http://builds.archive.org/maven2</url>-->
+<!--                </repository>-->
+<!--            </repositories>-->
         </profile>
         <profile>
             <id>scala_2.12</id>