Merge pull request #960 from gisaia/fix/rc.2

Update ES version
gisaia · May 5, 2024 · ee7ca54 · ee7ca54
2 parents 609b4e1 + 8ea3aed
commit ee7ca54
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,7 @@ RUN mvn install \
 ###################
 # PACKAGING STAGE #
 ###################
-FROM gisaia/arlas-openjdk-17-distroless:20240503100632
+FROM gisaia/arlas-openjdk-17-distroless:20240505183515
 
 # application placed into /opt/app
 WORKDIR /opt/app

diff --git a/Dockerfile-package-only b/Dockerfile-package-only
@@ -1,7 +1,7 @@
 ###################
 # PACKAGING STAGE #
 ###################
-FROM gisaia/arlas-openjdk-17-distroless:20240503100632
+FROM gisaia/arlas-openjdk-17-distroless:20240505183515
 
 # application placed into /opt/app
 WORKDIR /opt/app

diff --git a/docker-compose-elasticsearch.yml b/docker-compose-elasticsearch.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-8.13.0}
+    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-8.13.3}
     container_name: elasticsearch
     restart: always
     environment:

diff --git a/pom.xml b/pom.xml
@@ -65,7 +65,7 @@
     <hazelcast.version>5.4.0</hazelcast.version>
 
     <!-- ELASTICSEARCH-->
-    <elastic.version>8.13.2</elastic.version>
+    <elastic.version>8.13.3</elastic.version>
 
     <!-- GEO-->
     <geotools.version>30.2</geotools.version>

diff --git a/release.sh b/release.sh
@@ -23,7 +23,7 @@ function clean_exit {
     else
         echo "=> Skip discard changes";
         git checkout -- pom.xml
-        sed -i.bak 's/\"'${FULL_API_VERSION}'\"/\"API_VERSION\"/' arlas-rest/src/main/java/io/arlas/server/rest/explore/ExploreRESTServices.java
+        sed -i.bak 's/\"'${FULL_API_VERSION}'\"/\"API_VERSION\"/' arlas-rest/src/main/java/io/arlas/server/core/services/ArlasRESTServices.java
     fi
     exit $ARG
 }
@@ -209,7 +209,7 @@ else
         --mount dst=/input/api.json,src="$PWD/target/tmp/openapi.json",type=bind,ro \
         --mount dst=/input/config.json,src="$PWD/conf/swagger/java-config.json",type=bind,ro \
         --mount dst=/output,src="$PWD/target/tmp/java-api",type=bind \
-        gisaia/swagger-codegen-3.0.42 \
+        gisaia/swagger-codegen-3.0.54 \
             -l java --type-mappings GeoJsonObject=Object
 
     mkdir -p target/tmp/typescript-fetch

diff --git a/scripts/ci/tests-integration.sh b/scripts/ci/tests-integration.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-export ELASTIC_VERSION="8.13.0"
+export ELASTIC_VERSION="8.13.3"
 
 function clean_exit {
   ARG=$?