GEM-18833: Update versions

.gitignore

@@ -121,3 +121,4 @@ generated-pipeline.yml
 *.crf
 *.dat
 /build-tools/convention-plugins/.gradle
+*.salive

build-tools/convention-plugins/build.gradle.kts

@@ -9,8 +9,30 @@ plugins {
 }
 
 repositories {
-  mavenCentral()
-  gradlePluginPortal()
+  val repositoryConfigFilePath = providers.gradleProperty("spring.gemfire.repositories").getOrElse(
+    providers.environmentVariable("HOME").get() + "/.gradle/gradleRepositories.json"
+  )
+
+  val jsonString = File(repositoryConfigFilePath).readText(Charsets.UTF_8)
+  val repositories = groovy.json.JsonSlurper().parseText(jsonString) as Map<*, *>
+  (repositories["repositories"] as List<*>).filterNotNull().map { entry -> entry as Map<*, *> }
+    .forEach { entry ->
+      entry.apply {
+        maven {
+          url = uri(entry["url"]!! as String)
+          if (!entry["username"]?.toString().isNullOrBlank()) {
+            credentials {
+              username = entry["username"] as String
+              password = entry["password"] as String
+            }
+          }
+        }
+      }
+    }
+
+  if (providers.gradleProperty("useMavenCentral").getOrElse("false").toBoolean()) {
+    mavenCentral()
+  }
 }
 
 dependencies {

build-tools/convention-plugins/settings.gradle.kts

@@ -4,11 +4,31 @@
  */
 
 pluginManagement {
-  repositories.mavenCentral()
-  repositories.gradlePluginPortal()
-  repositories.google()
-  repositories.maven {
-    url = uri("https://repo.spring.io/plugins-release")
+  repositories {
+    val repositoryConfigFilePath = providers.gradleProperty("spring.gemfire.repositories").getOrElse(
+      providers.environmentVariable("HOME").get() + "/.gradle/gradleRepositories.json"
+    )
+
+    val jsonString = File(repositoryConfigFilePath).readText(Charsets.UTF_8)
+    val repositories = groovy.json.JsonSlurper().parseText(jsonString) as Map<*, *>
+    (repositories["repositories"] as List<*>).filterNotNull().map { entry -> entry as Map<*, *> }
+      .forEach { entry ->
+        entry.apply {
+          maven {
+            url = uri(entry["url"]!! as String)
+            if (!entry["username"]?.toString().isNullOrBlank()) {
+              credentials {
+                username = entry["username"] as String
+                password = entry["password"] as String
+              }
+            }
+          }
+        }
+      }
+
+    if (providers.gradleProperty("useMavenCentral").getOrElse("false").toBoolean()) {
+      gradlePluginPortal()
+    }
   }
 }
 

build-tools/publishing/build.gradle.kts

@@ -8,8 +8,30 @@ plugins {
 }
 
 repositories {
-  mavenCentral()
-  gradlePluginPortal()
+  val repositoryConfigFilePath = providers.gradleProperty("spring.gemfire.repositories").getOrElse(
+    providers.environmentVariable("HOME").get() + "/.gradle/gradleRepositories.json"
+  )
+
+  val jsonString = File(repositoryConfigFilePath).readText(Charsets.UTF_8)
+  val repositories = groovy.json.JsonSlurper().parseText(jsonString) as Map<*, *>
+  (repositories["repositories"] as List<*>).filterNotNull().map { entry -> entry as Map<*, *> }
+    .forEach { entry ->
+      entry.apply {
+        maven {
+          url = uri(entry["url"]!! as String)
+          if (!entry["username"]?.toString().isNullOrBlank()) {
+            credentials {
+              username = entry["username"] as String
+              password = entry["password"] as String
+            }
+          }
+        }
+      }
+    }
+
+  if (providers.gradleProperty("useMavenCentral").getOrElse("false").toBoolean()) {
+    mavenCentral()
+  }
 }
 
 dependencies {

build-tools/publishing/settings.gradle.kts

@@ -3,10 +3,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 pluginManagement {
-  repositories.gradlePluginPortal()
-  repositories.google()
-  repositories.maven {
-    url = uri("https://repo.spring.io/plugins-release")
+  repositories {
+    val repositoryConfigFilePath = providers.gradleProperty("spring.gemfire.repositories").getOrElse(
+      providers.environmentVariable("HOME").get() + "/.gradle/gradleRepositories.json"
+    )
+
+    val jsonString = File(repositoryConfigFilePath).readText(Charsets.UTF_8)
+    val repositories = groovy.json.JsonSlurper().parseText(jsonString) as Map<*, *>
+    (repositories["repositories"] as List<*>).filterNotNull().map { entry -> entry as Map<*, *> }
+      .forEach { entry ->
+        entry.apply {
+          maven {
+            url = uri(entry["url"]!! as String)
+            if (!entry["username"]?.toString().isNullOrBlank()) {
+              credentials {
+                username = entry["username"] as String
+                password = entry["password"] as String
+              }
+            }
+          }
+        }
+      }
+
+    if (providers.gradleProperty("useMavenCentral").getOrElse("false").toBoolean()) {
+      gradlePluginPortal()
+    }
   }
 }
 

build-tools/publishing/src/main/kotlin/gemfire-repo-artifact-publishing.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 project.ext.set("constrainVersionInBom", true)
 
 val license = """
-  Copyright 2023-2024 Broadcom. All rights reserved.
+  Copyright 2023-2026 Broadcom. All rights reserved.
   SPDX-License-Identifier: Apache-2.0
   """
 

build.gradle.kts

@@ -8,7 +8,30 @@ import nl.littlerobots.vcu.plugin.versionSelector
 
 buildscript {
   repositories {
-    mavenCentral()
+    val repositoryConfigFilePath = providers.gradleProperty("spring.gemfire.repositories").getOrElse(
+      providers.environmentVariable("HOME").get() + "/.gradle/gradleRepositories.json"
+    )
+
+    val jsonString = File(repositoryConfigFilePath).readText(Charsets.UTF_8)
+    val repositories = groovy.json.JsonSlurper().parseText(jsonString) as Map<*, *>
+    (repositories["repositories"] as List<*>).filterNotNull().map { entry -> entry as Map<*, *> }
+      .forEach { entry ->
+        entry.apply {
+          maven {
+            url = uri(entry["url"]!! as String)
+            if (!entry["username"]?.toString().isNullOrBlank()) {
+              credentials {
+                username = entry["username"] as String
+                password = entry["password"] as String
+              }
+            }
+          }
+        }
+      }
+
+    if (providers.gradleProperty("useMavenCentral").getOrElse("false").toBoolean()) {
+      mavenCentral()
+    }
   }
 }
 
@@ -20,6 +43,36 @@ plugins {
   id("gemfire-artifactory")
 }
 
+allprojects {
+  repositories {
+    val repositoryConfigFilePath = providers.gradleProperty("spring.gemfire.repositories").getOrElse(
+      providers.environmentVariable("HOME").get() + "/.gradle/gradleRepositories.json"
+    )
+
+    val jsonString = File(repositoryConfigFilePath).readText(Charsets.UTF_8)
+    val repositories = groovy.json.JsonSlurper().parseText(jsonString) as Map<*, *>
+    (repositories["repositories"] as List<*>).filterNotNull().map { entry -> entry as Map<*, *> }
+      .forEach { entry ->
+        entry.apply {
+          maven {
+            url = uri(entry["url"]!! as String)
+            if (!entry["username"]?.toString().isNullOrBlank()) {
+              credentials {
+                username = entry["username"] as String
+                password = entry["password"] as String
+              }
+            }
+          }
+        }
+      }
+
+    if (providers.gradleProperty("useMavenCentral").getOrElse("false").toBoolean()) {
+      mavenCentral()
+    }
+  }
+}
+
+
 // Suppress warning from gemfire-artifactory plugin. We need the module to be on this project in order to get buildInfo
 // uploaded, but there is no artifact on the root project, so we skip that part.
 tasks.artifactoryPublish {

gradle.properties

@@ -10,8 +10,10 @@ description = 'Spring Data for VMware GemFire'
 
 minimumGradleVersion = 9.4
 gemfireVersion= [10.2,10.3)
-spring-framework.version=[7.0,7.1)
-spring-data-bom.version=[2025.1,2025.2)
+baseGemFireVersion=10.2
+baseSpringVersion=4.0
+spring-framework.version=7.0.7
+spring-data-bom.version=2025.1.5
 
 org.gradle.parallel=true
 org.gradle.workers.max=3

gradle/libs.versions.toml

@@ -1,22 +1,22 @@
 [versions]
 annotationApiVersion = "2.1.1"
-antlrVersion = "2.7.6"
-aspectJVersion = "1.9.22.1"
+antlrVersion = "2.7.7"
+aspectJVersion = "1.9.25"
 assertJVersion = "3.26.3"
 awaitilityVersion = "4.2.2"
 cacheApiVersion = "1.1.1"
 cdiApiVersion = "4.0.1"
 derbyVersion = "10.9.1.0"
 gemFireTestContainersVersion = "3.0.0"
-gemfireVersion = "10.2.3"
+gemfireVersion = "10.2.4"
 googleCloudStorageVersion = "2.45.0"
 interceptorApiVersion = "1.2.2"
 jUnitJupiterVersion = "5.11.4"
 jUnitVersion = "4.13.2"
 jacksonVersion = "2.18.7"
 log4JVersion = "2.24.3"
 logbackVersion = "1.5.32"
-lombokPluginVersion = "8.11"
+lombokPluginVersion = "8.14"
 lombokVersion = "1.18.46"
 mockitoVersion = "5.14.2"
 multithreadedTCVersion = "1.01"
@@ -26,7 +26,7 @@ springBootVersion = "4.0.6"
 springShellVersion = "1.2.0.RELEASE"
 springShiroVersion = "2.0.6"
 versionCatalogUpdateVersion = "1.1.0"
-versionsVersion = "0.53.0"
+versionsVersion = "0.54.0"
 
 [libraries]
 annotation-api = { module = "jakarta.annotation:jakarta.annotation-api", version.ref = "annotationApiVersion" }

settings.gradle.kts

@@ -10,8 +10,30 @@ pluginManagement {
   includeBuild("build-tools/publishing")
   includeBuild("build-tools/convention-plugins")
   repositories {
-    maven { url = uri("https://repo.spring.io/milestone") }
-    gradlePluginPortal()
+    val repositoryConfigFilePath = providers.gradleProperty("spring.gemfire.repositories").getOrElse(
+      providers.environmentVariable("HOME").get() + "/.gradle/gradleRepositories.json"
+    )
+
+    val jsonString = File(repositoryConfigFilePath).readText(Charsets.UTF_8)
+    val repositories = groovy.json.JsonSlurper().parseText(jsonString) as Map<*, *>
+    (repositories["repositories"] as List<*>).filterNotNull().map { entry -> entry as Map<*, *> }
+      .forEach { entry ->
+        entry.apply {
+          maven {
+            url = uri(entry["url"]!! as String)
+            if (!entry["username"]?.toString().isNullOrBlank()) {
+              credentials {
+                username = entry["username"] as String
+                password = entry["password"] as String
+              }
+            }
+          }
+        }
+      }
+
+    if (providers.gradleProperty("useMavenCentral").getOrElse("false").toBoolean()) {
+      gradlePluginPortal()
+    }
   }
 }
 

spring-data-vmware-gemfire/build.gradle.kts

@@ -14,7 +14,30 @@ import java.io.FileInputStream
 
 buildscript {
   repositories {
-    mavenCentral()
+    val repositoryConfigFilePath = providers.gradleProperty("spring.gemfire.repositories").getOrElse(
+      providers.environmentVariable("HOME").get() + "/.gradle/gradleRepositories.json"
+    )
+
+    val jsonString = File(repositoryConfigFilePath).readText(Charsets.UTF_8)
+    val repositories = groovy.json.JsonSlurper().parseText(jsonString) as Map<*, *>
+    (repositories["repositories"] as List<*>).filterNotNull().map { entry -> entry as Map<*, *> }
+      .forEach { entry ->
+        entry.apply {
+          maven {
+            url = uri(entry["url"]!! as String)
+            if (!entry["username"]?.toString().isNullOrBlank()) {
+              credentials {
+                username = entry["username"] as String
+                password = entry["password"] as String
+              }
+            }
+          }
+        }
+      }
+
+    if (providers.gradleProperty("useMavenCentral").getOrElse("false").toBoolean()) {
+      mavenCentral()
+    }
   }
   dependencies {
     classpath(libs.google.cloud.storage)
@@ -64,8 +87,11 @@ tasks.withType<JavaCompile>().configureEach {
   options.compilerArgs.add("-parameters")
 }
 
+val baseGemFireVersion: String by project
+val baseSpringVersion: String by project
+
 publishingDetails {
-  artifactName.set("spring-data-4.0-gemfire-${getGemFireBaseVersion()}")
+  artifactName.set("spring-data-${baseSpringVersion}-gemfire-${baseGemFireVersion}")
   longName.set("Spring Data VMware GemFire")
   description.set("Spring Data For VMware GemFire")
   test.set(false)
@@ -195,17 +221,6 @@ gradle.taskGraph.whenReady {
   }
 }
 
-fun getGemFireBaseVersion(): String {
-  val gemfireVersion = System.getProperty("gemfireVersion")
-
-  logger.info("gemFireVersion provided |$gemfireVersion|")
-  val split = gemfireVersion.split(".")
-  if (split.size < 2) {
-    throw RuntimeException("gemfireVersion is malformed")
-  }
-  return "${split[0]}.${split[1]}"
-}
-
 tasks.register("copyJavadocsToBucket") {
   dependsOn(tasks.named("javadocJar"))
   doLast {