You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ds...@apache.org on 2024/08/27 01:40:22 UTC
(solr) branch branch_9x updated (a57bbfcf7d4 -> 52962956459)
This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a change to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
from a57bbfcf7d4 SOLR-17417: Remove unecessary code in PKIAuthPlugin and HttpSolrCall
new 534d5985b83 Build: Migrate from Gradle Enterprise Gradle Plugin to Develocity Gradle Plugin (#2642)
new 52962956459 HttpShardHandler: Fix extension hook (#2661)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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 +++---
.../org/apache/solr/handler/component/HttpShardHandler.java | 4 ++--
7 files changed, 23 insertions(+), 14 deletions(-)
rename gradle/{ge.gradle => develocity.gradle} (92%)
(solr) 02/02: HttpShardHandler: Fix extension hook (#2661)
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 529629564591e8fac899976eb94e7a401a8fa17a
Author: David Smiley <ds...@apache.org>
AuthorDate: Mon Aug 26 11:15:35 2024 -0400
HttpShardHandler: Fix extension hook (#2661)
HttpShardHandler.transformResponse is an extension hook for subclasses to transform the shard response. Ever since 9.0 when the HTTP2 Async stuff landed, this hook became inoperable/dormant (method existed but hasn't been called anymore). This brings it back.
Co-authored-by: Gilles Bellaton <gb...@salesforce.com>
(cherry picked from commit 391cdd04277b83a010f1d33288f9bc344a7ba2d0)
---
.../src/java/org/apache/solr/handler/component/HttpShardHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
index a4513df1546..5074d7b36e8 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
@@ -167,7 +167,7 @@ public class HttpShardHandler extends ShardHandler {
srsp.setShardAddress(rsp.getServer());
ssr.elapsedTime =
TimeUnit.MILLISECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS);
- responses.add(srsp);
+ responses.add(transfomResponse(sreq, srsp, shard));
} else if (throwable != null) {
ssr.elapsedTime =
TimeUnit.MILLISECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS);
@@ -175,7 +175,7 @@ public class HttpShardHandler extends ShardHandler {
if (throwable instanceof SolrException) {
srsp.setResponseCode(((SolrException) throwable).code());
}
- responses.add(srsp);
+ responses.add(transfomResponse(sreq, srsp, shard));
}
});
(solr) 01/02: Build: Migrate from Gradle Enterprise Gradle Plugin to Develocity Gradle Plugin (#2642)
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 534d5985b8353b32f752fc5692810d2c266cdb57
Author: Clay Johnson <cj...@gradle.com>
AuthorDate: Mon Aug 26 08:16:43 2024 -0500
Build: Migrate from Gradle Enterprise Gradle Plugin to Develocity Gradle Plugin (#2642)
(cherry picked from commit ed36fdb9bac7039d9fca326e42057bffbb3ca135)
---
.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 1e3c7d627e5..3f0628486f0 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@v2
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
index 0eafc09046c..b89986b2c3b 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 309205d58f0..36ec87f78e9 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 16710282b82..4cd5e0856e2 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@v2
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 91e1eb36608..e557053ab68 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"