Merge branch 'main' into scoped-readonly

Author: ikhoon

build.gradle

@@ -5,6 +5,14 @@ import org.jsoup.select.Elements
 import static java.lang.Math.min
 
 buildscript {
+    repositories {
+        def mavenCentralMirror = providers.gradleProperty('mavenCentralMirror').getOrNull()
+        if (mavenCentralMirror) {
+            maven { url = mavenCentralMirror }
+        } else {
+            mavenCentral()
+        }
+    }
     dependencies {
         classpath libs.jsoup
     }
@@ -17,7 +25,12 @@ plugins {
 
 allprojects {
     repositories {
-        mavenCentral()
+        def mavenCentralMirror = providers.gradleProperty('mavenCentralMirror').getOrNull()
+        if (mavenCentralMirror) {
+            maven { url = mavenCentralMirror }
+        } else {
+            mavenCentral()
+        }
     }
 }
 

dist/build.gradle

@@ -1,6 +1,11 @@
 buildscript {
     repositories {
-        mavenCentral()
+        def mavenCentralMirror = providers.gradleProperty('mavenCentralMirror').getOrNull()
+        if (mavenCentralMirror) {
+            maven { url = mavenCentralMirror }
+        } else {
+            mavenCentral()
+        }
         gradlePluginPortal()
     }
     dependencies {

gradle/scripts/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/line/gradle-scripts.git
 	branch = main
-	commit = ed4e32f6327760c009660d032a43a2eb1504c2c4
-	parent = bc900cce0f63a5f3959a697c5c219e036192d4b8
-	cmdver = 0.4.9
+	commit = 164b0ab73666dc3d05456912aa93759bf312af52
+	parent = b0011fd46b1114d5860ac58d48657babc78058b2
+	cmdver = 0.4.6
 	method = merge

gradle/scripts/README.md

@@ -36,6 +36,7 @@ sensible defaults. By applying them, you can:
 - [Setting a Kotlin target version with the `kotlin(\\d+\\.\\d+)` flag](#setting-a-koltin-target-version-with-the-kotlindd-flag)
 - [Automatic module names](#automatic-module-names)
 - [Tagging conveniently with `release` task](#tagging-conveniently-with-release-task)
+- [Using a Maven Central mirror](#using-a-maven-central-mirror)
 
 <!-- /MarkdownTOC -->
 
@@ -759,3 +760,25 @@ instructions after tagging:
 Note the `${tag}`, which is replaced with the tag name.
 See [Groovy `SimpleTemplateEngine`](http://docs.groovy-lang.org/docs/next/html/documentation/template-engines.html#_simpletemplateengine)
 for the syntax.
+
+## Using a Maven Central mirror
+
+If your organization blocks direct access to Maven Central (e.g. for supply chain security), you can
+redirect all Maven Central requests to an internal mirror by setting the `mavenCentralMirror` Gradle
+property.
+
+Add to `~/.gradle/gradle.properties`:
+
+```properties
+mavenCentralMirror=https://your-mirror.example.com/repository/maven-central/
+```
+
+Or pass via the CLI:
+
+```bash
+./gradlew build -PmavenCentralMirror=https://your-mirror.example.com/repository/maven-central/
+```
+
+When set, the mirror URL replaces `mavenCentral()` in all repository declarations including
+`settings.gradle`, `buildSrc`, and `buildscript` blocks of applied scripts. When unset, behavior
+is identical to the default — fully backward compatible.

gradle/scripts/lib/common-dependencies.gradle

@@ -4,7 +4,12 @@ import org.yaml.snakeyaml.Yaml
 
 buildscript {
     repositories {
-        mavenCentral()
+        def mavenCentralMirror = providers.gradleProperty('mavenCentralMirror').getOrNull()
+        if (mavenCentralMirror) {
+            maven { url = mavenCentralMirror }
+        } else {
+            mavenCentral()
+        }
         gradlePluginPortal()
     }
 
@@ -36,7 +41,12 @@ configure(dependencyManagementProject) {
         google()
         // Since we manage plugin versions here too.
         gradlePluginPortal()
-        mavenCentral()
+        def mavenCentralMirror = providers.gradleProperty('mavenCentralMirror').getOrNull()
+        if (mavenCentralMirror) {
+            maven { url = mavenCentralMirror }
+        } else {
+            mavenCentral()
+        }
     }
 
     javaPlatform {

gradle/scripts/lib/common-info.gradle

@@ -4,8 +4,8 @@ rootProject.ext {
     projectName = project.findProperty('projectName')
     projectUrl = project.findProperty('projectUrl')
     projectDescription = project.findProperty('projectDescription')?: rootProject.name
-    authorName = project.findProperty('authorName')?: 'LINE Corporation'
-    authorEmail = project.findProperty('authorEmail')?: 'dl_oss_dev@linecorp.com'
+    authorName = project.findProperty('authorName')?: 'LY Corporation'
+    authorEmail = project.findProperty('authorEmail')?: 'dl_armeria@linecorp.com'
     authorUrl = project.findProperty('authorUrl')?: 'https://engineering.linecorp.com/en/'
     inceptionYear = project.findProperty('inceptionYear')
     licenseName = project.findProperty('licenseName')
@@ -15,8 +15,8 @@ rootProject.ext {
     scmDeveloperConnection = project.findProperty('scmDeveloperConnection')
     copyrightFooter =
             '© Copyright ' + "${rootProject.ext.inceptionYear}–${LocalDateTime.now().year} " +
-            '<a href="' + rootProject.ext.authorUrl + '">' + rootProject.ext.authorName + '</a>. ' +
-            'All rights reserved.'
+                    '<a href="' + rootProject.ext.authorUrl + '">' + rootProject.ext.authorName + '</a>. ' +
+                    'All rights reserved.'
     googleAnalyticsId = rootProject.findProperty('googleAnalyticsId')
 }
 

gradle/scripts/lib/common-publish.gradle

@@ -62,6 +62,8 @@ if (publishToStaging) {
             }
         }
 
+        clientTimeout.set(Duration.ofMinutes(30))
+
         transitionCheckOptions {
             maxRetries.set(100)
             delayBetween.set(Duration.ofSeconds(20))

gradle/scripts/lib/java-javadoc.gradle

@@ -1,7 +1,6 @@
 import groovy.json.JsonBuilder
 import groovy.json.JsonSlurper
 
-import javax.inject.Inject
 import java.security.MessageDigest
 
 def offlineJavadoc = rootProject.hasProperty('offlineJavadoc')

gradle/scripts/lib/java-rpc-proto.gradle

@@ -2,6 +2,10 @@ import org.gradle.internal.os.OperatingSystem
 
 buildscript {
     repositories {
+        def mavenCentralMirror = providers.gradleProperty('mavenCentralMirror').getOrNull()
+        if (mavenCentralMirror) {
+            maven { url = mavenCentralMirror }
+        }
         gradlePluginPortal()
     }
     dependencies {

gradle/scripts/lib/java-shade.gradle

@@ -5,6 +5,10 @@ import java.util.concurrent.atomic.AtomicInteger
 
 buildscript {
     repositories {
+        def mavenCentralMirror = providers.gradleProperty('mavenCentralMirror').getOrNull()
+        if (mavenCentralMirror) {
+            maven { url = mavenCentralMirror }
+        }
         gradlePluginPortal()
         google()
     }
@@ -14,17 +18,44 @@ buildscript {
     }
 }
 
+def globalShadowExclusions = []
+if (rootProject.hasProperty('shadowExclusions')) {
+    def rawShadowExclusions = rootProject.findProperty("shadowExclusions")
+    if (!(rawShadowExclusions instanceof String)) {
+        throw new RuntimeException("Property 'shadowExclusions' must be a String but was: ${rawShadowExclusions.getClass().name}")
+    }
+    globalShadowExclusions = rawShadowExclusions.split(",")
+}
+subprojects {
+    ext {
+        shadowExclusions = globalShadowExclusions.collect()
+    }
+}
+
 def relocatedProjects = projectsWithFlags('java', 'relocate')
 def numConfiguredRelocatedProjects = new AtomicInteger()
 configure(relocatedProjects) {
+
+    // per-dependency shade configuration
+    // while shade per-project shades all dependencies, shade per-dependency allows for finer control
+    def shadeConfig = project.configurations.create("shade") {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+    project.configurations.api.extendsFrom(shadeConfig)
+
     // Generate the shaded JARs.
     task shadedJar(
             type: ShadowJar,
             group: 'Build',
             description: 'Builds the shaded main JAR.',
             dependsOn: tasks.classes) {
 
-        configureShadowTask(project, delegate, true)
+        def self = this
+        def delegate0 = delegate
+        project.afterEvaluate {
+            self.configureShadowTask(project, delegate0, true)
+        }
         archiveClassifier.set('shaded')
 
         // Exclude the legacy file listing.
@@ -49,14 +80,6 @@ configure(relocatedProjects) {
             return false
         }
 
-        def shadowExclusions = []
-        if (rootProject.hasProperty('shadowExclusions')) {
-            shadowExclusions = rootProject.findProperty('shadowExclusions').split(",")
-        }
-        shadowExclusions.each {
-            exclude it
-        }
-
         // Set the 'Automatic-Module-Name' property in MANIFEST.MF.
         if (project.ext.automaticModuleName != null) {
             doFirst {
@@ -92,7 +115,11 @@ configure(relocatedProjects) {
             description: 'Builds the shaded test JAR.',
             dependsOn: tasks.testClasses) {
 
-        configureShadowTask(project, delegate, false)
+        def self = this
+        def delegate0 = delegate
+        project.afterEvaluate {
+            self.configureShadowTask(project, delegate0, false)
+        }
         archiveBaseName.set("test-${tasks.jar.archiveBaseName.get()}-shaded")
     }
 
@@ -335,9 +362,18 @@ private void configureShadowTask(Project project, ShadowJar task, boolean isMain
             // e.g. WEB-INF/lib/hello.jar
             exclude '**/*.jar'
         }
+        project.ext.shadowExclusions.each {
+            exclude it
+        }
 
         configurations = [project.configurations[isMain ? 'compileClasspath' : 'testCompileClasspath']]
 
+        def shadeConfig = project.configurations.findByName("shade")
+        def shadedDeps = shadeConfig ?
+                shadeConfig.dependencies.collect { "${it.group}:${it.name}" }.toSet() :
+                [] as Set<String>
+
+
         relocations.each { props ->
             task.relocate props['from'], props['to']
         }
@@ -361,8 +397,10 @@ private void configureShadowTask(Project project, ShadowJar task, boolean isMain
                     }
                 }
             } else { // hasFlags('relocate')
-                // Only want to rewrite source references, not bundle dependencies.
-                exclude { true }
+                // Only want to shade if explicitly specified on the dependency
+                exclude {
+                    return !shadedDeps.contains("${it.moduleGroup}:${it.moduleName}")
+                }
             }
         }
     }