build: update to Spring Boot 3.2

BREAKING CHANGE: Host mappings do not support ports anymore.

```yaml
- id: invalid-host-mapping
   uri: https://example.com
   predicates:
     - Host={tenant}.localtest.me:8080

- id: valid-host-mapping
   uri: https://example.com
   predicates:
     - Host={tenant}.localtest.me
```

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
     jacoco
     `jvm-test-suite`
     id("io.freefair.lombok") version "8.6"
-    id("org.springframework.boot") version "3.1.5"
+    id("org.springframework.boot") version "3.2.3"
     id("io.spring.dependency-management") version "1.1.4"
     id("org.graalvm.buildtools.native") version "0.10.1"
     id("com.github.rising3.semver") version "0.8.2"
@@ -29,7 +29,7 @@ dependencies {
     implementation("net.logstash.logback:logstash-logback-encoder:7.4")
     implementation("ch.qos.logback:logback-classic")
 
-    implementation(platform("org.springframework.cloud:spring-cloud-dependencies:2022.0.4"))
+    implementation(platform("org.springframework.cloud:spring-cloud-dependencies:2023.0.0"))
 
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
@@ -74,7 +74,7 @@ sonarqube {
     }
 }
 
-extra["testcontainersVersion"] = "1.18.2"
+extra["testcontainersVersion"] = "1.19.6"
 
 // setup separate test suites for unit and integration tests
 testing {

compose/application.demo.yaml

@@ -6,7 +6,7 @@ spring:
           uri: https://httpbin.org
           order: 2
           predicates:
-            - Host={tenant}.localtest.me:8080
+            - Host={tenant}.localtest.me
 
 morp:
   default-oauth2-client-registration: keycloak

compose/application.yaml

@@ -9,12 +9,12 @@ spring:
           uri: https://httpbin.org
           order: 2
           predicates:
-            - Host={tenant}.localtest.me:8080
+            - Host={tenant}.localtest.me
         - id: host-mapping-with-stage
           uri: https://httpbin.org
           order: 1
           predicates:
-            - Host={tenant}-{stage}.localtest.me:8080
+            - Host={tenant}-{stage}.localtest.me
         - id: path-mapping
           uri: https://httpbin.org
           predicates:
@@ -26,8 +26,8 @@ spring:
             - name: TenantFromHost
               args:
                 patterns:
-                  - static.localtest.me:8080
-                  - another-static.localtest.me:8080
+                  - static.localtest.me
+                  - another-static.localtest.me
                 tenant: foo
         - id: header-mapping
           uri: https://httpbin.org

mkdocs/docs/user-guide/routing.md

@@ -23,14 +23,14 @@ tenant ID.
 A tenant is how MORP names a customer, an application or a department. Each tenant is identified by a unique tenant ID.
 To figure out the tenant for a request, MORP uses predicates. MORP supports the following predicates:
 
-| Tenant Extractor   | Example Configuration                                                                                                                                     | Example Request               | Example Tenant |
-|--------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------|----------------|
-| `Host`             | <pre>Host={tenant}.example.com</pre>                                                                                                                      | foo.example.com               | foo            |
-| `Host`             | <pre>Host={stage}-{tenant}.example.com                                                                                                                    | dev-foo.example.com           | foo            |
-| `Path`             | <pre>Path=example.com/tenant/{tenant}</pre>                                                                                                               | example.com/tenant/foo        | foo            |
-| `Path`             | <pre>Path=example.com/api/{version}/tenant/{tenant}</pre>                                                                                                 | example.com/api/v1/tenant/foo | foo            |
-| `TenantFromHost`   | <pre>name: TenantFromHost<br/>args:<br/>  patterns:<br/>    - static.localtest.me:8080<br/>    - another-static.localtest.me:8080<br/>  tenant: foo</pre> | static.example.com            | foo            |
-| `TenantFromHeader` | <pre>TenantFromHeader=X-Tenant-ID,{tenant}</pre>                                                                                                          | X-Tenant-ID: foo              | foo            |
+| Tenant Extractor   | Example Configuration                                                                                                                           | Example Request               | Example Tenant |
+|--------------------|-------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------|----------------|
+| `Host`             | <pre>Host={tenant}.example.com</pre>                                                                                                            | foo.example.com               | foo            |
+| `Host`             | <pre>Host={stage}-{tenant}.example.com                                                                                                          | dev-foo.example.com           | foo            |
+| `Path`             | <pre>Path=example.com/tenant/{tenant}</pre>                                                                                                     | example.com/tenant/foo        | foo            |
+| `Path`             | <pre>Path=example.com/api/{version}/tenant/{tenant}</pre>                                                                                       | example.com/api/v1/tenant/foo | foo            |
+| `TenantFromHost`   | <pre>name: TenantFromHost<br/>args:<br/>  patterns:<br/>    - static.localtest.me<br/>    - another-static.localtest.me<br/>  tenant: foo</pre> | static.example.com            | foo            |
+| `TenantFromHeader` | <pre>TenantFromHeader=X-Tenant-ID,{tenant}</pre>                                                                                                | X-Tenant-ID: foo              | foo            |
 
 Predicates are configured in the `spring.cloud.gateway.routes[*].predicates` section and are applied per route. When no
 tenant is extracted for a request, the request will fail.

src/integrationTest/resources/morp/application.yaml

@@ -14,7 +14,7 @@ spring:
         - id: upstream-tenant-path
           uri: http://upstream:1080
           predicates:
-            - Host=morp:8081
+            - Host=morp
             - Path=/upstream/{tenant}/{path}
           filters:
             - SetPath=/{path}
@@ -23,7 +23,7 @@ spring:
         - id: upstream-tenant-host
           uri: http://upstream:1080
           predicates:
-            - Host={tenant}-morp:8081
+            - Host={tenant}-morp
             - Path=/upstream/{path}
           filters:
             - SetPath=/{path}

src/test/java/io/jaconi/morp/MorpApplicationTests.java

@@ -9,11 +9,13 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.aot.DisabledInAotMode;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @SpringBootTest
+@DisabledInAotMode
 class MorpApplicationTests {
 
     @Nested

src/test/java/io/jaconi/morp/oauth/MorpReactiveOAuth2UserServiceTest.java

@@ -12,6 +12,7 @@
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 import org.springframework.security.oauth2.core.OAuth2AccessToken;
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import reactor.test.StepVerifier;
 
 import java.io.BufferedReader;
@@ -31,6 +32,7 @@
 import static org.mockito.Mockito.when;
 
 @SpringBootTest
+@DisabledInAotMode
 class MorpReactiveOAuth2UserServiceTest {
 
     @Autowired

src/test/java/io/jaconi/morp/oauth/MorpReactiveOidcUserServiceTest.java

@@ -13,6 +13,7 @@
 import org.springframework.security.oauth2.core.OAuth2AccessToken;
 import org.springframework.security.oauth2.core.oidc.OidcIdToken;
 import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import reactor.test.StepVerifier;
 
 import java.time.Instant;
@@ -27,6 +28,7 @@
 import static org.mockito.Mockito.when;
 
 @SpringBootTest
+@DisabledInAotMode
 class MorpReactiveOidcUserServiceTest {
 
     @Autowired

src/test/java/io/jaconi/morp/oauth/RegistrationResolverTest.java

@@ -7,6 +7,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
+import org.springframework.test.context.aot.DisabledInAotMode;
 
 import java.util.Map;
 import java.util.Set;
@@ -16,6 +17,7 @@
 import static org.mockito.Mockito.when;
 
 @SpringBootTest
+@DisabledInAotMode
 class RegistrationResolverTest {
 
     @Autowired

src/test/java/io/jaconi/morp/oauth/TenantAwareClientRegistrationRepositoryTest.java

@@ -10,13 +10,15 @@
 import org.springframework.cache.CacheManager;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import reactor.test.StepVerifier;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
 @SpringBootTest
+@DisabledInAotMode
 class TenantAwareClientRegistrationRepositoryTest {
 
     private static final String TENANT = "tenant1";