GEM-18846: Update versions

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Broadcom. All rights reserved.
+ * Copyright 2024-2026 Broadcom. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -9,8 +9,29 @@ 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

@@ -1,14 +1,33 @@
 /*
- * Copyright 2024 Broadcom. All rights reserved.
+ * Copyright 2024-2026 Broadcom. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 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/convention-plugins/src/main/kotlin/commercial-repositories.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Broadcom. All rights reserved.
+ * Copyright 2024-2026 Broadcom. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -10,7 +10,6 @@ plugins {
 }
 
 repositories {
-  mavenCentral()
   val repositoryConfigFilePath = providers.gradleProperty("spring.gemfire.repositories").getOrElse(
     providers.environmentVariable("HOME").get() + "/.gradle/gradleRepositories.json"
   )
@@ -31,4 +30,7 @@ repositories {
         }
       }
     }
+  if (providers.gradleProperty("useMavenCentral").getOrElse("false").toBoolean()) {
+    mavenCentral()
+  }
 }

build-tools/gemfire-server-integration-test-plugin/build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Broadcom. All rights reserved.
+ * Copyright 2024-2026 Broadcom. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,8 +8,27 @@ plugins {
 }
 
 repositories {
-  mavenCentral()
-  gradlePluginPortal()
+  def repositoryConfigFilePath = providers.gradleProperty("spring.gemfire.repositories").getOrElse(
+    providers.environmentVariable("HOME").get() + "/.gradle/gradleRepositories.json"
+  )
+
+  def jsonString = new File(repositoryConfigFilePath).getText("UTF-8")
+  def repoConfig = new groovy.json.JsonSlurper().parseText(jsonString)
+  ((List) repoConfig["repositories"]).findAll { it != null }.each { entry ->
+    maven {
+      url = uri(entry["url"] as String)
+      if (entry["username"]?.toString()?.trim()) {
+        credentials {
+          username = entry["username"] as String
+          password = entry["password"] as String
+        }
+      }
+    }
+  }
+
+  if (providers.gradleProperty("useMavenCentral").getOrElse("false").toBoolean()) {
+    mavenCentral()
+  }
 }
 
 dependencies {

build-tools/publishing/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 Broadcom. All rights reserved.
+ * Copyright 2022-2026 Broadcom. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 plugins {
@@ -8,8 +8,29 @@ 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

@@ -1,12 +1,32 @@
 /*
- * Copyright 2022-2024 Broadcom. All rights reserved.
+ * Copyright 2022-2026 Broadcom. All rights reserved.
  * 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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Broadcom. All rights reserved.
+ * Copyright 2023-2026 Broadcom. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -19,7 +19,7 @@ plugins {
 project.ext.set("constrainVersionInBom", true)
 
 val license = """
-  Copyright (c) VMware, Inc. 2023-2024. All rights reserved.
+  Copyright (c) VMware, Inc. 2023-2026. All rights reserved.
   SPDX-License-Identifier: Apache-2.0
   """
 

build.gradle.kts

@@ -1,9 +1,11 @@
 /*
- * Copyright 2023-2024 Broadcom. All rights reserved.
+ * Copyright 2023-2026 Broadcom. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
+import nl.littlerobots.vcu.plugin.resolver.VersionSelectors
+import nl.littlerobots.vcu.plugin.versionSelector
 
 plugins {
   id("java")
@@ -15,6 +17,12 @@ plugins {
   id("gemfire-artifactory")
 }
 
+repositories {
+  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 {
@@ -44,12 +52,11 @@ versionCatalogUpdate {
   }
   keep {
     keepUnusedVersions = true
-    // keep all libraries that aren't used in the project
-    keepUnusedLibraries = true
-    // keep all plugins that aren't used in the project
-    keepUnusedPlugins = true
   }
 
+  versionSelector {
+    isPatch(it.candidate.version, it.currentVersion) // adjust property names to match API if needed
+  }
 }
 
 tasks.withType<DependencyUpdatesTask> {

gradle.properties

@@ -1,16 +1,17 @@
 #
-# Copyright 2022-2024 Broadcom. All rights reserved.
+# Copyright 2022-2026 Broadcom. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 springDataGemFireVersion=2.0.+
 version=2.0.0-build.9999
 gemfireVersion=10.3.+
+baseGemFireVersion=10.3
 
 org.gradle.workers.max=3
 org.gradle.parallel=true
 org.gradle.caching=true
 
-springTestGemfireDockerImage=gemfire/gemfire:blessed-10.3-jdk17
+springTestGemfireDockerImage=gemfire/gemfire:10.3-jdk17
 org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
 
 additionalMavenRepoURLs=

gradle/libs.versions.toml

@@ -1,23 +1,25 @@
 [versions]
-assertjVersion = "3.23.1"
-awaitilityVersion = "4.2.2"
-benManesVersions = "0.50.0"
+assertjVersion = "3.27.7"
+awaitilityVersion = "4.3.0"
+benManesVersions = "0.54.0"
 gemFireTestContainersVersion = "3.0.0"
-jakartaAnnotationApiVersion = "2.1.1"
-jakartaServletApiVersion = "6.0.0"
+gemfireVersion = "10.3.0"
+jakartaAnnotationApiVersion = "3.0.0"
+jakartaServletApiVersion = "6.1.0"
 jsr305Version = "3.0.2"
 junitVersion = "4.13.2"
-littlerobotsVersionCatalogUpdate = "0.8.5"
-logbackVersion = "1.5.12"
-lombokVersion = "8.6"
-mockitoVersion = "5.14.2"
+littlerobotsVersionCatalogUpdate = "1.1.0"
+logbackVersion = "1.5.32"
+lombokVersion = "9.5.0"
+mockitoVersion = "5.23.0"
 multithreadedtcVersion = "1.01"
-nebulaFacetVersion = "11.0.0"
-slf4jVersion = "2.0.16"
-springSecurityVersion = "7.0.0"
-springSessionVersion = "4.0.0"
+nebulaFacetVersion = "13.1.2"
+slf4jVersion = "2.0.18"
+springDataGemFireVersion = "2.0.0"
+springSecurityVersion = "7.0.5"
+springSessionVersion = "4.0.3"
 springShellVersion = "1.2.0.RELEASE"
-springVersion = "7.0.1"
+springVersion = "7.0.7"
 
 [libraries]
 assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertjVersion" }
@@ -40,7 +42,7 @@ log4j-over-slf4j = { module = "org.slf4j:log4j-over-slf4j", version.ref = "slf4j
 logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logbackVersion" }
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoVersion" }
 multithreadedtc = { module = "edu.umd.cs.mtc:multithreadedtc", version.ref = "multithreadedtcVersion" }
-spring-data-gemfire = { module = "com.vmware.gemfire:spring-data-4.0-gemfire-10.3", version.ref ="springDataGemFireVersion" }
+spring-data-gemfire = { module = "com.vmware.gemfire:spring-data-4.0-gemfire-10.3", version.ref = "springDataGemFireVersion" }
 spring-data-gemfire-test-framework = { module = "com.vmware.gemfire:spring-data-4.0-gemfire-test-framework-10.3", version.ref = "springDataGemFireVersion" }
 spring-framework-bom = { module = "org.springframework:spring-framework-bom", version.ref = "springVersion" }
 spring-security-bom = { module = "org.springframework.security:spring-security-bom", version.ref = "springSecurityVersion" }

gradle/publish.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlinGradlePluginVersion = "2.2.20"
+kotlinGradlePluginVersion = "2.3.21"
 
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,10 +1,10 @@
 #
-# Copyright 2024 Broadcom. All rights reserved.
+# Copyright 2024-2026 Broadcom. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists