diff --git a/.github/workflows/beam_Release_NightlySnapshot.yml b/.github/workflows/beam_Release_NightlySnapshot.yml index 9bd1345cd0c5..1b572f4aa0f3 100644 --- a/.github/workflows/beam_Release_NightlySnapshot.yml +++ b/.github/workflows/beam_Release_NightlySnapshot.yml @@ -84,6 +84,6 @@ jobs: " > ${HOME}/.m2/settings.xml - name: run Publish script run: | - ./gradlew publish --max-workers=8 -Ppublishing -PskipCheckerFramework -PisNightly \ + ./gradlew publish --max-workers=8 -Ppublishing -PskipCheckerFramework \ --continue -Dorg.gradle.jvmargs=-Xms2g -Dorg.gradle.jvmargs=-Xmx6g \ -Dorg.gradle.vfs.watch=false -Pdocker-pull-licenses diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 0c0574b34851..f31150227c35 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -431,9 +431,6 @@ class BeamModulePlugin implements Plugin { def isRelease(Project project) { return parseBooleanProperty(project, 'isRelease'); } - def isNightly(Project project) { - return parseBooleanProperty(project, 'isNightly'); - } /** * Parses -Pprop as true for use as a flag, and otherwise uses Groovy's toBoolean */ @@ -492,14 +489,10 @@ class BeamModulePlugin implements Plugin { project.ext.mavenGroupId = 'org.apache.beam' - if (isRelease(project) && isNightly(project)) { - throw new GradleException("Cannot specify both -PisRelease and -PisNightly properties") - } - if (isNightly(project)) { - Date date = new Date() - project.version += "-" + date.format('yyyyMMdd') - } - else if (!isRelease(project)) { + // Automatically use the official release version if we are performing a release + // otherwise append '-SNAPSHOT' + project.version = '2.51.0' + if (!isRelease(project)) { project.version += '-SNAPSHOT' }