diff --git a/build.sbt b/build.sbt index 99b247515..a9030687e 100644 --- a/build.sbt +++ b/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" diff --git a/client-python/requirements.txt b/client-python/requirements.txt index dde770450..254efe2a7 100644 --- a/client-python/requirements.txt +++ b/client-python/requirements.txt @@ -1,3 +1,3 @@ -elasticsearch==8.12.0 +elasticsearch==8.12.1 tqdm==4.61.1 scipy==1.10.1 diff --git a/docker/Dockerfile b/docker/Dockerfile index e10a33324..b145f29c0 100644 --- a/docker/Dockerfile +++ b/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) diff --git a/docs/pages/installation.md b/docs/pages/installation.md index cdeac6a4e..de7b7bd29 100644 --- a/docs/pages/installation.md +++ b/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) diff --git a/project/ElasticsearchPluginPlugin.scala b/project/ElasticsearchPluginPlugin.scala index d434fc8a6..861f4b970 100644 --- a/project/ElasticsearchPluginPlugin.scala +++ b/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,7 +131,7 @@ 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()) { @@ -139,7 +139,7 @@ object ElasticsearchPluginPlugin extends AutoPlugin { 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 diff --git a/version b/version index adf4651b2..aafb90288 100644 --- a/version +++ b/version @@ -1 +1 @@ -8.12.1.0 \ No newline at end of file +8.12.2.0 \ No newline at end of file