update solr to prepare for 9.7 merge

.asf.yaml

@@ -28,6 +28,7 @@ github:
     branch_9_4: {}
     branch_9_5: {}
     branch_9_6: {}
+    branch_9_7: {}
     branch_9x: {}
 
   protected_tags:

.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/renovate.json

@@ -3,8 +3,8 @@
   "description": "Runs Renovate with solrbot, see dev-docs/dependency-upgrades.adoc for more",
   "enabled": true,
   "dependencyDashboard": false,
-  "enabledManagers": ["gradle"],
-  "includePaths": ["versions.*", "build.gradle"],
+  "enabledManagers": ["gradle", "github-actions"],
+  "includePaths": ["versions.*", "build.gradle", ".github/workflows/*"],
   "postUpgradeTasks": {
     "commands": ["./gradlew updateLicenses"],
     "fileFilters": ["solr/licenses/*.sha1"],
@@ -14,7 +14,11 @@
     {
       "description": "Fix for non-semantic versions for older artifacts",
       "matchDatasources": ["maven"],
-      "matchPackageNames": ["commons-collections:commons-collections", "commons-io:commons-io", "commons-lang:commons-lang"],
+      "matchPackageNames": [
+        "commons-collections:commons-collections",
+        "commons-io:commons-io",
+        "commons-lang:commons-lang"
+      ],
       "versioning": "regex:^(?<major>\\d{1,4})\\.(?<minor>\\d+)(\\.(?<patch>\\d+))?$"
     },
     {
@@ -55,29 +59,33 @@
     },
     {
       "description": "Changelog for commons-io",
-      "matchSourceUrls": ["https://gitbox.apache.org/repos/asf?p=commons-io.git"],
-      "customChangelogUrl": "https://commons.apache.org/proper/commons-io/changes-report.html"
+      "matchSourceUrls": [
+        "https://gitbox.apache.org/repos/asf?p=commons-io.git"
+      ],
+      "changelogUrl": "https://commons.apache.org/proper/commons-io/changes-report.html"
     },
     {
       "description": "Changelog for zookeeper",
       "matchSourceUrls": ["https://gitbox.apache.org/repos/asf/zookeeper.git"],
-      "customChangelogUrl": "https://zookeeper.apache.org/releases.html"
+      "changelogUrl": "https://zookeeper.apache.org/releases.html"
     },
     {
       "description": "Changelog for commons-compress",
-      "matchSourceUrls": ["https://gitbox.apache.org/repos/asf?p=commons-compress.git"],
-      "customChangelogUrl": "https://commons.apache.org/proper/commons-compress/changes-report.html"
+      "matchSourceUrls": [
+        "https://gitbox.apache.org/repos/asf?p=commons-compress.git"
+      ],
+      "changelogUrl": "https://commons.apache.org/proper/commons-compress/changes-report.html"
     },
     {
       "description": "Changelog for commons-configuration",
-      "matchSourceUrls": ["https://gitbox.apache.org/repos/asf?p=commons-configuration.git"],
-      "customChangelogUrl": "https://commons.apache.org/proper/commons-configuration/changes-report.html"
+      "matchSourceUrls": [
+        "https://gitbox.apache.org/repos/asf?p=commons-configuration.git"
+      ],
+      "changelogUrl": "https://commons.apache.org/proper/commons-configuration/changes-report.html"
     }
   ],
-  "schedule": [
-    "* * * * 0"
-  ],
-  "prConcurrentLimit": 50,
+  "schedule": ["* * * * *"],
+  "prConcurrentLimit": 100,
   "prHourlyLimit": 10,
-  "stabilityDays": 5
+  "minimumReleaseAge": "5 days"
 }

.github/workflows/bin-solr-test.yml

@@ -4,10 +4,13 @@ on:
   pull_request:
     branches:
       - 'main'
+      - 'branch_*'
     paths:
       - '.github/workflows/bin-solr-test.yml'
       - 'solr/bin/**'
       - 'solr/packaging/**'
+      - 'solr/core/src/java/org/apache/solr/cli/**'
+      - 'solr/prometheus-exporter/**'
 
 jobs:
   test:
@@ -16,20 +19,22 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
     steps:
     # Setup
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         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@v2
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches
@@ -41,8 +46,7 @@ jobs:
       run: ./gradlew integrationTests
     - name: Archive logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: logs
         path: solr/packaging/build/test-output
-

.github/workflows/docker-test.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - 'main'
+      - 'branch_*'
     paths:
       - '.github/workflows/docker-test.yml'
       - 'solr/bin/**'
