Merge pull request #894 from tokuhirom/boot3

tokuhirom · web-flow · commit d6baca49a5d3 · 2023-02-06T14:35:06.000+09:00
Upgrade to Spring Boot3
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '8', '11', '17' ] # We want to test on LTSs.
+        java: [ '17' ] # We want to test on LTSs.
     steps:
     - name: actions/setup-java@v3 (JDK ${{ matrix.java }})
       uses: actions/setup-java@v3
@@ -38,11 +38,11 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - name: actions/setup-java@v3 (JDK 1.8)
+    - name: actions/setup-java@v3 (JDK 17)
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 8
+        java-version: 17
         architecture: x64
     - uses: actions/checkout@v3
     - run: |
@@ -56,11 +56,11 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - name: actions/setup-java@v3 (JDK 1.8)
+    - name: actions/setup-java@v3 (JDK 1.17)
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 8
+        java-version: 17
         architecture: x64
     - uses: actions/checkout@v3
     - run: |
@@ -75,11 +75,11 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - name: actions/setup-java@v3 (JDK 1.8)
+    - name: actions/setup-java@v3 (JDK 17)
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 8
+        java-version: 17
         architecture: x64
     - uses: actions/checkout@v3
     - run: |
diff --git a/.github/workflows/pom-validation.yml b/.github/workflows/pom-validation.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '8', '11', '17' ] # We want to test on LTSs.
+        java: [ '17' ] # We want to test on LTSs.
     steps:
     - name: actions/setup-java@v3 (JDK ${{ matrix.java }})
       uses: actions/setup-java@v3
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -26,7 +26,7 @@ plugins {
     signing
     id("org.jetbrains.kotlin.jvm") version "1.8.10" apply false
     id("com.github.spotbugs") version "5.0.13" apply false
-    id("org.springframework.boot") version "2.7.8" apply false
+    id("org.springframework.boot") version "3.0.2" apply false
     id("io.freefair.lombok") version "6.6.1"
 }
 
@@ -57,8 +57,8 @@ subprojects {
     }
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     group = rootProject.group
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -149,7 +149,7 @@
     <module name="UnusedImports" />
     <module name="ImportOrder">
       <property name="groups"
-                value="java,javax,org,android,net,/^com\.(?!linecorp\.|nhn\.|nhncorp\.).*$/,com.linecorp,com.nhn,com.nhncorp,jp.naver" />
+                value="java,javax,jakarta,org,android,net,/^com\.(?!linecorp\.|nhn\.|nhncorp\.).*$/,com.linecorp,com.nhn,com.nhncorp,jp.naver" />
       <property name="ordered" value="true" />
       <property name="separated" value="true" />
       <property name="option" value="top" />
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -29,7 +29,8 @@ jackson-module-parameter-names = { module = "com.fasterxml.jackson.module:jackso
 
 findbugs-jsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
 
-javax-servlet-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" }
+jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.0.0" }
+jakarta-annotation-api = { module = "jakarta.annotation:jakarta.annotation-api", version = "2.1.1" }
 
 # logging
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
@@ -47,8 +48,9 @@ commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
 reflections = { module = "org.reflections:reflections", version = "0.10.2" }
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
-spring-test = { module = "org.springframework:spring-test", version = "5.3.25" }
-wiremock = { group = "com.github.tomakehurst", name = "wiremock-jre8", version = "2.35.0" }
+spring-test = { module = "org.springframework:spring-test", version = "6.0.4" }
+# https://github.com/wiremock/wiremock/issues/1760
+wiremock = { group = "com.github.tomakehurst", name = "wiremock", version = "3.0.0-beta-2" }
 
 
 [bundles]
diff --git a/line-bot-api-client/build.gradle.kts b/line-bot-api-client/build.gradle.kts
@@ -59,6 +59,7 @@ dependencies {
     testImplementation(libs.wiremock)
     testImplementation(libs.bundles.tests)
     testImplementation(libs.jul.to.slf4j)
+    testImplementation(libs.guava)
 
     integrationTestImplementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
     integrationTestCompileOnly(libs.lombok)
diff --git a/line-bot-api-client/src/integrationTest/java/com/linecorp/bot/client/RetryableLineMessagingClientImplIntegrationTest.java b/line-bot-api-client/src/integrationTest/java/com/linecorp/bot/client/RetryableLineMessagingClientImplIntegrationTest.java
@@ -78,7 +78,7 @@ public void broadcastWithRetryKey() throws Exception {
                         new Broadcast(new TextMessage(message), false)
                 ).get()
         ).isInstanceOf(ExecutionException.class)
-         .getCause()
+         .cause()
          .isInstanceOf(ConflictException.class);
     }
 
@@ -103,7 +103,7 @@ public void multicastWithRetryKey() throws Exception {
                                       false)
                 ).get()
         ).isInstanceOf(ExecutionException.class)
