Fully switch to gradle dependency management (#806)

* Add pom validation test cases
* Fully convert dependency management to gradle's version catalog

Author: tokuhirom

.github/workflows/pom-validation.yml

@@ -0,0 +1,23 @@
+name: pom validation
+on: [push, pull_request]
+jobs:
+  test:
+    name: test (JDK ${{ matrix.java }})
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ '1.8', '11.x', '17' ] # LTS's.
+    steps:
+    - name: actions/setup-java@v1 (JDK ${{ matrix.java }})
+      uses: actions/setup-java@v1
+      with:
+        java-version: ${{ matrix.java }}
+        architecture: x64
+    - uses: actions/checkout@v1
+    - run: |
+        mkdir -p ~/.gradle
+        echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties
+    - run: python3 tests/maven-pom-validation-test.py
+

build.gradle.kts

@@ -64,11 +64,6 @@ subprojects {
     group = rootProject.group
     version = rootProject.version
 
-    dependencies {
-        implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
-        annotationProcessor(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
-    }
-
     tasks.named("compileJava") {
         inputs.files(tasks.named("processResources"))
     }

gradle/libs.versions.toml

@@ -2,17 +2,61 @@
 jsonwebtoken = "0.11.5"
 retrofit2 = "2.9.0"
 jjwt = "0.11.5"
+jackson = "2.13.3"
+assertj = "3.22.0"
+junit = "5.8.2"
+slf4j = "1.7.36"
+json-path = "2.7.0"
+mockito = "4.5.1"
+okhttp3 = "4.9.3"
 
 [libraries]
 retrofit2-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit2" }
 retrofit2-converter-jackson = { module = "com.squareup.retrofit2:converter-jackson", version.ref = "retrofit2" }
 guava = { group = "com.google.guava", name = "guava", version = "31.1-jre" }
 system-lambda = { group = "com.github.stefanbirkner", name = "system-lambda", version = "1.2.1" }
-wiremock = { group = "com.github.tomakehurst", name = "wiremock-jre8", version = "2.33.2" }
 jjwt-api = { module = "io.jsonwebtoken:jjwt-api", version.ref = "jjwt" }
 jjwt-impl = { module = "io.jsonwebtoken:jjwt-impl", version.ref = "jjwt" }
 jjwt-jackson = { module = "io.jsonwebtoken:jjwt-jackson", version.ref = "jjwt" }
+lombok = { module = "org.projectlombok:lombok", version = "1.18.24" }
+
+okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp3" }
+
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
+jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
+jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
+jackson-module-parameter-names = { module = "com.fasterxml.jackson.module:jackson-module-parameter-names", version.ref = "jackson" }
+
+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" }
+
+# logging
+slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+jul-to-slf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
+
+# tests
+assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" }
+junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
+junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
+junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit" }
+json-path = { module = "com.jayway.jsonpath:json-path", version.ref = "json-path" }
+json-path-assert = { module = "com.jayway.jsonpath:json-path-assert", version.ref = "json-path" }
+jsonassert = { module = "org.skyscreamer:jsonassert", version = "1.5.1" }
+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.22" }
+wiremock = { group = "com.github.tomakehurst", name = "wiremock-jre8", version = "2.33.2" }
+
 
 [bundles]
 retrofit2 = ["retrofit2-converter-jackson", "retrofit2-retrofit"]
-
+tests = [
+    "assertj-core",
+    "junit-jupiter-api", "junit-jupiter-params", "junit-vintage-engine",
+    "slf4j-api",
+    "json-path", "json-path-assert", "jsonassert",
+    "mockito-core", "mockito-junit-jupiter",
+]

line-bot-api-client/build.gradle.kts

@@ -48,19 +48,21 @@ tasks.check { dependsOn(integrationTest) }
 
 dependencies {
     api(project(":line-bot-model"))
-    implementation("org.slf4j:slf4j-api")
-    implementation("com.squareup.okhttp3:logging-interceptor")
+    implementation(libs.slf4j.api)
+    implementation(libs.okhttp3.logging.interceptor)
     implementation(libs.bundles.retrofit2)
 
-    testCompileOnly("org.projectlombok:lombok")
-    testAnnotationProcessor("org.projectlombok:lombok")
+    testCompileOnly(libs.lombok)
+    testAnnotationProcessor(libs.lombok)
 
     testImplementation(libs.system.lambda)
     testImplementation(libs.wiremock)
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation(libs.bundles.tests)
+    testImplementation(libs.jul.to.slf4j)
 
-    integrationTestCompileOnly("org.projectlombok:lombok")
-    integrationTestAnnotationProcessor("org.projectlombok:lombok")
+    integrationTestImplementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
+    integrationTestCompileOnly(libs.lombok)
+    integrationTestAnnotationProcessor(libs.lombok)
     integrationTestImplementation(libs.guava)
     integrationTestImplementation(libs.jjwt.api)
     integrationTestImplementation(libs.jjwt.jackson)

line-bot-cli/build.gradle.kts

@@ -19,6 +19,8 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
 apply(plugin = "org.springframework.boot")
 
 dependencies {
+    implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
+
     implementation(project(":line-bot-spring-boot"))
     implementation(project(":line-bot-api-client"))
     implementation("org.springframework.boot:spring-boot-starter-web")

line-bot-model/build.gradle.kts

@@ -15,14 +15,14 @@
  */
 
 dependencies {
-    api("com.fasterxml.jackson.core:jackson-databind") // Provide configured ObjectMapper.
-    implementation("com.fasterxml.jackson.core:jackson-annotations")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
-    implementation("com.fasterxml.jackson.module:jackson-module-parameter-names")
-    implementation("com.google.code.findbugs:jsr305:3.0.2")
+    api(libs.jackson.databind) // Provide configured ObjectMapper.
+    implementation(libs.jackson.annotations)
+    implementation(libs.jackson.datatype.jsr310)
+    implementation(libs.jackson.module.parameter.names)
+    implementation(libs.findbugs.jsr305)
 
-    testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
-    testImplementation("com.fasterxml.jackson.module:jackson-module-parameter-names")
     testImplementation(libs.guava)
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation(libs.reflections)
+    testImplementation(libs.commons.io)
+    testImplementation(libs.bundles.tests)
 }

line-bot-model/src/test/java/com/linecorp/bot/model/event/CallbackRequestTest.java

@@ -26,8 +26,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
-import org.springframework.util.StreamUtils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -68,7 +68,7 @@ interface RequestTester {
 
     private void parse(String resourceName, RequestTester callback) throws IOException {
         try (InputStream resource = getClass().getClassLoader().getResourceAsStream(resourceName)) {
-            String json = StreamUtils.copyToString(resource, StandardCharsets.UTF_8);
+            String json = IOUtils.toString(resource, StandardCharsets.UTF_8);
             ObjectMapper objectMapper = TestUtil.objectMapperWithProductionConfiguration(false);
             CallbackRequest callbackRequest = objectMapper.readValue(json, CallbackRequest.class);
 

line-bot-model/src/test/java/com/linecorp/bot/model/event/ReplyEventTest.java

@@ -16,15 +16,14 @@
 
 package com.linecorp.bot.model.event;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.reflections.scanners.Scanners.SubTypes;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
-import org.springframework.util.ClassUtils;
+import org.reflections.Reflections;
 
 import com.google.common.base.Preconditions;
 
@@ -40,7 +39,7 @@ public void eventWithReplyTokenShouldBeImplementReplySupportTest() {
         log.info("eventClasses = {}", eventClasses);
 
         for (Class<?> eventClass : eventClasses) {
-            final boolean hasReplyTokenMethod = ClassUtils.hasMethod(eventClass, "getReplyToken");
+            final boolean hasReplyTokenMethod = hasMethod(eventClass, "getReplyToken");
 
             if (hasReplyTokenMethod) {
                 assertThat(ReplyEvent.class)
@@ -49,23 +48,19 @@ public void eventWithReplyTokenShouldBeImplementReplySupportTest() {
         }
     }
 
-    private static List<Class<?>> getAllEventClass() {
-        ClassPathScanningCandidateComponentProvider scanningProvider =
-                new ClassPathScanningCandidateComponentProvider(false);
-        scanningProvider
-                .addIncludeFilter((metadataReader, metadataReaderFactory) -> true);
+    private static boolean hasMethod(Class<?> clazz, String method) {
+        try {
+            clazz.getMethod(method);
+            return true;
+        } catch (NoSuchMethodException e) {
+            return false;
+        }
+    }
 
-        return scanningProvider.findCandidateComponents(Event.class.getPackage().getName())
-                               .stream()
-                               .map(BeanDefinition::getBeanClassName)
-                               .map(className -> {
-                                   try {
-                                       return (Class<?>) Class.forName(className);
-                                   } catch (ClassNotFoundException e) {
-                                       throw new RuntimeException(e);
-                                   }
-                               })
-                               .filter(Event.class::isAssignableFrom)
-                               .collect(toList());
+    private static List<Class<?>> getAllEventClass() {
+        return new ArrayList<>(
+                new Reflections(Event.class.getPackage().getName())
+                        .get(SubTypes.of(Event.class).asClass())
+        );
     }
 }

line-bot-model/src/test/java/com/linecorp/bot/model/message/flex/FlexDeserializeSerializeTest.java

@@ -18,7 +18,6 @@
 
 import static java.lang.ClassLoader.getSystemResource;
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
-import static org.springframework.util.StreamUtils.copyToString;
 
 import java.io.FileInputStream;
 import java.nio.charset.StandardCharsets;
@@ -27,6 +26,7 @@
 import java.nio.file.Paths;
 import java.util.stream.Stream;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -59,7 +59,7 @@ private DynamicTest testResource(final Path resource) {
         return dynamicTest(resource.getFileName().toString(), () -> {
             final FileInputStream fileInputStream = new FileInputStream(resource.toFile());
 
-            final String json = copyToString(fileInputStream, StandardCharsets.UTF_8);
+            final String json = IOUtils.toString(fileInputStream, StandardCharsets.UTF_8);
             log.debug("JSON                : {}", json);
 
             final FlexContainer flexContainer = mapper.readValue(json, FlexContainer.class);

line-bot-model/src/test/java/com/linecorp/bot/model/response/demographics/GetFriendsDemographicsResponseTest.java

@@ -18,10 +18,10 @@
 
 import static java.lang.ClassLoader.getSystemResourceAsStream;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.util.StreamUtils.copyToByteArray;
 
 import java.io.IOException;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -38,7 +38,7 @@ public class GetFriendsDemographicsResponseTest {
 
     @Test
     public void reconstructTest() throws IOException {
-        final byte[] bytes = copyToByteArray(getSystemResourceAsStream("friends-demographics.json"));
+        final byte[] bytes = IOUtils.toByteArray(getSystemResourceAsStream("friends-demographics.json"));
 
         // Do
         final GetFriendsDemographicsResponse deserialized =