Skip to content

Spring Boot 4 Support #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
infoShare wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Spring Boot 4 Support #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15ce952
#192
Feb 10, 2026
b7b40f4
#192
Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<repoName>SolaceProducts</repoName>

<!-- This is the version of Spring Boot we have targeted for this build -->
<spring.boot.version>3.5.5</spring.boot.version>
<spring.boot.version>4.0.2</spring.boot.version>

<solace.spring.boot.java-starter.version>5.5.1-SNAPSHOT
</solace.spring.boot.java-starter.version>
<solace.spring.boot.jms-starter.version>5.5.1-SNAPSHOT</solace.spring.boot.jms-starter.version>
<solace.spring.boot.starter.version>2.5.1-SNAPSHOT</solace.spring.boot.starter.version>
<testcontainers.version>1.19.8</testcontainers.version>
<testcontainers.version>2.0.3</testcontainers.version>
<solace.integration.test.support.version>1.1.2</solace.integration.test.support.version>
</properties>

Expand Down Expand Up @@ -122,15 +122,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.4</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<version>0.10.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
Expand All @@ -141,7 +141,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.2.8</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -162,22 +162,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<version>3.3.1</version>
<configuration>
<tagNameFormat>@{project.version}</tagNameFormat>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
<version>2.2</version>
<version>3.9.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.5.0</version>
</plugin>

<plugin>
Expand All @@ -191,7 +191,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>3.12.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -204,7 +204,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.4.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -217,7 +217,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.4.1</version>
<version>1.7.3</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>oss</flattenMode>
Expand Down
19 changes: 8 additions & 11 deletions solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jms</artifactId>
</dependency>
<dependency>
<groupId>com.solacesystems</groupId>
<artifactId>sol-jcsmp</artifactId>
Expand All @@ -36,7 +39,7 @@

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
<artifactId>spring-boot-starter-security-oauth2-client</artifactId>
<optional>true</optional>
</dependency>

