Merge branch '2.x' into backport/backport-4763-to-2.x

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')
  }

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 (

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

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 (

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

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 (

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