build: use Java 21

.github/workflows/continuous.yaml

@@ -65,7 +65,7 @@ jobs:
       - name: Install Java
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Validate Gradle wrapper

.github/workflows/release.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Install Java
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Validate Gradle wrapper

build.gradle.kts

@@ -63,7 +63,7 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
 }
 
 sonarqube {
@@ -115,7 +115,7 @@ testing {
             targets {
                 all {
                     testTask.configure {
-                        mustRunAfter(tasks.named("dockerBuild"))
+                        mustRunAfter(tasks.bootBuildImage)
                         testLogging.exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
                         testLogging.showStandardStreams = true
                     }
@@ -125,17 +125,6 @@ testing {
     }
 }
 
-tasks.create<Exec>("dockerBuild") {
-    mustRunAfter(tasks.test)
-    executable("docker")
-    args(listOf("build", "-t", "${registry}/${project.name}:${project.version}", "-t", "${registry}/${project.name}:latest", "."))
-}
-
-tasks.create<Exec>("dockerBuildPush") {
-    executable("docker")
-    args(listOf("buildx", "build", "--platform", "linux/amd64,linux/arm64", "-t", "${registry}/${project.name}:${project.version}", "--push", "."))
-}
-
 tasks.withType<BootBuildImage> {
     mustRunAfter(tasks.test)
     imageName.value("${registry}/${project.name}:${project.version}")
@@ -157,7 +146,7 @@ tasks.withType<BootBuildImage> {
 
 tasks.check {
     dependsOn(tasks.test)
-    dependsOn(tasks.named("dockerBuild"))
+    dependsOn(tasks.bootBuildImage)
     dependsOn(testing.suites.named("integrationTest"))
     dependsOn(tasks.jacocoTestReport)
 }

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

@@ -14,7 +14,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@SpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @DisabledInAotMode
 class MorpApplicationTests {
 

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

@@ -31,7 +31,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@SpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @DisabledInAotMode
 class MorpReactiveOAuth2UserServiceTest {
 

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

@@ -27,7 +27,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@SpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @DisabledInAotMode
 class MorpReactiveOidcUserServiceTest {
 

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

@@ -16,7 +16,7 @@
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.when;
 
-@SpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @DisabledInAotMode
 class RegistrationResolverTest {
 

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

@@ -17,7 +17,7 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
-@SpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @DisabledInAotMode
 class TenantAwareClientRegistrationRepositoryTest {