From 8982068b443f41450a5f9f23a3468b58d56385ec Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 19:14:25 +0000 Subject: [PATCH 1/2] [Backport 2.x] Bump org.junit.jupiter:junit-jupiter from 5.11.0 to 5.11.1 (#4767) Signed-off-by: dependabot[bot] Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 646e3127fc..a892c8be44 100644 --- a/build.gradle +++ b/build.gradle @@ -684,8 +684,8 @@ dependencies { testImplementation 'commons-validator:commons-validator:1.9.0' testImplementation 'org.springframework.kafka:spring-kafka-test:2.9.13' testImplementation "org.springframework:spring-beans:${spring_version}" - testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0' + testImplementation 'org.junit.jupiter:junit-jupiter:5.11.1' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.1' testImplementation('org.awaitility:awaitility:4.2.2') { exclude(group: 'org.hamcrest', module: 'hamcrest') } From 777fb5945d39bd7a52cf48392164aac5c0aedfc9 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:10:16 -0400 Subject: [PATCH 2/2] [Backport 2.x] Undeprecate securityadmin script (#4768) Signed-off-by: Derek Ho Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] --- tools/audit_config_migrater.bat | 5 ----- tools/audit_config_migrater.sh | 5 ----- tools/hash.bat | 5 ----- tools/hash.sh | 5 ----- tools/securityadmin.bat | 5 ----- tools/securityadmin.sh | 5 ----- 6 files changed, 30 deletions(-) diff --git a/tools/audit_config_migrater.bat b/tools/audit_config_migrater.bat index 52ccd84915..78f1b1abc0 100644 --- a/tools/audit_config_migrater.bat +++ b/tools/audit_config_migrater.bat @@ -1,11 +1,6 @@ @echo off set DIR=%~dp0 -echo "**************************************************************************" -echo "** This tool will be deprecated in the next major release of OpenSearch **" -echo "** https://github.com/opensearch-project/security/issues/1755 **" -echo "**************************************************************************" - if defined OPENSEARCH_JAVA_HOME ( set BIN_PATH="%OPENSEARCH_JAVA_HOME%\bin\java.exe" ) else if defined JAVA_HOME ( diff --git a/tools/audit_config_migrater.sh b/tools/audit_config_migrater.sh index d2f7afa7fc..01b77cf412 100755 --- a/tools/audit_config_migrater.sh +++ b/tools/audit_config_migrater.sh @@ -1,10 +1,5 @@ #!/bin/bash -echo "**************************************************************************" -echo "** This tool will be deprecated in the next major release of OpenSearch **" -echo "** https://github.com/opensearch-project/security/issues/1755 **" -echo "**************************************************************************" - SCRIPT_PATH="${BASH_SOURCE[0]}" if ! [ -x "$(command -v realpath)" ]; then if [ -L "$SCRIPT_PATH" ]; then diff --git a/tools/hash.bat b/tools/hash.bat index fe5f57b823..a50611465c 100644 --- a/tools/hash.bat +++ b/tools/hash.bat @@ -1,11 +1,6 @@ @echo off set DIR=%~dp0 -echo "**************************************************************************" -echo "** This tool will be deprecated in the next major release of OpenSearch **" -echo "** https://github.com/opensearch-project/security/issues/1755 **" -echo "**************************************************************************" - if defined OPENSEARCH_JAVA_HOME ( set BIN_PATH="%OPENSEARCH_JAVA_HOME%\bin\java.exe" ) else if defined JAVA_HOME ( diff --git a/tools/hash.sh b/tools/hash.sh index 2bd5bb1e0e..c391232851 100755 --- a/tools/hash.sh +++ b/tools/hash.sh @@ -1,10 +1,5 @@ #!/bin/bash -echo "**************************************************************************" >&2 -echo "** This tool will be deprecated in the next major release of OpenSearch **" >&2 -echo "** https://github.com/opensearch-project/security/issues/1755 **" >&2 -echo "**************************************************************************" >&2 - SCRIPT_PATH="${BASH_SOURCE[0]}" if ! [ -x "$(command -v realpath)" ]; then if [ -L "$SCRIPT_PATH" ]; then diff --git a/tools/securityadmin.bat b/tools/securityadmin.bat index d798f78bf0..a44562b6d9 100644 --- a/tools/securityadmin.bat +++ b/tools/securityadmin.bat @@ -1,11 +1,6 @@ @echo off set DIR=%~dp0 -echo "**************************************************************************" -echo "** This tool will be deprecated in the next major release of OpenSearch **" -echo "** https://github.com/opensearch-project/security/issues/1755 **" -echo "**************************************************************************" - if defined OPENSEARCH_JAVA_HOME ( set BIN_PATH="%OPENSEARCH_JAVA_HOME%\bin\java.exe" ) else if defined JAVA_HOME ( diff --git a/tools/securityadmin.sh b/tools/securityadmin.sh index 1b0b904619..91fb8271c5 100755 --- a/tools/securityadmin.sh +++ b/tools/securityadmin.sh @@ -1,10 +1,5 @@ #!/bin/bash -echo "**************************************************************************" -echo "** This tool will be deprecated in the next major release of OpenSearch **" -echo "** https://github.com/opensearch-project/security/issues/1755 **" -echo "**************************************************************************" - SCRIPT_PATH="${BASH_SOURCE[0]}" if ! [ -x "$(command -v realpath)" ]; then if [ -L "$SCRIPT_PATH" ]; then