Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rc.1 #960

Merged
merged 2 commits into from
May 5, 2024
Merged

Fix rc.1 #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22c7f27
Update ES version
alainbodiguel May 5, 2024
8ea3aed
Fix release script
alainbodiguel May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-package-only
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/tests-integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -e

export ELASTIC_VERSION="8.13.0"
export ELASTIC_VERSION="8.13.3"

function clean_exit {
ARG=$?
Expand Down
Loading