-         .getCause()
+         .cause()
          .isInstanceOf(ConflictException.class);
     }
 
@@ -126,7 +126,7 @@ public void pushMessageWithRetryKey() throws Exception {
                         new PushMessage(settings.getUserId(), new TextMessage(message), true)
                 ).get()
         ).isInstanceOf(ExecutionException.class)
-         .getCause()
+         .cause()
          .isInstanceOf(ConflictException.class);
     }
 
@@ -144,7 +144,7 @@ public void narrowcastWithRetry() throws Exception {
         assertThatThrownBy(
                 () -> target.narrowcast(retryKey, request).get()
         ).isInstanceOf(ExecutionException.class)
-         .getCause()
+         .cause()
          .isInstanceOf(ConflictException.class);
     }
 }
diff --git a/line-bot-api-client/src/main/java/com/linecorp/bot/client/exception/LineMessagingException.java b/line-bot-api-client/src/main/java/com/linecorp/bot/client/exception/LineMessagingException.java
@@ -21,6 +21,7 @@
 import lombok.Getter;
 
 @Getter
+@SuppressWarnings("serial")
 public abstract class LineMessagingException extends Exception {
     static final long SERIAL_VERSION_UID = 0x001_003; // 1.3.x
     private static final long serialVersionUID = SERIAL_VERSION_UID;
diff --git a/line-bot-cli/src/main/resources/application.yml b/line-bot-cli/src/main/resources/application.yml
@@ -21,7 +21,10 @@ logging:
       %m%n%wEx
 
 ---
-spring.profiles: debug
+spring:
+  config:
+    activate:
+      on-profile: "debug"
 logging:
   level:
     root: DEBUG
diff --git a/line-bot-model/build.gradle.kts b/line-bot-model/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     implementation(libs.jackson.datatype.jsr310)
     implementation(libs.jackson.module.parameter.names)
     implementation(libs.findbugs.jsr305)
+    compileOnly(libs.jakarta.annotation.api)
 
     testImplementation(libs.guava)
     testImplementation(libs.reflections)
diff --git a/line-bot-model/src/main/java/com/linecorp/bot/model/message/flex/component/Video.java b/line-bot-model/src/main/java/com/linecorp/bot/model/message/flex/component/Video.java
@@ -20,7 +20,7 @@
 import java.text.DecimalFormat;
 import java.util.function.Supplier;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
diff --git a/line-bot-model/src/main/java/com/linecorp/bot/model/request/GetFollowersRequest.java b/line-bot-model/src/main/java/com/linecorp/bot/model/request/GetFollowersRequest.java
@@ -16,7 +16,7 @@
 
 package com.linecorp.bot.model.request;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import com.linecorp.bot.model.response.GetFollowersResponse;
 
diff --git a/line-bot-model/src/main/java/com/linecorp/bot/model/response/GetAggregationUnitNameListResponse.java b/line-bot-model/src/main/java/com/linecorp/bot/model/response/GetAggregationUnitNameListResponse.java
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
diff --git a/line-bot-model/src/main/java/com/linecorp/bot/model/response/GetFollowersResponse.java b/line-bot-model/src/main/java/com/linecorp/bot/model/response/GetFollowersResponse.java
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
diff --git a/line-bot-servlet/build.gradle.kts b/line-bot-servlet/build.gradle.kts
@@ -21,10 +21,10 @@ dependencies {
     implementation(libs.jackson.databind)
     implementation(libs.guava)
 
-    compileOnly(libs.javax.servlet.api)
+    compileOnly(libs.jakarta.servlet.api)
     compileOnly(libs.slf4j.api)
 
-    testImplementation(libs.javax.servlet.api)
+    testImplementation(libs.jakarta.servlet.api)
     testImplementation(libs.bundles.tests)
     testImplementation(libs.spring.test) // MockHttpServletRequest
 }
diff --git a/line-bot-servlet/src/main/java/com/linecorp/bot/servlet/LineBotCallbackRequestParser.java b/line-bot-servlet/src/main/java/com/linecorp/bot/servlet/LineBotCallbackRequestParser.java
@@ -18,7 +18,7 @@
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.google.common.io.ByteStreams;
 
diff --git a/line-bot-spring-boot/build.gradle.kts b/line-bot-spring-boot/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation(libs.guava)
 
-    compileOnly("javax.validation:validation-api")
+    compileOnly("jakarta.validation:jakarta.validation-api")
 
     testImplementation(libs.system.lambda)
     testImplementation(libs.wiremock)
diff --git a/line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/BotPropertiesValidator.java b/line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/BotPropertiesValidator.java
@@ -23,10 +23,10 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
 
 import com.linecorp.bot.spring.boot.BotPropertiesValidator.ValidBotProperties;
 
diff --git a/line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/LineBotProperties.java b/line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/LineBotProperties.java
@@ -18,8 +18,8 @@
 
 import java.net.URI;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.validation.annotation.Validated;
diff --git a/line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/interceptor/LineBotServerInterceptor.java b/line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/interceptor/LineBotServerInterceptor.java
@@ -18,8 +18,8 @@
 
 import java.io.PrintWriter;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
diff --git a/line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/support/LineBotDestinationArgumentProcessor.java b/line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/support/LineBotDestinationArgumentProcessor.java
@@ -16,7 +16,7 @@
 
 package com.linecorp.bot.spring.boot.support;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Component;
diff --git a/line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/support/LineBotServerArgumentProcessor.java b/line-bot-spring-boot/src/main/java/com/linecorp/bot/spring/boot/support/LineBotServerArgumentProcessor.java
@@ -16,7 +16,7 @@
 
 package com.linecorp.bot.spring.boot.support;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Component;
diff --git a/line-bot-spring-boot/src/main/resources/META-INF/spring.factories b/line-bot-spring-boot/src/main/resources/META-INF/spring.factories
diff --git a/line-bot-spring-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/line-bot-spring-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+com.linecorp.bot.spring.boot.LineBotAutoConfiguration
+com.linecorp.bot.spring.boot.LineBotWebMvcConfigurer
diff --git a/line-bot-spring-boot/src/test/java/com/linecorp/bot/spring/boot/BotPropertiesValidatorTest.java b/line-bot-spring-boot/src/test/java/com/linecorp/bot/spring/boot/BotPropertiesValidatorTest.java
@@ -22,10 +22,10 @@
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/line-bot-spring-boot/src/test/java/com/linecorp/bot/spring/boot/interceptor/LineBotServerInterceptorTest.java b/line-bot-spring-boot/src/test/java/com/linecorp/bot/spring/boot/interceptor/LineBotServerInterceptorTest.java
@@ -20,8 +20,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/sample-manage-audience/src/main/java/com/linecorp/bot/messagingapidemoapp/controller/ManageAudienceController.java b/sample-manage-audience/src/main/java/com/linecorp/bot/messagingapidemoapp/controller/ManageAudienceController.java
@@ -42,7 +42,7 @@
 import com.linecorp.bot.model.manageaudience.request.CreateImpBasedAudienceGroupRequest;
 import com.linecorp.bot.model.manageaudience.request.UpdateAudienceGroupDescriptionRequest;
 
-import io.micrometer.core.instrument.util.StringUtils;
+import io.micrometer.common.util.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/sample-manage-audience/src/main/java/com/linecorp/bot/messagingapidemoapp/controller/message/MessageHelper.java b/sample-manage-audience/src/main/java/com/linecorp/bot/messagingapidemoapp/controller/message/MessageHelper.java
@@ -28,7 +28,7 @@
 
 import com.linecorp.bot.model.message.Message;
 
-import io.micrometer.core.instrument.util.StringUtils;
+import io.micrometer.common.util.StringUtils;
 import lombok.AllArgsConstructor;
 
 @Component
diff --git a/sample-manage-audience/src/main/java/com/linecorp/bot/messagingapidemoapp/controller/message/MulticastController.java b/sample-manage-audience/src/main/java/com/linecorp/bot/messagingapidemoapp/controller/message/MulticastController.java
@@ -36,7 +36,7 @@
 import com.linecorp.bot.model.Multicast;
 import com.linecorp.bot.model.message.Message;
 
-import io.micrometer.core.instrument.util.StringUtils;
+import io.micrometer.common.util.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/sample-manage-audience/src/main/java/com/linecorp/bot/messagingapidemoapp/controller/message/NarrowcastController.java b/sample-manage-audience/src/main/java/com/linecorp/bot/messagingapidemoapp/controller/message/NarrowcastController.java
@@ -56,7 +56,7 @@
 import com.linecorp.bot.model.narrowcast.filter.SubscriptionPeriodDemographicFilter.SubscriptionPeriod;
 import com.linecorp.bot.model.narrowcast.recipient.Recipient;
 
-import io.micrometer.core.instrument.util.StringUtils;
+import io.micrometer.common.util.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ plugins {`
`26`	`26`	`signing`
`27`	`27`	`id("org.jetbrains.kotlin.jvm") version "1.8.10" apply false`
`28`	`28`	`id("com.github.spotbugs") version "5.0.13" apply false`
`29`		`- id("org.springframework.boot") version "2.7.8" apply false`
	`29`	`+ id("org.springframework.boot") version "3.0.2" apply false`
`30`	`30`	`id("io.freefair.lombok") version "6.6.1"`
`31`	`31`	`}`
`32`	`32`
`@@ -57,8 +57,8 @@ subprojects {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`java {`
`60`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`61`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`60`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`61`	`+ targetCompatibility = JavaVersion.VERSION_17`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`group = rootProject.group`