Dependencies: Update Elasticsearch to 8.12.2 (#643)

build.sbt

@@ -4,7 +4,7 @@ import org.typelevel.scalacoptions.*
 Global / scalaVersion := "2.13.12"
 
 lazy val CirceVersion = "0.14.3"
-lazy val ElasticsearchVersion = "8.12.1"
+lazy val ElasticsearchVersion = "8.12.2"
 lazy val Elastic4sVersion = "8.11.5"
 lazy val ElastiknnVersion = IO.read(file("version")).strip()
 lazy val LuceneVersion = "9.9.1"

client-python/requirements.txt

@@ -1,3 +1,3 @@
-elasticsearch==8.12.0
+elasticsearch==8.12.1
 tqdm==4.61.1
 scipy==1.10.1

docker/Dockerfile

@@ -1,3 +1,3 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:8.12.1
+FROM docker.elastic.co/elasticsearch/elasticsearch:8.12.2
 COPY elastiknn-plugin/target/elastiknn*.zip .
 RUN elasticsearch-plugin install -b file:$(ls elastiknn*zip | sort | tail -n1)

docs/pages/installation.md

@@ -42,8 +42,8 @@ Make a Dockerfile like below.
 The image version (`elasticsearch:A.B.C`) must match the plugin's version (e.g. `A.B.C.x/elastiknn-A.B.C.x`).
 
 ```docker
-FROM docker.elastic.co/elasticsearch/elasticsearch:8.12.1
-RUN elasticsearch-plugin install --batch https://github.com/alexklibisz/elastiknn/releases/download/8.12.1.0/elastiknn-8.12.1.0.zip
+FROM docker.elastic.co/elasticsearch/elasticsearch:8.12.2
+RUN elasticsearch-plugin install --batch https://github.com/alexklibisz/elastiknn/releases/download/8.12.2.0/elastiknn-8.12.2.0.zip
 ```
 
 Build and run the Dockerfile. If you have any issues please refer to the [official docs.](https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html)

project/ElasticsearchPluginPlugin.scala

@@ -102,7 +102,7 @@ object ElasticsearchPluginPlugin extends AutoPlugin {
 
     val files = List(pluginDescriptorFile, pluginJar) ++ pluginMetadataFiles ++ dependencyJars
     val zipFile = elasticsearchPluginBundleFile.value
-    IO.zip(files.map(f => (f -> f.getName)), zipFile, None)
+    IO.zip(files.map(f => f -> f.getName), zipFile, None)
     log.info(s"Generated plugin file ${zipFile.getPath} containing ${files.length + 1} files.")
     zipFile
   }
@@ -131,15 +131,15 @@ object ElasticsearchPluginPlugin extends AutoPlugin {
       else throw new RuntimeException(s"Unsupported operating system $osName, $arch")
     }
     val distributionFilename = s"elasticsearch-${elasticsearchVersion.value}-$elasticsearchVersionSuffix.tar.gz"
-    val distributionUrl = new URL(s"https://artifacts.elastic.co/downloads/elasticsearch/$distributionFilename")
+    val distributionUrl = new URI(s"https://artifacts.elastic.co/downloads/elasticsearch/$distributionFilename").toURL
     val distributionDirectory = elasticsearchPluginDistributionDirectory.value
     val distributionParentDirectory = elasticsearchPluginDistributionDirectory.value.getParentFile
     if (!distributionDirectory.exists()) {
       log.info(s"Downloading Elasticsearch distribution from $distributionUrl to $distributionDirectory")
       val urlInputStream = distributionUrl.openStream()
       val gzipInputStream = new GZIPInputStream(urlInputStream)
       val tarInputStream = new TarArchiveInputStream(gzipInputStream)
-      while (tarInputStream.getNextTarEntry != null) {
+      while (tarInputStream.getNextEntry != null) {
         val entry = tarInputStream.getCurrentEntry
         log.debug(s"Processing distribution entry ${entry.getName}")
         val entryFile = distributionParentDirectory / entry.getName

version

@@ -1 +1 @@
-8.12.1.0
+8.12.2.0