Expand All @@ -48,13 +51,13 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<artifactId>spring-boot-starter-webmvc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit-pioneer</groupId>
<artifactId>junit-pioneer</artifactId>
<version>1.9.1</version>
<version>2.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -65,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<artifactId>testcontainers-junit-jupiter</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
Expand All @@ -75,12 +78,6 @@
<version>${solace.integration.test.support.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
11 changes: 6 additions & 5 deletions ...igure/src/main/java/com/solace/spring/boot/autoconfigure/SolaceJavaAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,22 @@
import com.solacesystems.jcsmp.JCSMPProperties;
import com.solacesystems.jcsmp.SolaceSessionOAuth2TokenProvider;
import com.solacesystems.jcsmp.SpringJCSMPFactory;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.lang.Nullable;

import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;

@Configuration
@AutoConfigureBefore(JmsAutoConfiguration.class)
@ConditionalOnClass({JCSMPProperties.class})
Expand Down
9 changes: 2 additions & 7 deletions ...re/src/main/java/com/solace/spring/boot/autoconfigure/SolaceOAuthClientConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,9 @@
import com.solace.spring.boot.autoconfigure.SolaceOAuthClientConfiguration.SolaceOAuth2SchemeCondition;
import com.solacesystems.jcsmp.DefaultSolaceSessionOAuth2TokenProvider;
import com.solacesystems.jcsmp.JCSMPProperties;
import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Condition;
import org.springframework.context.annotation.ConditionContext;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration;
import org.springframework.context.annotation.*;
import org.springframework.core.type.AnnotatedTypeMetadata;
import org.springframework.security.oauth2.client.AuthorizedClientServiceOAuth2AuthorizedClientManager;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProvider;
Expand Down
51 changes: 24 additions & 27 deletions ...e/src/test/java/com/solace/spring/boot/autoconfigure/SolaceJavaAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,16 @@
*/
package com.solace.spring.boot.autoconfigure;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import com.solacesystems.jcsmp.InvalidPropertiesException;
import com.solacesystems.jcsmp.JCSMPChannelProperties;
import com.solacesystems.jcsmp.JCSMPProperties;
import com.solacesystems.jcsmp.JCSMPSession;
import com.solacesystems.jcsmp.SpringJCSMPFactory;
import com.solacesystems.jcsmp.*;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.util.TestPropertyValues;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Configuration;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;

class SolaceJavaAutoConfigurationTest {

@Configuration public static class EmptyConfiguration { }
Expand All @@ -54,23 +51,23 @@ void defaultNativeConnectionFactory() throws InvalidPropertiesException {
JCSMPSession session = jcsmpFactory.createSession();
assertNotNull(session);

assertEquals("localhost", (String) session.getProperty(JCSMPProperties.HOST));
assertEquals("default", (String) session.getProperty(JCSMPProperties.VPN_NAME));
assertEquals("localhost", session.getProperty(JCSMPProperties.HOST));
assertEquals("default", session.getProperty(JCSMPProperties.VPN_NAME));
assertEquals("spring-default-client-username",
(String) session.getProperty(JCSMPProperties.USERNAME));
assertEquals("", (String) session.getProperty(JCSMPProperties.PASSWORD));
session.getProperty(JCSMPProperties.USERNAME));
assertEquals("", session.getProperty(JCSMPProperties.PASSWORD));
assertEquals(JCSMPProperties.SUPPORTED_MESSAGE_ACK_AUTO,
(String) session.getProperty(JCSMPProperties.MESSAGE_ACK_MODE));
session.getProperty(JCSMPProperties.MESSAGE_ACK_MODE));
assertEquals(Boolean.FALSE,
(Boolean) session.getProperty(JCSMPProperties.REAPPLY_SUBSCRIPTIONS));
assertNotNull((String) session.getProperty(JCSMPProperties.CLIENT_NAME));
session.getProperty(JCSMPProperties.REAPPLY_SUBSCRIPTIONS));
assertNotNull(session.getProperty(JCSMPProperties.CLIENT_NAME));
// Channel properties
JCSMPChannelProperties cp = (JCSMPChannelProperties) session
.getProperty(JCSMPProperties.CLIENT_CHANNEL_PROPERTIES);
assertEquals(1, (int) cp.getConnectRetries());
assertEquals(-1, (int) cp.getReconnectRetries());
assertEquals(20, (int) cp.getConnectRetriesPerHost());
assertEquals(3000, (int) cp.getReconnectRetryWaitInMillis());
assertEquals(1, cp.getConnectRetries());
assertEquals(-1, cp.getReconnectRetries());
assertEquals(20, cp.getConnectRetriesPerHost());
assertEquals(3000, cp.getReconnectRetryWaitInMillis());
}

@Test
Expand All @@ -88,18 +85,18 @@ void customNativeConnectionFactory() throws InvalidPropertiesException {
JCSMPSession session = jcsmpFactory.createSession();
assertNotNull(session);

assertEquals("192.168.1.80:55500", (String) session.getProperty(JCSMPProperties.HOST));
assertEquals("newVpn", (String) session.getProperty(JCSMPProperties.VPN_NAME));
assertEquals("bob", (String) session.getProperty(JCSMPProperties.USERNAME));
assertEquals("password", (String) session.getProperty(JCSMPProperties.PASSWORD));
assertEquals("client-name", (String) session.getProperty(JCSMPProperties.CLIENT_NAME));
assertEquals("192.168.1.80:55500", session.getProperty(JCSMPProperties.HOST));
assertEquals("newVpn", session.getProperty(JCSMPProperties.VPN_NAME));
assertEquals("bob", session.getProperty(JCSMPProperties.USERNAME));
assertEquals("password", session.getProperty(JCSMPProperties.PASSWORD));
assertEquals("client-name", session.getProperty(JCSMPProperties.CLIENT_NAME));
// Channel properties
JCSMPChannelProperties cp = (JCSMPChannelProperties) session
.getProperty(JCSMPProperties.CLIENT_CHANNEL_PROPERTIES);
assertEquals(5, (int) cp.getConnectRetries());
assertEquals(10, (int) cp.getReconnectRetries());
assertEquals(40, (int) cp.getConnectRetriesPerHost());
assertEquals(1000, (int) cp.getReconnectRetryWaitInMillis());
assertEquals(5, cp.getConnectRetries());
assertEquals(10, cp.getReconnectRetries());
assertEquals(40, cp.getConnectRetriesPerHost());
assertEquals(1000, cp.getReconnectRetryWaitInMillis());
}

