svn commit: r1887167 - in /jackrabbit/oak/trunk/oak-search-elastic: pom.xml src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java

[fo...@apache.org]

Author: fortino
Date: Thu Mar  4 09:23:09 2021
New Revision: 1887167

URL: http://svn.apache.org/viewvc?rev=1887167&view=rev
Log:
OAK-9372: bump elastic version to 7.10.2 and align elastiknn version

Modified:
    jackrabbit/oak/trunk/oak-search-elastic/pom.xml
    jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java

Modified: jackrabbit/oak/trunk/oak-search-elastic/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/pom.xml?rev=1887167&r1=1887166&r2=1887167&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/pom.xml Thu Mar  4 09:23:09 2021
@@ -33,7 +33,7 @@
   <description>Oak Elasticsearch integration subproject</description>
 
   <properties>
-    <elasticsearch.version>7.10.1</elasticsearch.version>
+    <elasticsearch.version>7.10.2</elasticsearch.version>
     <lucene.version>8.7.0</lucene.version>
   </properties>
 

Modified: jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java?rev=1887167&r1=1887166&r2=1887167&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java Thu Mar  4 09:23:09 2021
@@ -55,7 +55,7 @@ public class ElasticConnectionRule exten
     private ElasticConnection elasticConnection;
     private final String elasticConnectionString;
     private static final String INDEX_PREFIX = "ElasticTest_";
-    private static final String PLUGIN_DIGEST = "c4451aa794641dd3c9b0fdc64b553b71ca2f9a44689a7784b51669b5e557046d";
+    private static final String PLUGIN_DIGEST = "060117b4150c87274d9cff0925ec16e714f28a40906a53a2cd2a23322bbb3189";
     private static boolean useDocker = false;
 
     public ElasticConnectionRule(String elasticConnectionString) {
@@ -81,16 +81,16 @@ public class ElasticConnectionRule exten
     public Statement apply(Statement base, Description description) {
         Statement s = super.apply(base, description);
         // see if docker is to be used or not... initialize docker rule only if that's the case.
-        final String pluginVersion = "7.10.1.0";
+        final String pluginVersion = "7.10.2.3";
         final String pluginFileName = "elastiknn-" + pluginVersion + ".zip";
         final String localPluginPath = "target/" + pluginFileName;
         downloadSimilaritySearchPluginIfNotExists(localPluginPath, pluginVersion);
         if (elasticConnectionString == null || getElasticConnectionFromString() == null) {
             checkIfDockerClientAvailable();
             elastic = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:" + Version.CURRENT)
-                .withCopyFileToContainer(MountableFile.forHostPath(localPluginPath), "/tmp/plugins/" + pluginFileName)
+                    .withCopyFileToContainer(MountableFile.forHostPath(localPluginPath), "/tmp/plugins/" + pluginFileName)
                     .withCopyFileToContainer(MountableFile.forClasspathResource("elasticstartscript.sh"), "/tmp/elasticstartscript.sh")
-                .withCommand("bash /tmp/elasticstartscript.sh");
+                    .withCommand("bash /tmp/elasticstartscript.sh");
             s = elastic.apply(s, description);
             setUseDocker(true);
         }