Skip to content

Commit 311750f

Browse files
committed
Add Spring for Apache Pulsar
- remove custom docker image reference
1 parent a6999ea commit 311750f

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class PulsarAutoConfigurationIntegrationTests {
6262

6363
@DynamicPropertySource
6464
static void pulsarProperties(DynamicPropertyRegistry registry) {
65-
registry.add("spring.pulsar.client.service-url", PULSAR_CONTAINER::getPulsarBrokerUrl);
65+
registry.add("spring.pulsar.client.service-url", PULSAR_CONTAINER::getPulsarBrokerUrl);
6666
registry.add("spring.pulsar.administration.service-url", PULSAR_CONTAINER::getHttpServiceUrl);
6767
}
6868

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package org.springframework.boot.testsupport.testcontainers;
1818

19-
import java.util.Locale;
20-
2119
import org.testcontainers.utility.DockerImageName;
2220

2321
/**
@@ -42,6 +40,8 @@ public final class DockerImageNames {
4240

4341
private static final String NEO4J_VERSION = "4.4.11";
4442

43+
private static final String PULSAR_VERSION = "2.11.0";
44+
4545
private static final String POSTGRESQL_VERSION = "14.0";
4646

4747
private static final String RABBIT_VERSION = "3.11-alpine";
@@ -114,7 +114,7 @@ public static DockerImageName neo4j() {
114114
* @return a docker image name for running pulsar
115115
*/
116116
public static DockerImageName pulsar() {
117-
return isRunningOnMacM1() ? getMacM1PulsarImage() : getStandardPulsarImage();
117+
return DockerImageName.parse("apachepulsar/pulsar").withTag(PULSAR_VERSION);
118118
}
119119

120120
/**
@@ -150,18 +150,4 @@ public static DockerImageName registry() {
150150
return DockerImageName.parse("registry").withTag(REGISTRY_VERSION);
151151
}
152152

153-
private static boolean isRunningOnMacM1() {
154-
String osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
155-
String osArchitecture = System.getProperty("os.arch").toLowerCase(Locale.ENGLISH);
156-
return osName.contains("mac") && osArchitecture.equals("aarch64");
157-
}
158-
159-
private static DockerImageName getStandardPulsarImage() {
160-
return DockerImageName.parse("apachepulsar/pulsar:2.11.0");
161-
}
162-
163-
private static DockerImageName getMacM1PulsarImage() {
164-
return DockerImageName.parse("kezhenxu94/pulsar").asCompatibleSubstituteFor("apachepulsar/pulsar");
165-
}
166-
167153
}

0 commit comments

Comments
 (0)