diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 5badfb7..de4de95 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -38,6 +38,7 @@ jobs: # * needs repo:status, public_repo # * referenced in .settings.xml GH_TOKEN: ${{ secrets.GH_TOKEN }} + # TODO: remove -DignoreSnapshots=true after ES 8.14.0 is released run: | # GITHUB_REF will be refs/tags/release-MAJOR.MINOR.PATCH build-bin/git/login_git && - build-bin/maven/maven_release $(echo ${GITHUB_REF} | cut -d/ -f 3) + build-bin/maven/maven_release $(echo ${GITHUB_REF} | cut -d/ -f 3) -DignoreSnapshots=true diff --git a/build-bin/deploy b/build-bin/deploy index 452007a..4d29dd0 100755 --- a/build-bin/deploy +++ b/build-bin/deploy @@ -10,6 +10,7 @@ if [ "${version}" = "master" ]; then version=$(sed -En 's/.*(.*)<\/version>.*/\1/p' pom.xml| head -1) fi -build-bin/maven/maven_deploy +# TODO: remove -DignoreSnapshots=true after ES 8.14.0 is released +build-bin/maven/maven_deploy -DignoreSnapshots=true 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 26dd5c9..c90d2fc 100755 --- a/build-bin/maven/maven_deploy +++ b/build-bin/maven/maven_deploy @@ -11,5 +11,4 @@ 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. -# 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 $@ +./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DskipTests clean deploy $@ diff --git a/build-bin/maven/maven_release b/build-bin/maven/maven_release index df4cdf6..f0e46aa 100755 --- a/build-bin/maven/maven_release +++ b/build-bin/maven/maven_release @@ -31,4 +31,4 @@ if [ "$commit_local_release_branch" != "$commit_remote_release_branch" ]; then fi # Prepare and push release commits and the version tag (N.N.N), which triggers deployment. -./mvnw --batch-mode -nsu -DreleaseVersion=${release_version} -Denforcer.fail=false -Darguments="-DskipTests -Denforcer.fail=false" release:prepare +./mvnw --batch-mode -nsu -DreleaseVersion=${release_version} -Denforcer.fail=false -Darguments="-DskipTests -Denforcer.fail=false" release:prepare $@