Merge branch 'main' into spike-zk-quorum

Author: gerlowskija

.asf.yaml

@@ -27,6 +27,10 @@ github:
     branch_9_3: {}
     branch_9_4: {}
     branch_9_5: {}
+    branch_9_6: {}
+    branch_9_7: {}
+    branch_9_8: {}
+    branch_9_9: {}
     branch_9x: {}
 
   protected_tags:

.editorconfig

@@ -1,5 +1,6 @@
-# Ignore all differences in line endings for the lock file.
+# Ignore all differences in line endings for lock files.
 versions.lock text eol=lf
+**/*.lockfile text eol=lf
 
 # Gradle files are always in LF.
 *.gradle          text eol=lf

.gitattributes

@@ -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/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,40 @@
+# This composite action is included in other workflows to have a shared setup
+# for java, gradle, caches, etc.
+
+name: Prepare build
+description: Creates a shared setup for other workflows
+
+inputs:
+  java-version:
+    required: false
+    default: "21"
+    description: "The default JDK version to set up."
+
+  java-distribution:
+    required: false
+    default: "temurin"
+    description: "The default JDK distribution type"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up Java (${{ inputs.java-distribution }}, ${{ inputs.java-version }})"
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      with:
+        distribution: ${{ inputs.java-distribution }}
+        java-version: ${{ inputs.java-version }}
+        java-package: jdk
+
+    - name: Cache gradle-wrapper.jar
+      uses: actions/cache@v4
+      with:
+        path: gradle/wrapper/gradle-wrapper.jar
+        key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.jar.sha256') }}
+
+    # This includes "smart" caching of gradle dependencies.
+    - name: Set up Gradle
+      uses: gradle/actions/setup-gradle@v4
+      with:
+        # increase expiry time for the temp. develocity token.
+        # https://github.com/gradle/actions/blob/main/docs/setup-gradle.md#increasing-the-expiry-time-for-develocity-access-tokens
+        develocity-token-expiry: 8

.github/actions/prepare-for-build/action.yml

@@ -2,9 +2,11 @@
 dependencies:
   - changed-files:
       - any-glob-to-any-file:
-        - versions.props
-        - versions.lock
-        - solr/licenses/**
+        - "gradle/libs.versions.toml" # Solr 10+
+        - "**/*.lockfile"
+        - "versions.props" # Solr < v10
+        - "versions.lock"
+        - "solr/licenses/**"
 
 # Add 'documentation' label to any changes within ref-guide or dev-docs
 documentation:
@@ -94,6 +96,7 @@ admin-ui:
   - changed-files:
       - any-glob-to-any-file:
           - solr/webapp/**
+          - solr/ui/**
 
 # Add 'prometheus-exporter' label
 prometheus-exporter:
@@ -122,16 +125,6 @@ module:gcs-repository:
       - any-glob-to-any-file:
           - solr/modules/gcs-repository/**
 
-module:hadoop-auth:
-  - changed-files:
-      - any-glob-to-any-file:
-          - solr/modules/hadoop-auth/**
-
-module:hdfs:
-  - changed-files:
-      - any-glob-to-any-file:
-          - solr/modules/hdfs/**
-
 module:jwt-auth:
   - changed-files:
       - any-glob-to-any-file:
@@ -199,9 +192,7 @@ cat:index:
   - changed-files:
       - any-glob-to-any-file:
           - '**/org/apache/solr/index/**'
-          - '**/org/apache/solr/hdfs/index/**'
           - '**/org/apache/solr/update/**'
-          - '**/org/apache/solr/hdfs/update/**'
           - '**/org/apache/solr/scripting/update/**'
           - '**/org/apache/solr/handler/loader/**'
 

.github/labeler.yml

@@ -3,18 +3,27 @@
   "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"],
+  "labels": ["exempt-stale"],
+  "includePaths": ["gradle/libs.versions.toml", "versions.*", "build.gradle", ".github/workflows/*"],
   "postUpgradeTasks": {
-    "commands": ["./gradlew updateLicenses"],
+    "commands": [
+      "./gradlew resolveAndLockAll --write-locks",
+      "./gradlew kotlinUpgradeYarnLock",
+      "./gradlew updateLicenses"
+    ],
     "fileFilters": ["solr/licenses/*.sha1"],
     "executionMode": "branch"
   },
   "packageRules": [
     {
       "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+))?$"
     },
     {
@@ -30,12 +39,12 @@
     {
       "description": "Test-dependencies are checked less often than the shipped deps",
       "matchDepTypes": ["test"],
-      "extends": ["schedule:monthly"]
+      "schedule": ["before 9am on the first day of the month"]
     },
     {
       "description": "Noisy, frequently updated dependencies checked less often",
       "matchPackagePrefixes": ["software.amazon.awssdk", "com.google.cloud"],
-      "extends": ["schedule:monthly"]
+      "schedule": ["before 9am on the first day of the month"]
     },
     {
       "description": "Workaround for https://github.com/renovatebot/renovate/issues/19226",
@@ -44,14 +53,49 @@
     },
     {
       "description": "Lucene dependencies should be skipped",
-      "matchPackageNames": ["org.apache.lucene"],
+      "matchPackagePrefixes": ["org.apache.lucene"],
       "enabled": false
+    },
+    {
+      "description": "Skip major jetty upgrades - must be done manually",
+      "matchPackagePrefixes": ["org.eclipse.jetty"],
+      "matchUpdateTypes": ["major"],
+      "enabled": false
+    },
+    {
+      "description": "Changelog for commons-io",
+      "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"],
+      "changelogUrl": "https://zookeeper.apache.org/releases.html"
+    },
+    {
+      "description": "Changelog for commons-compress",
+      "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"
+      ],
+      "changelogUrl": "https://commons.apache.org/proper/commons-configuration/changes-report.html"
+    },
+    {
+      "description": "Group these UI dependency upgrades together in same PR",
+      "matchPackagePrefixes": ["com.arkivanov", "org.jetbrains.compose"],
+      "groupName": "Admin UI libraries"
     }
   ],
-  "schedule": [
-    "* * * * *"
-  ],
-  "prConcurrentLimit": 50,
-  "prHourlyLimit": 10,
-  "stabilityDays": 5
+  "schedule": ["* * * * *"],
+  "prConcurrentLimit": 300,
+  "prHourlyLimit": 20,
+  "minimumReleaseAge": "5 days"
 }

.github/renovate.json

@@ -3,46 +3,36 @@ name: Solr Script Tests
 on:
   pull_request:
     branches:
-      - 'main'
+      - '*'
     paths:
       - '.github/workflows/bin-solr-test.yml'
       - 'solr/bin/**'
       - 'solr/packaging/**'
+      - 'solr/core/src/java/org/apache/solr/cli/**'
+      - 'solr/prometheus-exporter/**'
 
 jobs:
   test:
     name: Run Solr Script Tests
 
     runs-on: ubuntu-latest
+    timeout-minutes: 40
 
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.SOLR_DEVELOCITY_ACCESS_KEY }}
 
     steps:
-    # Setup
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: 11
-        java-package: jdk
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - uses: actions/cache@v2
-      with:
-        path: |
-          ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-binsolr-${{ hashFiles('versions.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-binsolr-
-          ${{ runner.os }}-gradle-
+    - name: Checkout code
+      uses: actions/checkout@v5
+
+    - uses: ./.github/actions/prepare-for-build
+
     - name: Test the bin/solr script
       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/bin-solr-test.yml

@@ -0,0 +1,27 @@
+name: Dependency Submission
+
+on:
+  push:
+    branches: [ main ]
+
+permissions:
+  contents: write
+
+jobs:
+  dependency-submission:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 21
+          
+      - name: Generate and submit dependency graph
+        uses: gradle/actions/dependency-submission@v4
+        env:
+          DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS: "(?i)(^|:)(compileClasspath|runtimeClasspath|testCompileClasspath|testRuntimeClasspath)$"
+          DEPENDENCY_GRAPH_EXCLUDE_CONFIGURATIONS: "(?i)(^|:)(classpath|.*PluginClasspath|kotlinCompilerClasspath|kaptClasspath|annotationProcessor|detachedConfiguration.*)$"
+          DEPENDENCY_GRAPH_RUNTIME_INCLUDE_CONFIGURATIONS: "(?i)(^|:)runtimeClasspath$"
+          DEPENDENCY_GRAPH_RUNTIME_EXCLUDE_CONFIGURATIONS: "(?i)(^|:)testRuntimeClasspath$"

.github/workflows/dependency-graph-submission.yml

@@ -3,7 +3,7 @@ name: Docker Build & Test
 on:
   pull_request:
     branches:
-      - 'main'
+      - '*'
     paths:
       - '.github/workflows/docker-test.yml'
       - 'solr/bin/**'
@@ -16,34 +16,21 @@ jobs:
     name: Build and test Docker image
 
     runs-on: ubuntu-latest
+    timeout-minutes: 15
 
     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.SOLR_DEVELOCITY_ACCESS_KEY }}
 
     steps:
-    # Setup
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: 11
-        java-package: jdk
-    - name: Install ACL
-      run: sudo apt-get install acl
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - uses: actions/cache@v2
-      with:
-        path: |
-          ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-docker-${{ hashFiles('versions.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-docker-
-          ${{ runner.os }}-gradle-
+    - name: Checkout code
+      uses: actions/checkout@v5
+
+    - uses: ./.github/actions/prepare-for-build
+
     - name: Build Docker image with Gradle
       run: ./gradlew solr:docker:docker
+
     - name: Run tests on Docker image
       run: ./gradlew solr:docker:testDocker