Merge branch 'apache:main' into feature/SOLR-17334

.github/PULL_REQUEST_TEMPLATE.md

@@ -37,7 +37,7 @@ Please review the following and check all that apply:
 
 - [ ] I have reviewed the guidelines for [How to Contribute](https://github.com/apache/solr/blob/main/CONTRIBUTING.md) and my code conforms to the standards described there to the best of my ability.
 - [ ] I have created a Jira issue and added the issue ID to my pull request title.
-- [ ] I have given Solr maintainers [access](https://help.github.com/en/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork) to contribute to my PR branch. (optional but recommended)
+- [ ] I have given Solr maintainers [access](https://help.github.com/en/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork) to contribute to my PR branch. (optional but recommended, not available for branches on forks living under an organisation)
 - [ ] I have developed this patch against the `main` branch.
 - [ ] I have run `./gradlew check`.
 - [ ] I have added tests for my changes.

.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

.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

.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
 

.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

build.gradle

@@ -22,7 +22,7 @@ plugins {
   id 'base'
   id 'com.palantir.consistent-versions' version '2.16.0'
   id 'org.owasp.dependencycheck' version '9.0.8'
-  id 'ca.cutterslade.analyze' version '1.9.1'
+  id 'ca.cutterslade.analyze' version '1.10.0'
   id 'de.thetaphi.forbiddenapis' version '3.7' apply false
   id 'de.undercouch.download' version '5.5.0' apply false
   id 'net.ltgt.errorprone' version '3.1.0' apply false

gradle/ge.gradle → 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
     }
 }

gradle/documentation/render-javadoc.gradle

@@ -370,7 +370,7 @@ class RenderJavadocTask extends DefaultTask {
       opts << [ '-linkoffline', url, dir ]
     }
 
-    opts << [ '--release', 11 ]
+    opts << [ '--release', project.minJavaVersion.toString() ]
     opts << '-Xdoclint:all,-missing'
 
     // Increase Javadoc's heap.

gradle/validation/forbidden-apis/defaults.all.txt

@@ -85,4 +85,7 @@ java.util.logging.**
 java.util.Collections#sort(java.util.List, java.util.Comparator)
 
 @defaultMessage Use URI.toURL() to construct an instance of URL.
-java.net.URL#<init>(**)
+java.net.URL#<init>(**)
+
+@defaultMessage Use Locale.Builder instead.
+java.util.Locale#<init>(**)

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"
 

solr/CHANGES.txt

@@ -69,6 +69,8 @@ Deprecation Removals
 
 * SOLR-17313: Remove deprecated class SolrLogPostTool.  PostLogsTool and the bin/solr post command has replaced this. (Eric Pugh)
 
+* SOLR-17400: Remove deprecated script snapshotcli.sh.  bin/solr snapshot-* commands have replaced this. (Eric Pugh)
+
 Dependency Upgrades
 ---------------------
 (No changes)
@@ -108,6 +110,7 @@ New Features
 Improvements
 ---------------------
 * SOLR-17397: SkipExistingDocumentsProcessor now functions correctly with child documents.  (Tim Owens via Eric Pugh)
+* SOLR-17180: Deprecate snapshotscli.sh in favour of bin/solr snapshot sub commands.  Now able to manage Snapshots from the CLI.  HDFS module specific snapshot script now ships as part of that module in the modules/hdfs/bin directory. (Eric Pugh)  
 
 Optimizations
 ---------------------
@@ -123,17 +126,24 @@ Optimizations
 
 * SOLR-17396: Reduce thread contention in ZkStateReader.getCollectionProperties(). (Aparna Suresh, David Smiley, Paul McArthur)
 
+* SOLR-17408: COLSTATUS command was fetching details remotely from replicas when this information
+  wasn't asked for. (Mathieu Marie)
+
+* SOLR-3913: Optimize PostTool to call just optimize when both commit and optimize requested. (Eric Pugh)
+
 Bug Fixes
 ---------------------
-(No changes)
+* SOLR-12429: Uploading a configset with a symbolic link produces a IOException. Now a error message to user generated instead. (Eric Pugh)
 
 Dependency Upgrades
 ---------------------
 (No changes)
 
 Other Changes
 ---------------------
-(No changes)
+* SOLR-17359: Move Zk Arg parsing into Java Code from bin/solr scripts.   (Eric Pugh, Rahul Goswami)
+
+* SOLR-17399: Replace the use of the deprecated java.util.Locale constructor with Locale Builder API. (Sanjay Dutt)
 
 ==================  9.7.0 ==================
 New Features
@@ -265,6 +275,8 @@ Bug Fixes
   Shard splits and concurrent/large collection backup/restore performance was serial.  UpdateLog
   replay was a little suboptimal in thread usage too.  (Pierre Salagnac, Hakan Özler, David Smiley)
 
+* SOLR-17417: Remove unnecessary code in PKIAuthPlugin and HttpSolrCall  (Houston Putman, janhoy, Liu Huajin)
+
 Dependency Upgrades
 ---------------------
 (No changes)