Check listener transactional property

gradle/libs.versions.toml

@@ -10,7 +10,7 @@ micrometer = "1.16.4"
 micrometer-docs-gen = "1.0.4"
 micrometer-tracing = "1.6.4"
 protobuf = "3.25.9"
-pulsar = "4.1.3"
+pulsar = "4.2.0"
 spring = "7.0.6"
 # tests
 assertj = "3.27.7"

integration-tests/src/intTest/java/org/springframework/pulsar/inttest/app/PulsarContainerWithSsl.java

@@ -48,6 +48,9 @@ private PulsarContainerWithSsl(boolean pemBasedTls) {
 		withStartupTimeout(Duration.ofMinutes(3));
 		withEnv("PF_ENV_DEBUG", "1");
 
+		// Advertise on localhost
+		withEnv("PULSAR_PREFIX_advertisedAddress", "localhost");
+
 		// TLS ports
 		addExposedPorts(BROKER_TLS_PORT, BROKER_HTTP_TLS_PORT);
 		withEnv("PULSAR_PREFIX_brokerServicePortTls", String.valueOf(BROKER_TLS_PORT));

integration-tests/src/intTest/java/org/springframework/pulsar/inttest/app/SamplePulsarApplicationTests.java

@@ -33,7 +33,8 @@ class SamplePulsarApplicationTests {
 	@SuppressWarnings("unused")
 	@Container
 	@ServiceConnection
-	static PulsarContainer PULSAR_CONTAINER = new PulsarContainer(PulsarTestContainerSupport.getPulsarImage());
+	static PulsarContainer PULSAR_CONTAINER = new PulsarContainer(PulsarTestContainerSupport.getPulsarImage())
+		.withEnv("PULSAR_PREFIX_advertisedAddress", "localhost");
 
 	@Nested
 	class ImperativeAppTests implements SpringBootTestImperativeApp {

integration-tests/src/intTest/java/org/springframework/pulsar/inttest/config/DefaultTenantAndNamespaceTests.java

@@ -47,7 +47,8 @@ class DefaultTenantAndNamespaceTests {
 	@SuppressWarnings("unused")
 	@Container
 	@ServiceConnection
-	static PulsarContainer PULSAR_CONTAINER = new PulsarContainer(PulsarTestContainerSupport.getPulsarImage());
+	static PulsarContainer PULSAR_CONTAINER = new PulsarContainer(PulsarTestContainerSupport.getPulsarImage())
+		.withEnv("PULSAR_PREFIX_advertisedAddress", "localhost");
 
 	@Nested
 	@SpringBootTest(classes = ImperativeAppConfig.class,

integration-tests/src/intTest/java/org/springframework/pulsar/inttest/function/PulsarFunctionAdministrationIntegrationTests.java

@@ -87,7 +87,8 @@ class PulsarFunctionAdministrationIntegrationTests {
 	private static final String PULSAR_TOPIC = "pft_foo-topic";
 
 	private static final PulsarContainer PULSAR_CONTAINER = new PulsarContainer(
-			PulsarTestContainerSupport.getPulsarImage());
+			PulsarTestContainerSupport.getPulsarImage())
+		.withEnv("PULSAR_PREFIX_advertisedAddress", "localhost");
 
 	private static final RabbitMQContainer RABBITMQ_CONTAINER = new RabbitMQContainer("rabbitmq");
 

integration-tests/src/intTest/java/org/springframework/pulsar/inttest/logging/PulsarTemplateLambdaWarnLoggerTests.java

@@ -64,7 +64,8 @@ class PulsarTemplateLambdaWarnLoggerTests {
 	@SuppressWarnings("unused")
 	@Container
 	@ServiceConnection
-	static PulsarContainer PULSAR_CONTAINER = new PulsarContainer(PulsarTestContainerSupport.getPulsarImage());
+	static PulsarContainer PULSAR_CONTAINER = new PulsarContainer(PulsarTestContainerSupport.getPulsarImage())
+		.withEnv("PULSAR_PREFIX_advertisedAddress", "localhost");
 
 	@Nested
 	@SpringBootTest(classes = TestAppConfig.class)

spring-pulsar-sample-apps/sample-failover-custom-router/compose.yaml

@@ -1,7 +1,7 @@
 services:
   pulsar:
-    image: 'apachepulsar/pulsar:4.1.3'
+    image: 'apachepulsar/pulsar:4.2.0'
     ports:
       - '6650'
       - '8080'
-    command: 'bin/pulsar standalone'
+    command: 'bin/pulsar standalone --advertised-address localhost '

spring-pulsar-sample-apps/sample-imperative-produce-consume/compose.yaml

@@ -1,7 +1,7 @@
 services:
   pulsar:
-    image: 'apachepulsar/pulsar:4.1.3'
+    image: 'apachepulsar/pulsar:4.2.0'
     ports:
       - '6650'
       - '8080'
-    command: 'bin/pulsar standalone'
+    command: 'bin/pulsar standalone --advertised-address localhost '

spring-pulsar-sample-apps/sample-pulsar-binder/compose.yaml

@@ -1,7 +1,7 @@
 services:
   pulsar:
-    image: 'apachepulsar/pulsar:4.1.3'
+    image: 'apachepulsar/pulsar:4.2.0'
     ports:
       - '6650'
       - '8080'
-    command: 'bin/pulsar standalone'
+    command: 'bin/pulsar standalone --advertised-address localhost '

spring-pulsar-sample-apps/sample-pulsar-functions/docker-compose.yml

@@ -2,8 +2,8 @@ version: '3.5'
 
 services:
   pulsar:
-    image: kezhenxu94/pulsar:latest
-    command: bin/pulsar standalone
+    image: 'apachepulsar/pulsar:4.2.0'
+    command: 'bin/pulsar standalone --advertised-address localhost '
     ports:
       - "6650:6650"
       - "8080:8080"

spring-pulsar-sample-apps/sample-pulsar-functions/download-connectors.sh

@@ -2,6 +2,6 @@
 
 mkdir connectors
 cd connectors
-wget https://archive.apache.org/dist/pulsar/pulsar-4.1.3/connectors/pulsar-io-cassandra-4.1.3.nar
-wget https://archive.apache.org/dist/pulsar/pulsar-4.1.3/connectors/pulsar-io-rabbitmq-4.1.3.nar
+wget https://archive.apache.org/dist/pulsar/pulsar-4.2.0/connectors/pulsar-io-cassandra-4.2.0.nar
+wget https://archive.apache.org/dist/pulsar/pulsar-4.2.0/connectors/pulsar-io-rabbitmq-4.2.0.nar
 cd ..

spring-pulsar-sample-apps/sample-pulsar-reader/compose.yaml

@@ -1,7 +1,7 @@
 services:
   pulsar:
-    image: 'apachepulsar/pulsar:4.1.3'
+    image: 'apachepulsar/pulsar:4.2.0'
     ports:
       - '6650'
       - '8080'
-    command: 'bin/pulsar standalone'
+    command: 'bin/pulsar standalone --advertised-address localhost '

spring-pulsar-test/src/main/java/org/springframework/pulsar/test/support/PulsarTestContainerSupport.java

@@ -30,10 +30,11 @@
 @Testcontainers(disabledWithoutDocker = true)
 public interface PulsarTestContainerSupport {
 
-	PulsarContainer PULSAR_CONTAINER = new PulsarContainer(getPulsarImage());
+	PulsarContainer PULSAR_CONTAINER = new PulsarContainer(getPulsarImage()).withEnv("PULSAR_PREFIX_advertisedAddress",
+			"localhost");
 
 	static DockerImageName getPulsarImage() {
-		return DockerImageName.parse("apachepulsar/pulsar:4.1.3");
+		return DockerImageName.parse("apachepulsar/pulsar:4.2.0");
 	}
 
 	@BeforeAll

spring-pulsar/src/main/java/org/springframework/pulsar/listener/DefaultPulsarMessageListenerContainer.java

@@ -555,7 +555,9 @@ private void checkIfPausedAndHandleAccordingly() {
 		}
 
 		private boolean transactional() {
-			return this.transactionTemplate != null && this.transactionManager != null;
+			return this.transactionTemplate != null
+					&& this.transactionManager != null
+					&& this.containerProperties.transactions().isEnabled();
 		}
 
 		private void invokeRecordListener(Messages<T> messages, AtomicBoolean inRetryMode) {

spring-pulsar/src/test/java/org/springframework/pulsar/core/PulsarTemplateLocalTransactionTests.java

@@ -57,6 +57,7 @@
 class PulsarTemplateLocalTransactionTests {
 
 	private static PulsarContainer PULSAR_CONTAINER = new PulsarContainer(PulsarTestContainerSupport.getPulsarImage())
+		.withEnv("PULSAR_PREFIX_advertisedAddress", "localhost")
 		.withTransactions();
 
 	private PulsarClient client;

spring-pulsar/src/test/java/org/springframework/pulsar/listener/DefaultPulsarMessageListenerContainerTxnTests.java

@@ -68,6 +68,7 @@
 class DefaultPulsarMessageListenerContainerTxnTests {
 
 	private static PulsarContainer PULSAR_CONTAINER = new PulsarContainer(PulsarTestContainerSupport.getPulsarImage())
+		.withEnv("PULSAR_PREFIX_advertisedAddress", "localhost")
 		.withTransactions();
 
 	private PulsarClient client;

spring-pulsar/src/test/java/org/springframework/pulsar/transaction/PulsarTxnTestsBase.java

@@ -64,6 +64,7 @@
 public class PulsarTxnTestsBase {
 
 	static PulsarContainer PULSAR_CONTAINER = new PulsarContainer(PulsarTestContainerSupport.getPulsarImage())
+		.withEnv("PULSAR_PREFIX_advertisedAddress", "localhost")
 		.withTransactions();
 
 	@BeforeAll

tools/pulsar/docker/standalone/pulsar-start-arm64.sh

@@ -4,4 +4,4 @@ docker run -it -p 6650:6650 -p 8080:8080 \
   --mount source=pulsardata,target=/pulsar/data \
   --mount source=pulsarconf,target=/pulsar/conf \
   kezhenxu94/pulsar:latest \
-  bin/pulsar standalone
+  bin/pulsar standalone  --advertised-address localhost

tools/pulsar/docker/standalone/pulsar-start.sh

@@ -3,5 +3,5 @@
 docker run -it -p 6650:6650 -p 8080:8080 \
   --mount source=pulsardata,target=/pulsar/data \
   --mount source=pulsarconf,target=/pulsar/conf \
-  apachepulsar/pulsar:4.1.3 \
-  bin/pulsar standalone
+  apachepulsar/pulsar:4.2.0 \
+  bin/pulsar standalone --advertised-address localhost