try revert client to 2.11.x

datastax · Apr 9, 2024 · 1f1776b · 1f1776b
1 parent 97c17e9
commit 1f1776b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -30,8 +30,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: Setup upterm session
-        uses: lhotari/action-upterm@v1
+#      - name: Setup upterm session
+#        uses: lhotari/action-upterm@v1
 
       - name: Build and test
         run: mvn -B clean javadoc:javadoc verify

diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
     <maven.compiler.target>8</maven.compiler.target>
     <jms.version>2.0.3</jms.version>
     <pulsar.groupId>org.apache.pulsar</pulsar.groupId>
-    <pulsar.version>3.2.2</pulsar.version>
+    <pulsar.version>2.11.4</pulsar.version>
     <activemq.version>5.16.1</activemq.version>
     <hawtbuf.version>1.11</hawtbuf.version>
     <curator.version>5.1.0</curator.version>

diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/Utils.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/Utils.java
@@ -47,7 +47,7 @@
 import javax.jms.TransactionRolledBackRuntimeException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pulsar.client.api.MessageId;
-import org.apache.pulsar.client.api.MessageIdAdv;
+import org.apache.pulsar.client.impl.MessageIdImpl;
 
 @Slf4j
 public final class Utils {
@@ -342,8 +342,8 @@ public static String getAndRemoveString(
 
   public static boolean sameEntryId(MessageId a, MessageId b) {
     // get rid of TopicMessageIdImpl
-    MessageIdAdv a1 = (MessageIdAdv) a;
-    MessageIdAdv b1 = (MessageIdAdv) b;
+    MessageIdImpl a1 = MessageIdImpl.convertToMessageIdImpl(a);
+    MessageIdImpl b1 = MessageIdImpl.convertToMessageIdImpl(b);
     return a1.getLedgerId() == b1.getLedgerId() && a1.getEntryId() == b1.getEntryId();
   }
 

diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SelectorsTestsBase.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SelectorsTestsBase.java
@@ -50,6 +50,7 @@
 import org.apache.pulsar.common.policies.data.PersistentTopicInternalStats;
 import org.apache.pulsar.common.policies.data.TopicStats;
 import org.apache.pulsar.common.util.FutureUtil;
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.Timeout;