Only use fallback mirror when it is set.

Author: shunping

buildSrc/build.gradle.kts

@@ -17,6 +17,7 @@
  */
 import java.net.HttpURLConnection
 import java.net.URL
+import java.util.Properties
 
 fun checkMavenCentralAccessibility(testUrl: String): Boolean {
   val accessible = try {
@@ -30,19 +31,26 @@ fun checkMavenCentralAccessibility(testUrl: String): Boolean {
   } catch (e: Exception) {
     false
   }
+  return accessible
+}
 
-  if (accessible) {
-    logger.lifecycle("Maven Central is accessible. Using default repositories for buildSrc.")
-  } else {
-    logger.lifecycle("Maven Central is not accessible. Falling back to Google Maven Mirror for buildSrc.")
+val parentProperties = Properties().apply {
+  val file = file("../gradle.properties")
+  if (file.exists()) {
+    file.inputStream().use { load(it) }
   }
-  return accessible
 }
 
-val mavenCentralTestUrl = providers.gradleProperty("mavenCentralTestUrl").getOrElse("https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.pom")
-val mavenCentralMirrorUrl = providers.gradleProperty("mavenCentralMirrorUrl").getOrElse("https://maven-central.storage-download.googleapis.com/maven2/")
+val mavenCentralTestUrl = parentProperties.getProperty("mavenCentralTestUrl")
+val mavenCentralMirrorUrl = parentProperties.getProperty("mavenCentralMirrorUrl")
 
-val isMavenAccessible = checkMavenCentralAccessibility(mavenCentralTestUrl)
+val isMavenAccessible = if (!mavenCentralTestUrl.isNullOrBlank()) {
+  checkMavenCentralAccessibility(mavenCentralTestUrl)
+} else {
+  true
+}
+
+val useFallbackMirror = !isMavenAccessible && !mavenCentralMirrorUrl.isNullOrBlank()
 
 // Plugins for configuring _this build_ of the module
 plugins {
@@ -53,8 +61,16 @@ plugins {
 
 // Define the set of repositories required to fetch and enable plugins.
 repositories {
-  if (!isMavenAccessible) {
-    maven { url = uri(mavenCentralMirrorUrl) }
+  if (isMavenAccessible) {
+    logger.lifecycle("Maven Central is accessible. Using default repositories for buildSrc.")
+  } else if (useFallbackMirror) {
+    logger.lifecycle("Maven Central is not accessible. Falling back to Google Maven Mirror for buildSrc.")
+  } else {
+    logger.lifecycle("Maven Central is not accessible and no mirror is configured. Using default repositories for buildSrc.")
+  }
+
+  if (useFallbackMirror) {
+    maven { url = uri(mavenCentralMirrorUrl!!) }
   }
   maven { url = uri("https://plugins.gradle.org/m2/") }
   maven {

buildSrc/src/main/groovy/org/apache/beam/gradle/Repositories.groovy

@@ -30,7 +30,11 @@ class Repositories {
     if (isMavenAccessible != null) {
       return isMavenAccessible
     }
-    def testUrl = project.findProperty("mavenCentralTestUrl") ?: "https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.pom"
+    def testUrl = project.findProperty("mavenCentralTestUrl")
+    if (!testUrl) {
+      isMavenAccessible = true
+      return isMavenAccessible
+    }
     try {
       def url = new URL(testUrl)
       def connection = (HttpURLConnection) url.openConnection()
@@ -44,16 +48,22 @@ class Repositories {
       isMavenAccessible = false
     }
 
+    def mirrorUrl = project.findProperty("mavenCentralMirrorUrl")
+    def useFallback = !isMavenAccessible && mirrorUrl
+
     if (isMavenAccessible) {
       println "Maven Central is accessible. Using default repositories."
-    } else {
+    } else if (useFallback) {
       println "Maven Central is not accessible. Redirecting to Google Maven Mirror."
+    } else {
+      println "Maven Central is not accessible and no mirror is configured. Using default repositories."
     }
     return isMavenAccessible
   }
 
   static void register(Project project) {
-    def mirrorUrl = project.findProperty("mavenCentralMirrorUrl") ?: "https://maven-central.storage-download.googleapis.com/maven2/"
+    def mirrorUrl = project.findProperty("mavenCentralMirrorUrl")
+    def useFallback = !checkMavenCentral(project) && mirrorUrl
 
     project.repositories {
       maven { url project.offlineRepositoryRoot }
@@ -67,7 +77,7 @@ class Repositories {
         return
       }
 
-      if (checkMavenCentral(project)) {
+      if (!useFallback) {
         mavenCentral()
       } else {
         maven { url mirrorUrl }
@@ -103,7 +113,7 @@ class Repositories {
     project.offlineDependencies {
       repositories {
         mavenLocal()
-        if (checkMavenCentral(project)) {
+        if (!useFallback) {
           mavenCentral()
         } else {
           maven { url mirrorUrl }

settings.gradle.kts

@@ -18,30 +18,38 @@
 import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
 
 pluginManagement {
-    val mavenCentralTestUrl = settings.providers.gradleProperty("mavenCentralTestUrl").getOrElse("https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.pom")
-    val mavenCentralMirrorUrl = settings.providers.gradleProperty("mavenCentralMirrorUrl").getOrElse("https://maven-central.storage-download.googleapis.com/maven2/")
+    val mavenCentralTestUrl = settings.providers.gradleProperty("mavenCentralTestUrl").orNull
+    val mavenCentralMirrorUrl = settings.providers.gradleProperty("mavenCentralMirrorUrl").orNull
 
-    val isMavenAccessible = try {
-        val connection = java.net.URL(mavenCentralTestUrl).openConnection() as java.net.HttpURLConnection
-        connection.requestMethod = "GET"
-        connection.setRequestProperty("User-Agent", "Gradle")
-        connection.connectTimeout = 2000
-        connection.readTimeout = 2000
-        connection.useCaches = false
-        connection.responseCode == 200
-    } catch (e: Exception) {
-        false
+    val isMavenAccessible = if (!mavenCentralTestUrl.isNullOrBlank()) {
+        try {
+            val connection = java.net.URL(mavenCentralTestUrl).openConnection() as java.net.HttpURLConnection
+            connection.requestMethod = "GET"
+            connection.setRequestProperty("User-Agent", "Gradle")
+            connection.connectTimeout = 2000
+            connection.readTimeout = 2000
+            connection.useCaches = false
+            connection.responseCode == 200
+        } catch (e: Exception) {
+            false
+        }
+    } else {
+        true
     }
 
+    val useFallbackMirror = !isMavenAccessible && !mavenCentralMirrorUrl.isNullOrBlank()
+
     if (isMavenAccessible) {
         logger.lifecycle("Maven Central is accessible. Using default repositories for settings plugins.")
-    } else {
+    } else if (useFallbackMirror) {
         logger.lifecycle("Maven Central is not accessible. Falling back to Google Maven Mirror for settings plugins.")
+    } else {
+        logger.lifecycle("Maven Central is not accessible and no mirror is configured. Using default repositories for settings plugins.")
     }
 
     repositories {
-        if (!isMavenAccessible) {
-            maven { url = uri(mavenCentralMirrorUrl) }
+        if (useFallbackMirror) {
+            maven { url = uri(mavenCentralMirrorUrl!!) }
         }
         gradlePluginPortal()
     }