void load(String... environment) {
Expand Down
12 changes: 7 additions & 5 deletions ...gure/springBootTests/MessagingServiceFreeTierBrokerTestContainerWithTlsAndOAuthSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package com.solace.spring.boot.autoconfigure.springBootTests;

import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;
import java.time.Duration;
import java.util.function.Consumer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.slf4j.Logger;
Expand All @@ -12,6 +8,12 @@
import org.testcontainers.containers.ContainerState;
import org.testcontainers.containers.wait.strategy.Wait;

import java.io.File;
import java.time.Duration;
import java.util.function.Consumer;

import static org.junit.jupiter.api.Assertions.assertNotNull;

public interface MessagingServiceFreeTierBrokerTestContainerWithTlsAndOAuthSetup {

String FULL_DOCKER_COMPOSE_FILE_PATH = "src/test/resources/free-tier-broker-with-tls-and-oauth-docker-compose.yml";
Expand All @@ -23,7 +25,7 @@ public interface MessagingServiceFreeTierBrokerTestContainerWithTlsAndOAuthSetup
MessagingServiceFreeTierBrokerTestContainerWithTlsAndOAuthSetup.class);

ComposeContainer COMPOSE_CONTAINER = new ComposeContainer(
new File(FULL_DOCKER_COMPOSE_FILE_PATH)).withLocalCompose(true).withPull(true)
new File(FULL_DOCKER_COMPOSE_FILE_PATH)).withPull(true)
.withExposedService(PUBSUB_BROKER_SERVICE_NAME, 8080)
.withExposedService(PUBSUB_BROKER_SERVICE_NAME, 55443)
.withExposedService(PUBSUB_BROKER_SERVICE_NAME, 55555)
Expand Down
12 changes: 7 additions & 5 deletions ...utoconfigure/springBootTests/MessagingServiceFreeTierBrokerTestContainerWithTlsSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package com.solace.spring.boot.autoconfigure.springBootTests;

import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;
import java.time.Duration;
import java.util.function.Consumer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.slf4j.Logger;
Expand All @@ -12,6 +8,12 @@
import org.testcontainers.containers.ContainerState;
import org.testcontainers.containers.wait.strategy.Wait;

import java.io.File;
import java.time.Duration;
import java.util.function.Consumer;

import static org.junit.jupiter.api.Assertions.assertNotNull;

public interface MessagingServiceFreeTierBrokerTestContainerWithTlsSetup {

String FULL_DOCKER_COMPOSE_FILE_PATH = "src/test/resources/free-tier-broker-with-tls-docker-compose.yml";
Expand All @@ -21,7 +23,7 @@ public interface MessagingServiceFreeTierBrokerTestContainerWithTlsSetup {
MessagingServiceFreeTierBrokerTestContainerWithTlsSetup.class);

ComposeContainer COMPOSE_CONTAINER = new ComposeContainer(
new File(FULL_DOCKER_COMPOSE_FILE_PATH)).withLocalCompose(true).withPull(true)
new File(FULL_DOCKER_COMPOSE_FILE_PATH)).withPull(true)
.withExposedService(PUBSUB_BROKER_SERVICE_NAME, 8080)
.withExposedService(PUBSUB_BROKER_SERVICE_NAME, 55443)
.withExposedService(PUBSUB_BROKER_SERVICE_NAME, 55555)
Expand Down
14 changes: 8 additions & 6 deletions ...a/com/solace/spring/boot/autoconfigure/springBootTests/MessagingWithClientCertAuthIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
package com.solace.spring.boot.autoconfigure.springBootTests;

import static org.junit.jupiter.api.Assertions.fail;
import com.solace.it.util.semp.config.BrokerConfiguratorBuilder;
import com.solace.it.util.semp.config.BrokerConfiguratorBuilder.BrokerConfigurator;
import com.solace.test.integration.semp.v2.SempV2Api;
import com.solacesystems.jcsmp.JCSMPProperties;
import com.solacesystems.jcsmp.JCSMPSession;
import com.solacesystems.jcsmp.SpringJCSMPFactory;
import java.io.File;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import org.assertj.core.util.Files;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;

import java.io.File;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.StandardCharsets;

import static org.junit.jupiter.api.Assertions.fail;

@SpringBootTest(
classes = SampleApp.class,
webEnvironment = WebEnvironment.RANDOM_PORT
Expand Down
Loading