diff --git a/gradle.properties b/gradle.properties index d41a3e4f..2dba7bd0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -currentVersion=2.19.1 +currentVersion=2.19.x-SNAPSHOT diff --git a/release/pipelines.release.yml b/release/pipelines.release.yml index e7146633..db0b35fa 100644 --- a/release/pipelines.release.yml +++ b/release/pipelines.release.yml @@ -87,7 +87,7 @@ pipelines: # Update next development version - git clean -fd - - git checkout dev + - git checkout dev -f - git merge origin/master - sed -i "s/\(currentVersion=\).*\$/\1${NEXT_DEVELOPMENT_VERSION}/" gradle.properties - git commit -am "[artifactory-release] Next development version [skipRun]"