@@ -20,22 +21,24 @@ 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
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         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
       run: chmod +x gradlew
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches

.github/workflows/gradle-precommit.yml

@@ -3,7 +3,8 @@ name: Gradle Precommit
 on: 
   pull_request:
     branches:
-    - '**'
+      - 'main'
+      - 'branch_*'
 
 jobs:
   test:
@@ -12,23 +13,26 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
     steps:
     # Setup
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         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@v2
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches
@@ -40,4 +44,4 @@ jobs:
     - name: Run gradle check (without tests)
       run: ./gradlew check -x test -Ptask.times=true
 
-    - uses: gradle/wrapper-validation-action@v1
+    - uses: gradle/wrapper-validation-action@v3

.github/workflows/solrj-test.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - 'main'
+      - 'branch_*'
     paths:
       - '.github/workflows/solrj-test.yml'
       - 'solr/solrj/**'
@@ -15,20 +16,22 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
     steps:
     # Setup
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         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@v2
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches

.github/workflows/stale.yml

@@ -29,10 +29,9 @@ jobs:
           stale-pr-label: "stale"       # label to use when marking as stale
 
           stale-pr-message: >
-            This PR had no visible activity in the past 60 days, labeling it as stale.
-            Any new activity will remove the stale label. To attract more reviewers, please tag
-            someone or notify the [email protected] mailing list.
+            This PR has had no activity for 60 days and is now labeled as stale. 
+            Any new activity or converting it to draft will remove the stale label. 
+            To attract more reviewers, please tag people who might be familiar with the code area and/or notify the [email protected] mailing list. 
             Thank you for your contribution!
 
-          # TODO: Increase budget after initial testing
-          operations-per-run: 30        # operations budget
+          operations-per-run: 100       # operations budget

.github/workflows/tests-via-crave.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - 'main'
+      - 'branch_*'
 
 jobs:
   test:

README.md

@@ -18,8 +18,11 @@
 # Welcome to the Apache Solr project!
 -----------------------------------
 
-Solr is the popular, blazing fast open source search platform for all your
-enterprise, e-commerce, and analytics needs, built on [Apache Lucene](https://lucene.apache.org/).
+Solr is the blazing-fast, open source, multi-modal search platform built on [Apache Lucene](https://lucene.apache.org/).
+It powers full-text, vector, and geospatial search at many of the world's largest organizations.
+
+[![Build Status](https://ci-builds.apache.org/job/Solr/job/Solr-Artifacts-main/badge/icon?subject=Solr%20Artifacts)](https://ci-builds.apache.org/job/Solr/job/Solr-Artifacts-main/)
+[![Build Status](https://ci-builds.apache.org/job/Solr/job/Solr-Check-main/badge/icon?subject=Solr%20Check)](https://ci-builds.apache.org/job/Solr/job/Solr-Check-main/)
 
 For a complete description of the Solr project, team composition, source
 code repositories, and other details, please see the Solr web site at

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
@@ -132,6 +132,7 @@ apply from: file('gradle/testing/fail-on-no-tests.gradle')
 apply from: file('gradle/testing/fail-on-unsupported-jdk.gradle')
 apply from: file('gradle/testing/alternative-jdk-support.gradle')
 apply from: file('gradle/java/jar-manifest.gradle')
+apply from: file('gradle/testing/retry-test.gradle')
 
 // Publishing and releasing
 apply from: file('gradle/maven/defaults-maven.gradle')

dev-docs/FAQ.adoc

@@ -26,7 +26,7 @@ You can review instructions for running Solr in Docker in the xref:running-in-do
 === Whats the fastest build lifecycle for frontend work on Solr Admin?
 
 Run `gradle dev`, and then `cd ./packaging/build/dev/`.  Fire up your cluster
-via `bin/solr start -e cloud -noprompt` and then as you make changes to assets in `/solr/webapp/web`,
+via `bin/solr start -e cloud --no-prompt` and then as you make changes to assets in `/solr/webapp/web`,
 run `gradle dev` to redeploy the web assets. Do a  hard refresh in your browser
 to pick up your changes.
 
@@ -97,4 +97,3 @@ If you don't yet have an account, you have to ask for one in the 'users' or 'dev
 * http://fucit.org/solr-jenkins-reports/failure-report.html
 * https://ge.apache.org/scans/tests?search.relativeStartTime=P90D&search.rootProjectNames=solr*
 * https://lists.apache.org[Solr mailing list archives especially builds]
-