From 4bbf1681ed21ab41e013d3eeeba0a2a495b874f4 Mon Sep 17 00:00:00 2001 From: Rishikesh1159 Date: Tue, 3 Jan 2023 22:29:18 +0000 Subject: [PATCH 1/2] Bump gradle-info-plugin from 11.3.3 to 12.0.0 Signed-off-by: Rishikesh1159 --- CHANGELOG.md | 2 ++ buildSrc/build.gradle | 2 +- .../java/org/opensearch/gradle/OpenSearchJavaPlugin.java | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cccf2b252d32..b3e344f7fa797 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bumps `json-schema-validator` from 1.0.69 to 1.0.73 ([#5316](https://github.com/opensearch-project/OpenSearch/pull/5316)) - Bumps `proto-google-common-protos` from 2.8.0 to 2.10.0 ([#5318](https://github.com/opensearch-project/OpenSearch/pull/5318)) - Bumps `protobuf-java` from 3.21.7 to 3.21.9 ([#5319](https://github.com/opensearch-project/OpenSearch/pull/5319)) +- Bumps `gradle-info-plugin` from 11.3.3 to 12.0.0 ([#5684](https://github.com/opensearch-project/OpenSearch/pull/5684)) + ### Changed - Change http code for DecommissioningFailedException from 500 to 400 ([#5283](https://github.com/opensearch-project/OpenSearch/pull/5283)) - Pre conditions check before updating weighted routing metadata ([#4955](https://github.com/opensearch-project/OpenSearch/pull/4955)) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index d8633701ec3d4..7bb019a20d8e7 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -107,7 +107,7 @@ dependencies { api 'org.apache.ant:ant:1.10.12' api 'com.netflix.nebula:gradle-extra-configurations-plugin:8.0.0' api 'com.netflix.nebula:nebula-publishing-plugin:4.6.0' - api 'com.netflix.nebula:gradle-info-plugin:7.1.3' + api 'com.netflix.nebula:gradle-info-plugin:12.0.0' api 'org.apache.rat:apache-rat:0.13' api 'commons-io:commons-io:2.7' api "net.java.dev.jna:jna:5.11.0" diff --git a/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java index c701c47f9e68c..edfaa06cea265 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java @@ -256,10 +256,10 @@ private static void configureJarManifest(Project project) { ); }); - project.getPluginManager().apply("nebula.info-broker"); - project.getPluginManager().apply("nebula.info-basic"); - project.getPluginManager().apply("nebula.info-java"); - project.getPluginManager().apply("nebula.info-jar"); + project.getPluginManager().apply("com.netflix.nebula.info-broker"); + project.getPluginManager().apply("com.netflix.nebula.info-basic"); + project.getPluginManager().apply("com.netflix.nebula.info-java"); + project.getPluginManager().apply("com.netflix.nebula.info-jar"); } private static void configureJavadoc(Project project) { From c188e7519d96a2d1e5a48ae48422fc88b122a055 Mon Sep 17 00:00:00 2001 From: Rishikesh1159 Date: Wed, 4 Jan 2023 00:33:16 +0000 Subject: [PATCH 2/2] Update correct dependency version in changelog Signed-off-by: Rishikesh1159 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3e344f7fa797..0a4a37667aeda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,7 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bumps `json-schema-validator` from 1.0.69 to 1.0.73 ([#5316](https://github.com/opensearch-project/OpenSearch/pull/5316)) - Bumps `proto-google-common-protos` from 2.8.0 to 2.10.0 ([#5318](https://github.com/opensearch-project/OpenSearch/pull/5318)) - Bumps `protobuf-java` from 3.21.7 to 3.21.9 ([#5319](https://github.com/opensearch-project/OpenSearch/pull/5319)) -- Bumps `gradle-info-plugin` from 11.3.3 to 12.0.0 ([#5684](https://github.com/opensearch-project/OpenSearch/pull/5684)) +- Bumps `gradle-info-plugin` from 7.1.3 to 12.0.0 ([#5684](https://github.com/opensearch-project/OpenSearch/pull/5684)) ### Changed - Change http code for DecommissioningFailedException from 500 to 400 ([#5283](https://github.com/opensearch-project/OpenSearch/pull/5283))