From d5c66201dd9cb5089d4437eb2877da70b4c46f39 Mon Sep 17 00:00:00 2001
From: nikhil-ctds <151718832+nikhil-ctds@users.noreply.github.com>
Date: Wed, 4 Dec 2024 10:35:11 +0530
Subject: [PATCH 1/3] Upgrade apache pulsar to 3.3.2 to fix CVE-2024-47561 in
 avro (#156)

* upgrade apache pulsar to 3.3.2

* upgrade actions/cache to v3

(cherry picked from commit 14a90d91f89db1b670d6937229ee762fd195af48)
---
 .github/workflows/tck-client-side-filters.yaml | 2 +-
 .github/workflows/tck-server-side-filters.yaml | 2 +-
 .github/workflows/tests.yaml                   | 2 +-
 pom.xml                                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tck-client-side-filters.yaml b/.github/workflows/tck-client-side-filters.yaml
index 4a8b1195..33ddc04b 100644
--- a/.github/workflows/tck-client-side-filters.yaml
+++ b/.github/workflows/tck-client-side-filters.yaml
@@ -32,7 +32,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/tck-server-side-filters.yaml b/.github/workflows/tck-server-side-filters.yaml
index 2730aec6..47f5a90c 100644
--- a/.github/workflows/tck-server-side-filters.yaml
+++ b/.github/workflows/tck-server-side-filters.yaml
@@ -32,7 +32,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 80cdbbc8..bf0f0d24 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -23,7 +23,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/pom.xml b/pom.xml
index ca875b2f..658d88d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
     <maven.compiler.release>8</maven.compiler.release>
     <jms.version>2.0.3</jms.version>
     <pulsar.groupId>org.apache.pulsar</pulsar.groupId>
-    <pulsar.version>3.2.2</pulsar.version>
+    <pulsar.version>3.3.2</pulsar.version>
     <activemq.version>5.16.7</activemq.version>
     <hawtbuf.version>1.11</hawtbuf.version>
     <curator.version>5.1.0</curator.version>

From 0580940ba77a06012a0343be87e5ece3b5e64203 Mon Sep 17 00:00:00 2001
From: nikhil-ctds <ext-nikhil.erigila@datastax.com>
Date: Wed, 4 Dec 2024 16:30:04 +0530
Subject: [PATCH 2/3] upgrade maven-shade-plugin to 3.5.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 658d88d1..a2a8619e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,7 +228,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.2.4</version>
+          <version>3.5.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

From 841e4caa8f05fdc139eb7f8ca4c389885353f091 Mon Sep 17 00:00:00 2001
From: nikhil-ctds <ext-nikhil.erigila@datastax.com>
Date: Thu, 5 Dec 2024 16:52:14 +0530
Subject: [PATCH 3/3] fix Github CI test

---
 .github/workflows/tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index bf0f0d24..2dae1b06 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -31,5 +31,5 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Build and test
-        run: mvn -B clean javadoc:javadoc verify
+        run: mvn -B clean javadoc:javadoc verify -DrerunFailingTestsCount=3