Merge branch 'master' into pr-717@minwoox+cdToGit

.github/workflows/gradle.yml → .github/workflows/ci.yml

@@ -22,6 +22,7 @@ jobs:
             coverage: true
           - java: 8
             os: ubuntu-latest
+            # TODO(ikhoon): Upgrade JDK version to 17
           - java: 14
             os: ubuntu-latest
     steps:
@@ -48,7 +49,10 @@ jobs:
           ${{ runner.os }}-gradle-
 
     - name: Build with Gradle
-      run: ./gradlew --no-daemon --stacktrace -Pcoverage -PnoLint build
+      run: |
+        ./gradlew --no-daemon --stacktrace -Pcoverage -PnoLint build \
+        -PbuildJdkVersion=${{ matrix.java }} \
+        -PtestJavaVersion=${{ matrix.java }} \
       shell: bash
 
     - name: Cleanup Gradle Cache
@@ -115,7 +119,10 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Build with Gradle
-        run: ./gradlew --no-daemon --stacktrace lint
+        run: |
+          ./gradlew --no-daemon --stacktrace lint \
+          -PbuildJdkVersion=${{ matrix.java }} \
+          -PtestJavaVersion=${{ matrix.java }}
         shell: bash
 
       - name: Cleanup Gradle Cache

build.gradle

@@ -140,6 +140,9 @@ configure(projectsWithFlags('java')) {
             systemProperties 'io.netty.leakDetectionLevel': 'paranoid'
         }
     }
+
+    tasks.sourcesJar.duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    tasks.processResources.duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
 
 // Configure the Javadoc tasks of all projects.

client/java-armeria/src/main/java/com/linecorp/centraldogma/client/armeria/CentralDogmaEndpointGroup.java

@@ -143,4 +143,12 @@ protected void doCloseAsync(CompletableFuture<?> future) {
         instanceListWatcher.close();
         future.complete(null);
     }
+
+    @Override
+    public String toString() {
+        return toStringHelper()
+                .add("instanceListWatcher", instanceListWatcher)
+                .add("endpointListDecoder", endpointListDecoder)
+                .toString();
+    }
 }

client/java-spring-boot1-autoconfigure/build.gradle

@@ -42,3 +42,10 @@ tasks.javadoc.source "${autoconfigureProjectDir}/src/main/java"
 tasks.withType(Checkstyle) {
     onlyIf { false }
 }
+
+// allows illegal access by cglib
+if (rootProject.ext.testJavaVersion >= 16) {
+    tasks.withType(Test) {
+        jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
+    }
+}

dependencies.yml

@@ -3,10 +3,10 @@
 #     If its classes are exposed in Javadoc, update offline links as well.
 #
 boms:
-- com.fasterxml.jackson:jackson-bom:2.13.3
-- com.linecorp.armeria:armeria-bom:1.17.2
-- io.micrometer:micrometer-bom:1.9.1
-- org.junit:junit-bom:5.8.2
+- com.fasterxml.jackson:jackson-bom:2.13.4
+- com.linecorp.armeria:armeria-bom:1.19.0
+- io.micrometer:micrometer-bom:1.9.3
+- org.junit:junit-bom:5.9.0
 
 ch.qos.logback:
   logback-classic:
@@ -40,13 +40,13 @@ com.cronutils:
 com.fasterxml.jackson.core:
   jackson-annotations:
     javadocs:
-    - https://fasterxml.github.io/jackson-annotations/javadoc/2.12/
+    - https://fasterxml.github.io/jackson-annotations/javadoc/2.13/
   jackson-core:
     javadocs:
-    - https://fasterxml.github.io/jackson-core/javadoc/2.12/
+    - https://fasterxml.github.io/jackson-core/javadoc/2.13/
   jackson-databind:
     javadocs:
-    - https://fasterxml.github.io/jackson-databind/javadoc/2.12/
+    - https://fasterxml.github.io/jackson-databind/javadoc/2.13/
 
 com.github.ben-manes.caffeine:
   caffeine:
@@ -115,7 +115,7 @@ com.linecorp.armeria:
     - https://www.javadoc.io/doc/com.linecorp.armeria/armeria-javadoc/1.17.1/
 
 com.puppycrawl.tools:
-  checkstyle: { version: '10.3.1' }
+  checkstyle: { version: '10.3.3' }
 
 com.spotify:
   completable-futures:
@@ -163,7 +163,7 @@ kr.motd.gradle:
   sphinx-gradle-plugin: { version: '2.10.1' }
 
 me.champeau.jmh:
