Up ES version to 7.5.1

Author: Ethan-Zhang

build.gradle

@@ -1,4 +1,7 @@
 import org.elasticsearch.gradle.MavenFilteringHack
+import org.elasticsearch.gradle.testclusters.TestClustersRegistry
+import org.elasticsearch.gradle.testclusters.TestClustersPlugin
+
 
 buildscript {
     ext {
@@ -66,8 +69,8 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-core:2.8.11"
     compile "com.fasterxml.jackson.core:jackson-annotations:2.9.4"
     compile "com.fasterxml.jackson.core:jackson-databind:2.9.4"
-    compile "org.apache.httpcomponents:httpclient:4.5.8"
-    compile "org.apache.httpcomponents:httpcore:4.4.11"
+    compile "org.apache.httpcomponents:httpclient:4.5.10"
+    compile "org.apache.httpcomponents:httpcore:4.4.12"
 }
 
 bundlePlugin {
@@ -124,3 +127,9 @@ licenseHeaders.enabled = false
 forbiddenApisMain.enabled = false
 forbiddenApisTest.enabled = false
 licenseTest.enabled = false
+
+
+TestClustersRegistry registry = project.rootProject.extensions.create("testClustersRegistry", TestClustersRegistry)
+TestClustersPlugin.configureClaimClustersHook(project.gradle, registry)
+TestClustersPlugin.configureStartClustersHook(project.gradle, registry)
+TestClustersPlugin.configureStopClustersHook(project.gradle, registry)

gradle.properties

@@ -1,2 +1,2 @@
-esVersion=7.4.0
+esVersion=7.5.1
 pluginName=CosRepository

src/test/java/org/elasticsearch/repositories/cos/CosRepositoryThirdPartyTests.java

@@ -33,24 +33,24 @@ protected SecureSettings credentials() {
         assertThat(System.getProperty("bucket"), not(blankOrNullString()));
 
         MockSecureSettings secureSettings = new MockSecureSettings();
-        secureSettings.setString("access_key_id", System.getProperty("access_key_id"));
-        secureSettings.setString("access_key_secret", System.getProperty("access_key_secret"));
+        //secureSettings.setString("access_key_id", System.getProperty("access_key_id"));
+        //secureSettings.setString("access_key_secret", System.getProperty("access_key_secret"));
         return secureSettings;
     }
 
     @Override
     protected void createRepository(String repoName) {
         final Client client = client();
 
-        MockSecureSettings secureSettings = new MockSecureSettings();
-        secureSettings.setString("access_key_id", System.getProperty("access_key_id"));
-        secureSettings.setString("access_key_secret", System.getProperty("access_key_secret"));
+        //MockSecureSettings secureSettings = new MockSecureSettings();
+        //secureSettings.setString("access_key_id", System.getProperty("access_key_id"));
+        //secureSettings.setString("access_key_secret", System.getProperty("access_key_secret"));
 
         AcknowledgedResponse putReposirotyResponse =
                 client.admin().cluster().preparePutRepository(repoName)
                 .setType(COSRepository.TYPE)
                 .setSettings(Settings.builder()
-                        .setSecureSettings(secureSettings)
+                        //.setSecureSettings(secureSettings)
                         .put("access_key_id", System.getProperty("access_key_id"))
                         .put("access_key_secret", System.getProperty("access_key_secret"))
                         .put("bucket",System.getProperty("bucket"))