(solr) branch main updated: Build: Migrate from Gradle Enterprise Gradle Plugin to Develocity Gradle Plugin (#2642)

[dsmiley]

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new ed36fdb9bac Build: Migrate from Gradle Enterprise Gradle Plugin to 
Develocity Gradle Plugin (#2642)
ed36fdb9bac is described below

commit ed36fdb9bac7039d9fca326e42057bffbb3ca135
Author: Clay Johnson <cjohn...@gradle.com>
AuthorDate: Mon Aug 26 08:16:43 2024 -0500

    Build: Migrate from Gradle Enterprise Gradle Plugin to Develocity Gradle 
Plugin (#2642)
---
 .github/workflows/bin-solr-test.yml     |  4 +++-
 .github/workflows/docker-test.yml       |  4 +++-
 .github/workflows/gradle-precommit.yml  |  5 ++++-
 .github/workflows/solrj-test.yml        |  4 +++-
 gradle/{ge.gradle => develocity.gradle} | 10 +++++-----
 settings.gradle                         |  6 +++---
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/bin-solr-test.yml 
b/.github/workflows/bin-solr-test.yml
index 0754fcd46bd..a0a33ccc51a 100644
--- a/.github/workflows/bin-solr-test.yml
+++ b/.github/workflows/bin-solr-test.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
     steps:
     # Setup
@@ -30,6 +30,8 @@ jobs:
         distribution: 'temurin'
         java-version: 11
         java-package: jdk
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - uses: actions/cache@v4
diff --git a/.github/workflows/docker-test.yml 
b/.github/workflows/docker-test.yml
index 2cf2655b97a..0b00a6ab308 100644
--- a/.github/workflows/docker-test.yml
+++ b/.github/workflows/docker-test.yml
@@ -21,7 +21,7 @@ jobs:
     env:
       SOLR_DOCKER_IMAGE_REPO: github-pr/solr
       SOLR_DOCKER_IMAGE_TAG: ${{github.event.number}}
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
     steps:
     # Setup
@@ -32,6 +32,8 @@ jobs:
         distribution: 'temurin'
         java-version: 11
         java-package: jdk
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
     - name: Install ACL
       run: sudo apt-get install acl
     - name: Grant execute permission for gradlew
diff --git a/.github/workflows/gradle-precommit.yml 
b/.github/workflows/gradle-precommit.yml
index 12a00fce4b4..dcc55ead323 100644
--- a/.github/workflows/gradle-precommit.yml
+++ b/.github/workflows/gradle-precommit.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
     steps:
     # Setup
@@ -26,6 +26,9 @@ jobs:
         java-version: 11
         java-package: jdk
 
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
diff --git a/.github/workflows/solrj-test.yml b/.github/workflows/solrj-test.yml
index 4d615599db7..1a0f6bfebde 100644
--- a/.github/workflows/solrj-test.yml
+++ b/.github/workflows/solrj-test.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
     steps:
     # Setup
@@ -27,6 +27,8 @@ jobs:
         distribution: 'temurin'
         java-version: 11
         java-package: jdk
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - uses: actions/cache@v4
diff --git a/gradle/ge.gradle b/gradle/develocity.gradle
similarity index 92%
rename from gradle/ge.gradle
rename to gradle/develocity.gradle
index a37660edde6..09aabbf3a0e 100644
--- a/gradle/ge.gradle
+++ b/gradle/develocity.gradle
@@ -20,14 +20,14 @@ def isCIBuild = System.getenv().keySet().any { it ==~ 
/(?i)((JENKINS|HUDSON)(_\w
 
 // https://docs.gradle.com/enterprise/gradle-plugin/
 
-gradleEnterprise {
+develocity {
     server = "https://ge.apache.org";
+    projectId = "solr"
 
     buildScan {
-        capture { taskInputFiles = true }
         uploadInBackground = !isCIBuild
-        publishAlways()
-        publishIfAuthenticated()
+
+        publishing.onlyIf { it.authenticated }
         obfuscation {
             ipAddresses { addresses -> addresses.collect { address -> 
"0.0.0.0"} }
         }
@@ -58,7 +58,7 @@ buildCache {
         enabled = !isCIBuild
     }
 
-    remote(gradleEnterprise.buildCache) {
+    remote(develocity.buildCache) {
         enabled = false
     }
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 69fc206de75..c4812ea0478 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,11 +23,11 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gradle.enterprise' version '3.15.1'
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12'
+    id 'com.gradle.develocity' version '3.17.6'
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
 }
 
-apply from: file('gradle/ge.gradle')
+apply from: file('gradle/develocity.gradle')
 
 rootProject.name = "solr-root"