Updated parent and Spring Boot versions, and added support for Spring Boot 3

Author: robtimus

.github/workflows/maven.yml

@@ -47,6 +47,19 @@ jobs:
       - name: Test with Maven
         run: mvn test --file pom.xml -B --no-transfer-progress -Pmin-versions
 
+  spring-boot-3:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
+      - name: Build with Maven
+        run: mvn compile --file pom.xml -B --no-transfer-progress -Pspring-boot-3
+
   native-module:
     runs-on: ubuntu-latest
     if: ${{false}} # no module descriptor available

pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.github.robtimus</groupId>
     <artifactId>robtimus-parent</artifactId>
-    <version>1.4.3</version>
+    <version>1.5</version>
     <relativePath />
   </parent>
 
@@ -67,7 +67,7 @@
     <version.httpclient>4.5.13</version.httpclient>
     <version.httpmime>4.5.13</version.httpmime>
     <version.powermock>2.0.9</version.powermock>
-    <version.spring-boot>2.7.0</version.spring-boot>
+    <version.spring-boot>2.7.6</version.spring-boot>
 
     <robtimus.site-index.generate>false</robtimus.site-index.generate>
   </properties>
@@ -300,11 +300,20 @@
       <properties>
         <version.commons-codec>1.10</version.commons-codec>
         <version.connect-sdk-java>6.0.0</version.connect-sdk-java>
-        <version.gson>2.0</version.gson>
+        <version.gson>2.6</version.gson>
         <version.httpclient>4.4</version.httpclient>
         <version.httpmime>4.4</version.httpmime>
         <version.spring-boot>2.2.0.RELEASE</version.spring-boot>
       </properties>
     </profile>
+
+    <profile>
+      <id>spring-boot-3</id>
+      <properties>
+        <version.java>17</version.java>
+        <version.spring-boot>3.0.0</version.spring-boot>
+        <version.slf4j>2.0.4</version.slf4j>
+      </properties>
+    </profile>
   </profiles>
 </project>

src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,12 @@
+com.github.robtimus.connect.sdk.java.springboot.autoconfigure.ConnectSdkAuthenticatorAutoConfiguration
+com.github.robtimus.connect.sdk.java.springboot.autoconfigure.ConnectSdkClientAutoConfiguration
+com.github.robtimus.connect.sdk.java.springboot.autoconfigure.ConnectSdkCommunicatorAutoConfiguration
+com.github.robtimus.connect.sdk.java.springboot.autoconfigure.ConnectSdkCommunicatorLoggerAutoConfiguration
+com.github.robtimus.connect.sdk.java.springboot.autoconfigure.ConnectSdkConnectionAutoConfiguration
+com.github.robtimus.connect.sdk.java.springboot.autoconfigure.ConnectSdkConnectionsEndpointAutoConfiguration
+com.github.robtimus.connect.sdk.java.springboot.autoconfigure.ConnectSdkHealthIndicatorAutoConfiguration
+com.github.robtimus.connect.sdk.java.springboot.autoconfigure.ConnectSdkLoggingEndpointAutoConfiguration
+com.github.robtimus.connect.sdk.java.springboot.autoconfigure.ConnectSdkMarshallerAutoConfiguration
+com.github.robtimus.connect.sdk.java.springboot.autoconfigure.ConnectSdkMerchantClientAutoConfiguration
+com.github.robtimus.connect.sdk.java.springboot.autoconfigure.ConnectSdkMetaDataProviderAutoConfiguration
+com.github.robtimus.connect.sdk.java.springboot.autoconfigure.ConnectSdkSessionAutoConfiguration

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkConnectionsEndpointAutoConfigurationTest.java

@@ -41,7 +41,8 @@ void testNoAutoConfigurationWithMissingClass() throws IOException {
         try (FilteredClassLoader classLoader = new FilteredClassLoader(Endpoint.class)) {
             contextRunner
                     .withClassLoader(classLoader)
-                    .withPropertyValues("management.endpoint.connectSdkConnections.enabled=true", "spring.jmx.enabled=true")
+                    .withPropertyValues("management.endpoint.connectSdkConnections.enabled=true", "spring.jmx.enabled=true",
+                            "management.endpoints.jmx.exposure.include=connectSdkConnections")
                     .run(context -> {
                         assertThat(context).doesNotHaveBean(ConnectionsEndpoint.class);
                     });
@@ -52,7 +53,8 @@ void testNoAutoConfigurationWithMissingClass() throws IOException {
     void testNoAutoConfigurationWithExistingBean() {
         contextRunner
                 .withUserConfiguration(ExistingBeanProvider.class)
-                .withPropertyValues("management.endpoint.connectSdkConnections.enabled=true", "spring.jmx.enabled=true")
+                .withPropertyValues("management.endpoint.connectSdkConnections.enabled=true", "spring.jmx.enabled=true",
+                        "management.endpoints.jmx.exposure.include=connectSdkConnections")
                 .run(context -> {
                     assertThat(context).doesNotHaveBean("connectSdkConnectionsEndpoint");
                     assertThat(context).hasSingleBean(ConnectionsEndpoint.class);
@@ -81,7 +83,8 @@ void testAutoConfigurationWithEnabledEndpoint() {
     @Test
     void testAutoConfigurationWithAvailableEndpoint() {
         contextRunner
-                .withPropertyValues("management.endpoint.connectSdkConnections.enabled=true", "spring.jmx.enabled=true")
+                .withPropertyValues("management.endpoint.connectSdkConnections.enabled=true", "spring.jmx.enabled=true",
+                        "management.endpoints.jmx.exposure.include=connectSdkConnections")
                 .run(context -> {
                     assertThat(context).hasBean("connectSdkConnectionsEndpoint");
                     assertThat(context).hasSingleBean(ConnectionsEndpoint.class);

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkLoggingEndpointAutoConfigurationTest.java

@@ -41,7 +41,8 @@ void testNoAutoConfigurationWithMissingClass() throws IOException {
         try (FilteredClassLoader classLoader = new FilteredClassLoader(Endpoint.class)) {
             contextRunner
                     .withClassLoader(classLoader)
-                    .withPropertyValues("management.endpoint.connectSdkLogging.enabled=true", "spring.jmx.enabled=true")
+                    .withPropertyValues("management.endpoint.connectSdkLogging.enabled=true", "spring.jmx.enabled=true",
+                            "management.endpoints.jmx.exposure.include=connectSdkLogging")
                     .run(context -> {
                         assertThat(context).doesNotHaveBean(LoggingEndpoint.class);
                     });
@@ -52,7 +53,8 @@ void testNoAutoConfigurationWithMissingClass() throws IOException {
     void testNoAutoConfigurationWithExistingBean() {
         contextRunner
                 .withUserConfiguration(ExistingBeanProvider.class)
-                .withPropertyValues("management.endpoint.connectSdkLogging.enabled=true", "spring.jmx.enabled=true")
+                .withPropertyValues("management.endpoint.connectSdkLogging.enabled=true", "spring.jmx.enabled=true",
+                        "management.endpoints.jmx.exposure.include=connectSdkLogging")
                 .run(context -> {
                     assertThat(context).doesNotHaveBean("connectSdkLoggingEndpoint");
                     assertThat(context).hasSingleBean(LoggingEndpoint.class);
@@ -81,7 +83,8 @@ void testAutoConfigurationWithEnabledEndpoint() {
     @Test
     void testAutoConfigurationWithAvailableEndpoint() {
         contextRunner
-                .withPropertyValues("management.endpoint.connectSdkLogging.enabled=true", "spring.jmx.enabled=true")
+                .withPropertyValues("management.endpoint.connectSdkLogging.enabled=true", "spring.jmx.enabled=true",
+                        "management.endpoints.jmx.exposure.include=connectSdkLogging")
                 .run(context -> {
                     assertThat(context).hasBean("connectSdkLoggingEndpoint");
                     assertThat(context).hasSingleBean(LoggingEndpoint.class);

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/FullAutoConfigurationTest.java

@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -50,13 +51,7 @@
 class FullAutoConfigurationTest {
 
     private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-            .withConfiguration(AutoConfigurations.of(
-                    ConnectSdkAuthenticatorAutoConfiguration.class, ConnectSdkClientAutoConfiguration.class,
-                    ConnectSdkConnectionsEndpointAutoConfiguration.class, ConnectSdkCommunicatorAutoConfiguration.class,
-                    ConnectSdkCommunicatorLoggerAutoConfiguration.class, ConnectSdkConnectionAutoConfiguration.class,
-                    ConnectSdkHealthIndicatorAutoConfiguration.class, ConnectSdkLoggingEndpointAutoConfiguration.class,
-                    ConnectSdkMarshallerAutoConfiguration.class, ConnectSdkMerchantClientAutoConfiguration.class,
-                    ConnectSdkMetaDataProviderAutoConfiguration.class, ConnectSdkSessionAutoConfiguration.class));
+            .withConfiguration(AutoConfigurations.of(AutoConfigurationLoader.class));
 
     @Test
     void testWithNoProperties() {
@@ -122,7 +117,8 @@ void testWithMinimalPropertiesForHealth() {
     void testWithMinimalPropertiesForEndpoints() {
         contextRunner
                 .withPropertyValues("management.endpoint.connectSdkConnections.enabled=true",
-                        "management.endpoint.connectSdkLogging.enabled=true", "spring.jmx.enabled=true")
+                        "management.endpoint.connectSdkLogging.enabled=true", "spring.jmx.enabled=true",
+                        "management.endpoints.jmx.exposure.include=connectSdkConnections,connectSdkLogging")
                 .run(context -> {
                     assertThat(context).doesNotHaveBean(Authenticator.class);
                     assertThat(context).doesNotHaveBean(Client.class);
@@ -150,7 +146,7 @@ void testWithAllPropertiesButShoppingCartExtensionExtensionId() {
                         "connect.api.integrator=Integrator", "connect.api.shopping-cart-extension.creator=Creator",
                         "connect.api.shopping-cart-extension.name=name", "connect.api.shopping-cart-extension.version=version",
                         "management.endpoint.connectSdkConnections.enabled=true", "management.endpoint.connectSdkLogging.enabled=true",
-                        "spring.jmx.enabled=true")
+                        "spring.jmx.enabled=true", "management.endpoints.jmx.exposure.include=connectSdkConnections,connectSdkLogging")
                 .run(context -> {
                     assertThat(context).hasSingleBean(Authenticator.class);
                     assertThat(context).hasSingleBean(Client.class);
@@ -179,7 +175,7 @@ void testWithAllProperties() {
                         "connect.api.shopping-cart-extension.name=name", "connect.api.shopping-cart-extension.version=version",
                         "connect.api.shopping-cart-extension.extension-id=extensionId",
                         "management.endpoint.connectSdkConnections.enabled=true", "management.endpoint.connectSdkLogging.enabled=true",
-                        "spring.jmx.enabled=true")
+                        "spring.jmx.enabled=true", "management.endpoints.jmx.exposure.include=connectSdkConnections,connectSdkLogging")
                 .run(context -> {
                     assertThat(context).hasSingleBean(Authenticator.class);
                     assertThat(context).hasSingleBean(Client.class);
@@ -209,7 +205,7 @@ void testWithAllPropertiesAndAdditionalBeans() {
                         "connect.api.shopping-cart-extension.name=name", "connect.api.shopping-cart-extension.version=version",
                         "connect.api.shopping-cart-extension.extension-id=extensionId",
                         "management.endpoint.connectSdkConnections.enabled=true", "management.endpoint.connectSdkLogging.enabled=true",
-                        "spring.jmx.enabled=true")
+                        "spring.jmx.enabled=true", "management.endpoints.jmx.exposure.include=connectSdkConnections,connectSdkLogging")
                 .run(context -> {
                     assertThat(context).hasSingleBean(Authenticator.class);
                     assertThat(context).hasSingleBean(Client.class);
@@ -393,4 +389,10 @@ MetaDataProviderBuilderCustomizer metaDataProviderBuilderCustomizer() {
             return builder -> builder.withAdditionalRequestHeader(new RequestHeader("custom-name", "custom-value"));
         }
     }
+
+    @Configuration
+    @EnableAutoConfiguration
+    static class AutoConfigurationLoader {
+        // no content
+    }
 }