From 76999f6c185e87b3b6b6f15cbdcfa60d2c8d5e89 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sun, 26 May 2024 09:32:48 +0800 Subject: [PATCH] rework workaround Signed-off-by: Adrian Cole --- build-bin/deploy | 3 +-- build-bin/maven/maven_deploy | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-bin/deploy b/build-bin/deploy index 4d29dd0..452007a 100755 --- a/build-bin/deploy +++ b/build-bin/deploy @@ -10,7 +10,6 @@ if [ "${version}" = "master" ]; then version=$(sed -En 's/.*(.*)<\/version>.*/\1/p' pom.xml| head -1) fi -# TODO: remove -DignoreSnapshots=true after ES 8.14.0 is released -build-bin/maven/maven_deploy -DignoreSnapshots=true +build-bin/maven/maven_deploy export RELEASE_FROM_MAVEN_BUILD=true build-bin/docker_push ${version} diff --git a/build-bin/maven/maven_deploy b/build-bin/maven/maven_deploy index c90d2fc..26dd5c9 100755 --- a/build-bin/maven/maven_deploy +++ b/build-bin/maven/maven_deploy @@ -11,4 +11,5 @@ export MAVEN_OPTS="$($(dirname "$0")/maven_opts)" # This script deploys a SNAPSHOT or release version to Sonatype. # # Note: In CI, `configure_maven_deploy` must be called before invoking this. -./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DskipTests clean deploy $@ +# TODO: remove -DignoreSnapshots=true and add -nsu to the mvn command after ES 8.14.0 is released +./mvnw --batch-mode -s ./.settings.xml -Prelease -DignoreSnapshots=true -DskipTests clean deploy $@