-  jmh-gradle-plugin: { version: '0.6.6' }
+  jmh-gradle-plugin: { version: '0.6.7' }
 
 # Used only in testing-module.
 net.javacrumbs.json-unit:
@@ -225,10 +225,10 @@ org.hibernate.validator:
   hibernate-validator: { version: '6.2.3.Final' }
 
 org.javassist:
-  javassist: { version: '3.29.0-GA' }
+  javassist: { version: '3.29.1-GA' }
 
 org.mockito:
-  mockito-core: { version: &MOCKITO_VERSION '4.6.1' }
+  mockito-core: { version: &MOCKITO_VERSION '4.8.0' }
   mockito-junit-jupiter: { version: *MOCKITO_VERSION }
 
 org.mortbay.jetty.alpn:
@@ -249,7 +249,7 @@ org.slf4j:
 
 org.springframework.boot:
   spring-boot-starter:
-    version: &SPRING_BOOT_VERSION '2.7.1'
+    version: &SPRING_BOOT_VERSION '2.7.3'
     javadocs:
     - https://docs.spring.io/spring/docs/current/javadoc-api/
   spring-boot-starter-test: { version: *SPRING_BOOT_VERSION }

dist/build.gradle

@@ -14,17 +14,22 @@ buildscript {
     }
 }
 
+// TODO(ikhoon): Migrate dependencies to version catalogs
+plugins {
+    id "de.undercouch.download" version "5.1.0"
+}
+
 apply plugin: 'com.boazj.log'
 apply plugin: 'com.bmuschko.docker-remote-api'
 
-evaluationDependsOn(':cli')
 evaluationDependsOn(':server')
 evaluationDependsOn(':server-auth:saml')
 evaluationDependsOn(':server-auth:shiro')
 
 ext {
     distDir = "${project.buildDir}/dist"
     relativeDistDir = distDir.substring("${rootProject.projectDir}/".length())
+    cliDownloadDir = "${gradle.gradleUserHomeDir}/caches/centraldogma-go/cli"
 }
 
 dependencies {
@@ -71,12 +76,31 @@ task copyLib(group: 'Build',
     }
 }
 
+def cliVersion = "0.0.1"
+
+task downloadClientBinaries(group: 'Build',
+        description: "Downloads client binaries into ${project.ext.cliDownloadDir}") {
+
+    outputs.dir("${project.ext.cliDownloadDir}/$cliVersion")
+
+    doLast {
+        ["darwin-amd64", "linux-amd64", "windows-amd64.exe"].each { platform ->
+            download.run {
+                src "https://github.com/line/centraldogma-go/releases/download/$cliVersion/dogma.$platform"
+                dest "${project.ext.cliDownloadDir}/$cliVersion/dogma.$platform"
+                overwrite false
+            }
+        }
+    }
+}
+
 task copyClientBinaries(group: 'Build',
-        description: "Copies client binaries into ${project.ext.relativeDistDir}/lib",
-        dependsOn: project(':cli').tasks.assemble,
-        type: Copy) {
-    from project(':cli').ext.clientBinDir
+        description: "Copies client binaries into ${project.ext.relativeDistDir}/bin/native", type: Copy) {
+    dependsOn tasks.downloadClientBinaries
+
+    from project.ext.cliDownloadDir
     into "${project.ext.distDir}/bin/native"
+    fileMode 0755
 }
 
 task distDirWithoutClientBinaries(group: 'Build',

gradle.properties

@@ -1,5 +1,5 @@
 group=com.linecorp.centraldogma
-version=0.56.3-SNAPSHOT
+version=0.58.0-SNAPSHOT
 projectName=Central Dogma
 projectUrl=https://line.github.io/centraldogma/
 projectDescription=Highly-available version-controlled service configuration repository based on Git, ZooKeeper and HTTP/2

gradle/scripts/.github/CODEOWNERS

@@ -1,4 +1,4 @@
 # https://help.github.com/articles/about-codeowners/
 
-* @ikhoon @minwoox @trustin
+* @jrhee17 @ikhoon @minwoox @trustin
 

gradle/scripts/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+.idea
+gradle/
+.gradle

gradle/scripts/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/line/gradle-scripts.git
 	branch = master
-	commit = 5282f3234cad321ba23074663a940286a37030f4
-	parent = 85e0c4f5296916c0f802377cb8ca9d01cae1ac96
-	cmdver = 0.1.0
+	commit = 5c55c9bc72fc22f46deaa14fa3955c6664757c9b
+	parent = 8cf4e4b52c38003bb794caec6024631c409c7b2f
+	cmdver = 0.4.3
 	method = merge