Merge branch 'opensearch-project:main' into 2704-filter-internal-and-…

…service-accounts
samuelcostae · Aug 9, 2023 · 4e9fb82 · 4e9fb82
2 parents 7bca971 + d8568d9
commit 4e9fb82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -531,7 +531,7 @@ dependencies {
     runtimeOnly 'com.google.errorprone:error_prone_annotations:2.20.0'
     runtimeOnly 'com.sun.istack:istack-commons-runtime:4.2.0'
     runtimeOnly 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
-    runtimeOnly 'org.ow2.asm:asm:9.1'
+    runtimeOnly 'org.ow2.asm:asm:9.5'
 
     testImplementation 'org.apache.camel:camel-xmlsecurity:3.21.0'
 

diff --git a/scripts/integtest.sh b/scripts/integtest.sh
@@ -20,7 +20,6 @@ function usage() {
     echo -e "-v OPENSEARCH_VERSION\t, no defaults"
     echo -e "-n SNAPSHOT\t, defaults to false"
     echo -e "-m CLUSTER_NAME\t, defaults to docker-cluster"
-    echo -e "-u COMMON_UTILS_VERSION\t, defaults to 3.0.0.0-SNAPSHOT"
     echo "--------------------------------------------------------------------------"
 }
 
@@ -99,12 +98,8 @@ if [ -z "$CLUSTER_NAME" ]
 then
   CLUSTER_NAME="docker-cluster"
 fi
-if [ -z "$COMMON_UTILS_VERSION" ]
-then
-  COMMON_UTILS_VERSION="3.0.0.0-SNAPSHOT"
-fi
 
 USERNAME=`echo $CREDENTIAL | awk -F ':' '{print $1}'`
 PASSWORD=`echo $CREDENTIAL | awk -F ':' '{print $2}'`
 
-./gradlew integTestRemote -Dtests.rest.cluster="$BIND_ADDRESS:$BIND_PORT" -Dtests.cluster="$BIND_ADDRESS:$BIND_PORT" -Dsecurity_enabled=$SECURITY_ENABLED -Dtests.clustername=$CLUSTER_NAME -Dhttps=true -Duser=$USERNAME -Dpassword=$PASSWORD -Dcommon_utils.version=$COMMON_UTILS_VERSION
+./gradlew integTestRemote -Dtests.rest.cluster="$BIND_ADDRESS:$BIND_PORT" -Dtests.cluster="$BIND_ADDRESS:$BIND_PORT" -Dsecurity_enabled=$SECURITY_ENABLED -Dtests.clustername=$CLUSTER_NAME -Dhttps=true -Duser=$USERNAME -Dpassword=$PASSWORD