From 74fecf9a67fac96c1db02e4ff7e8d613d1ef9b71 Mon Sep 17 00:00:00 2001 From: Lantao Jin Date: Thu, 23 Oct 2025 14:19:50 +0800 Subject: [PATCH 1/6] Fix CI failure Signed-off-by: Lantao Jin --- build.gradle | 14 ++++++++++++-- plugin/build.gradle | 3 ++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 25e016b584a..51643811e10 100644 --- a/build.gradle +++ b/build.gradle @@ -93,7 +93,12 @@ repositories { mavenLocal() mavenCentral() // For Elastic Libs that you can use to get started coding until open OpenSearch libs are available maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } - maven { url 'https://jitpack.io' } + maven { + url 'https://jitpack.io' + content { + includeGroup "com.github.babbel" + } + } } spotless { @@ -158,7 +163,12 @@ subprojects { mavenCentral() maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } maven { url "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" } - maven { url 'https://jitpack.io' } + maven { + url 'https://jitpack.io' + content { + includeGroup "com.github.babbel" + } + } } } diff --git a/plugin/build.gradle b/plugin/build.gradle index c6d05e934fa..1a6b4d1c192 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -44,8 +44,9 @@ ext { } repositories { + mavenLocal() mavenCentral() - maven { url 'https://jitpack.io' } + maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } } opensearchplugin { From 29036aaa0b1b01d79b875a883f696c4a96e0722d Mon Sep 17 00:00:00 2001 From: Lantao Jin Date: Thu, 23 Oct 2025 14:43:19 +0800 Subject: [PATCH 2/6] revert Signed-off-by: Lantao Jin --- plugin/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/build.gradle b/plugin/build.gradle index 1a6b4d1c192..fa0ce089a7d 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -46,7 +46,7 @@ ext { repositories { mavenLocal() mavenCentral() - maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } + maven { url 'https://jitpack.io' } } opensearchplugin { From 6a9efcc553e44f3d1e32dc86018343e4cb4551d3 Mon Sep 17 00:00:00 2001 From: Lantao Jin Date: Thu, 23 Oct 2025 14:51:27 +0800 Subject: [PATCH 3/6] move forward Signed-off-by: Lantao Jin --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 51643811e10..f5c20b2fc1d 100644 --- a/build.gradle +++ b/build.gradle @@ -92,13 +92,13 @@ apply plugin: 'opensearch.java-agent' repositories { mavenLocal() mavenCentral() // For Elastic Libs that you can use to get started coding until open OpenSearch libs are available - maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } maven { url 'https://jitpack.io' content { includeGroup "com.github.babbel" } } + maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } } spotless { @@ -161,14 +161,14 @@ subprojects { repositories { mavenLocal() mavenCentral() - maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } - maven { url "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" } maven { url 'https://jitpack.io' content { includeGroup "com.github.babbel" } } + maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } + maven { url "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" } } } From 5cda2a8d9db70c5815c70f7689d8c66db33178fa Mon Sep 17 00:00:00 2001 From: Lantao Jin Date: Thu, 23 Oct 2025 16:24:39 +0800 Subject: [PATCH 4/6] add retry Signed-off-by: Lantao Jin --- build.gradle | 10 ++++------ integ-test/build.gradle | 7 ++++++- plugin/build.gradle | 6 +++++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index f5c20b2fc1d..9ea60d0ff65 100644 --- a/build.gradle +++ b/build.gradle @@ -94,9 +94,8 @@ repositories { mavenCentral() // For Elastic Libs that you can use to get started coding until open OpenSearch libs are available maven { url 'https://jitpack.io' - content { - includeGroup "com.github.babbel" - } + maxRetries = 3 + retryDelay = 1000 } maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } } @@ -163,9 +162,8 @@ subprojects { mavenCentral() maven { url 'https://jitpack.io' - content { - includeGroup "com.github.babbel" - } + maxRetries = 3 + retryDelay = 1000 } maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } maven { url "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" } diff --git a/integ-test/build.gradle b/integ-test/build.gradle index 8be26b22545..175d0125f35 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -57,8 +57,13 @@ String ignorePrometheusProp = System.getProperty("ignorePrometheus") boolean ignorePrometheus = ignorePrometheusProp != null && !ignorePrometheusProp.equalsIgnoreCase("false") repositories { + mavenLocal() mavenCentral() - maven { url 'https://jitpack.io' } + maven { + url 'https://jitpack.io' + maxRetries = 3 + retryDelay = 1000 + } // Add extra repository for the JDBC driver if given by user if (System.getProperty("jdbcRepo") != null && new File(System.getProperty("jdbcRepo")).isDirectory()) { diff --git a/plugin/build.gradle b/plugin/build.gradle index fa0ce089a7d..61bc495fb35 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -46,7 +46,11 @@ ext { repositories { mavenLocal() mavenCentral() - maven { url 'https://jitpack.io' } + maven { + url 'https://jitpack.io' + maxRetries = 3 + retryDelay = 1000 + } } opensearchplugin { From afed1492c2492363d7a80fa6ffbbe659ed6c8ee6 Mon Sep 17 00:00:00 2001 From: Lantao Jin Date: Thu, 23 Oct 2025 16:28:57 +0800 Subject: [PATCH 5/6] add restriction for repo jitpack Signed-off-by: Lantao Jin --- build.gradle | 2 ++ integ-test/build.gradle | 1 + plugin/build.gradle | 1 + 3 files changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index 9ea60d0ff65..bd3b9f30548 100644 --- a/build.gradle +++ b/build.gradle @@ -94,6 +94,7 @@ repositories { mavenCentral() // For Elastic Libs that you can use to get started coding until open OpenSearch libs are available maven { url 'https://jitpack.io' + content { includeGroup "com.github.babbel" } maxRetries = 3 retryDelay = 1000 } @@ -162,6 +163,7 @@ subprojects { mavenCentral() maven { url 'https://jitpack.io' + content { includeGroup "com.github.babbel" } maxRetries = 3 retryDelay = 1000 } diff --git a/integ-test/build.gradle b/integ-test/build.gradle index 175d0125f35..e3fba45aa59 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -61,6 +61,7 @@ repositories { mavenCentral() maven { url 'https://jitpack.io' + content { includeGroup "com.github.babbel" } maxRetries = 3 retryDelay = 1000 } diff --git a/plugin/build.gradle b/plugin/build.gradle index 61bc495fb35..f048435fe71 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -48,6 +48,7 @@ repositories { mavenCentral() maven { url 'https://jitpack.io' + content { includeGroup "com.github.babbel" } maxRetries = 3 retryDelay = 1000 } From 73e1db11045c4a028ac59de3edb42466a42521b3 Mon Sep 17 00:00:00 2001 From: Lantao Jin Date: Thu, 23 Oct 2025 17:01:25 +0800 Subject: [PATCH 6/6] add build cache Signed-off-by: Lantao Jin --- build.gradle | 4 ---- gradle.properties | 1 + integ-test/build.gradle | 2 -- plugin/build.gradle | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index bd3b9f30548..904569c4918 100644 --- a/build.gradle +++ b/build.gradle @@ -95,8 +95,6 @@ repositories { maven { url 'https://jitpack.io' content { includeGroup "com.github.babbel" } - maxRetries = 3 - retryDelay = 1000 } maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } } @@ -164,8 +162,6 @@ subprojects { maven { url 'https://jitpack.io' content { includeGroup "com.github.babbel" } - maxRetries = 3 - retryDelay = 1000 } maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } maven { url "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" } diff --git a/gradle.properties b/gradle.properties index cca553e80bf..d95eee2f1a1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,3 +5,4 @@ version=1.13.0 org.gradle.jvmargs=-Duser.language=en -Duser.country=US org.gradle.parallel=true +org.gradle.caching=true diff --git a/integ-test/build.gradle b/integ-test/build.gradle index e3fba45aa59..df9bea228ce 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -62,8 +62,6 @@ repositories { maven { url 'https://jitpack.io' content { includeGroup "com.github.babbel" } - maxRetries = 3 - retryDelay = 1000 } // Add extra repository for the JDBC driver if given by user diff --git a/plugin/build.gradle b/plugin/build.gradle index f048435fe71..6d80972edd3 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -49,8 +49,6 @@ repositories { maven { url 'https://jitpack.io' content { includeGroup "com.github.babbel" } - maxRetries = 3 - retryDelay = 1000 } }