Merge with main

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Dec 2, 2024 · c01157d · c01157d
1 parent 6772be8
commit c01157d
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -725,29 +725,29 @@ dependencies {
     compileOnly "org.opensearch:opensearch:${opensearch_version}"
 
     //integration test framework:
-    integrationTestImplementation('com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1') {
-        exclude(group: 'junit', module: 'junit')
-    }
-    integrationTestImplementation 'junit:junit:4.13.2'
-    integrationTestImplementation "org.opensearch.plugin:reindex-client:${opensearch_version}"
-    integrationTestImplementation "org.opensearch.plugin:percolator-client:${opensearch_version}"
-    integrationTestImplementation 'commons-io:commons-io:2.18.0'
-    integrationTestImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}"
-    integrationTestImplementation "org.apache.logging.log4j:log4j-jul:${versions.log4j}"
-    integrationTestImplementation 'org.hamcrest:hamcrest:2.2'
-    integrationTestImplementation "org.bouncycastle:bcpkix-jdk18on:${versions.bouncycastle}"
-    integrationTestImplementation "org.bouncycastle:bcutil-jdk18on:${versions.bouncycastle}"
-    integrationTestImplementation('org.awaitility:awaitility:4.2.2') {
-        exclude(group: 'org.hamcrest', module: 'hamcrest')
-    }
-    integrationTestImplementation 'com.unboundid:unboundid-ldapsdk:4.0.14'
-    integrationTestImplementation "org.opensearch.plugin:mapper-size:${opensearch_version}"
-    integrationTestImplementation "org.apache.httpcomponents:httpclient-cache:4.5.14"
-    integrationTestImplementation "org.apache.httpcomponents:httpclient:4.5.14"
-    integrationTestImplementation "org.apache.httpcomponents:fluent-hc:4.5.14"
-    integrationTestImplementation "org.apache.httpcomponents:httpcore:4.4.16"
-    integrationTestImplementation "org.apache.httpcomponents:httpasyncclient:4.1.5"
-    integrationTestImplementation "org.mockito:mockito-core:5.14.2"
+//    integrationTestImplementation('com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1') {
+//        exclude(group: 'junit', module: 'junit')
+//    }
+//    integrationTestImplementation 'junit:junit:4.13.2'
+//    integrationTestImplementation "org.opensearch.plugin:reindex-client:${opensearch_version}"
+//    integrationTestImplementation "org.opensearch.plugin:percolator-client:${opensearch_version}"
+//    integrationTestImplementation 'commons-io:commons-io:2.18.0'
+//    integrationTestImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}"
+//    integrationTestImplementation "org.apache.logging.log4j:log4j-jul:${versions.log4j}"
+//    integrationTestImplementation 'org.hamcrest:hamcrest:2.2'
+//    integrationTestImplementation "org.bouncycastle:bcpkix-jdk18on:${versions.bouncycastle}"
+//    integrationTestImplementation "org.bouncycastle:bcutil-jdk18on:${versions.bouncycastle}"
+//    integrationTestImplementation('org.awaitility:awaitility:4.2.2') {
+//        exclude(group: 'org.hamcrest', module: 'hamcrest')
+//    }
+//    integrationTestImplementation 'com.unboundid:unboundid-ldapsdk:4.0.14'
+//    integrationTestImplementation "org.opensearch.plugin:mapper-size:${opensearch_version}"
+//    integrationTestImplementation "org.apache.httpcomponents:httpclient-cache:4.5.14"
+//    integrationTestImplementation "org.apache.httpcomponents:httpclient:4.5.14"
+//    integrationTestImplementation "org.apache.httpcomponents:fluent-hc:4.5.14"
+//    integrationTestImplementation "org.apache.httpcomponents:httpcore:4.4.16"
+//    integrationTestImplementation "org.apache.httpcomponents:httpasyncclient:4.1.5"
+//    integrationTestImplementation "org.mockito:mockito-core:5.14.2"
 
     //spotless
     implementation('com.google.googlejavaformat:google-java-format:1.25.0') {
@@ -768,7 +768,7 @@ allprojects {
         integrationTestImplementation 'junit:junit:4.13.2'
         integrationTestImplementation "org.opensearch.plugin:reindex-client:${opensearch_version}"
         integrationTestImplementation "org.opensearch.plugin:percolator-client:${opensearch_version}"
-        integrationTestImplementation 'commons-io:commons-io:2.17.0'
+        integrationTestImplementation 'commons-io:commons-io:2.18.0'
         integrationTestImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}"
         integrationTestImplementation "org.apache.logging.log4j:log4j-jul:${versions.log4j}"
         integrationTestImplementation 'org.hamcrest:hamcrest:2.2'