From f3bfae96b4543eca285d704f9e07f1dbee5bcaae Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Tue, 14 Dec 2021 15:17:05 -0800 Subject: [PATCH 1/3] bumping up version to 1.2.2 Signed-off-by: Shenoy Pratik --- .../opensearch-trace-analytics.release-notes-1.2.2.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/release-notes/opensearch-trace-analytics.release-notes-1.2.2.md b/release-notes/opensearch-trace-analytics.release-notes-1.2.2.md index 181b01611..211ecbd4c 100644 --- a/release-notes/opensearch-trace-analytics.release-notes-1.2.2.md +++ b/release-notes/opensearch-trace-analytics.release-notes-1.2.2.md @@ -1,6 +1,14 @@ +<<<<<<< HEAD ## Version 1.2.2.0 Release Notes +======= +## Version 1.2.1.0 Release Notes +>>>>>>> 2f638ad (bumping up version to 1.2.2) Compatible with OpenSearch Version 1.2.2 and OpenSearch Dashboards Version 1.2.0 ### Maintenance -* Bump observability version for OpenSearch 1.2.2 release [#346](https://github.com/opensearch-project/observability/pull/346) \ No newline at end of file +<<<<<<< HEAD +* Bump observability version for OpenSearch 1.2.2 release [#346](https://github.com/opensearch-project/observability/pull/346) +======= +* Bump observability version for OpenSearch 1.2.2 release +>>>>>>> 2f638ad (bumping up version to 1.2.2) From 171b74942ec38e446e63494e648df8f581648a6a Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Tue, 14 Dec 2021 15:29:19 -0800 Subject: [PATCH 2/3] update PR link in release notes Signed-off-by: Shenoy Pratik --- .../opensearch-trace-analytics.release-notes-1.2.2.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/release-notes/opensearch-trace-analytics.release-notes-1.2.2.md b/release-notes/opensearch-trace-analytics.release-notes-1.2.2.md index 211ecbd4c..16a6d4f0a 100644 --- a/release-notes/opensearch-trace-analytics.release-notes-1.2.2.md +++ b/release-notes/opensearch-trace-analytics.release-notes-1.2.2.md @@ -1,14 +1,7 @@ -<<<<<<< HEAD ## Version 1.2.2.0 Release Notes -======= -## Version 1.2.1.0 Release Notes ->>>>>>> 2f638ad (bumping up version to 1.2.2) Compatible with OpenSearch Version 1.2.2 and OpenSearch Dashboards Version 1.2.0 ### Maintenance -<<<<<<< HEAD * Bump observability version for OpenSearch 1.2.2 release [#346](https://github.com/opensearch-project/observability/pull/346) -======= -* Bump observability version for OpenSearch 1.2.2 release ->>>>>>> 2f638ad (bumping up version to 1.2.2) + From 0481a82ba503ccd552ec87afd46247d7954caa33 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Tue, 11 Jan 2022 13:39:44 -0800 Subject: [PATCH 3/3] CVE fix backport: gson Signed-off-by: Shenoy Pratik --- opensearch-observability/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensearch-observability/build.gradle b/opensearch-observability/build.gradle index a97b94e57..2ab7ae768 100644 --- a/opensearch-observability/build.gradle +++ b/opensearch-observability/build.gradle @@ -136,7 +136,7 @@ dependencies { testCompile "org.jetbrains.kotlin:kotlin-test:${kotlin_version}" testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" testCompile "org.mockito:mockito-core:3.12.4" - testCompile "com.google.code.gson:gson:2.8.6" + testCompile "com.google.code.gson:gson:2.8.9" ktlint "com.pinterest:ktlint:0.41.0" }