[beam] branch master updated: Fixed wrong isRelease() call in publish

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new f96b25a  Fixed wrong isRelease() call in publish
f96b25a is described below

commit f96b25a947a58542189e62fe46236b63ea99ca6a
Author: Boyuan Zhang <bo...@google.com>
AuthorDate: Tue Jul 31 14:52:03 2018 -0700

    Fixed wrong isRelease() call in publish
---
 .../src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 b2fa9c1..0f6ebfc 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -790,7 +790,7 @@ artifactId=${project.name}
               url "file://${project.rootProject.projectDir}/testPublication/"
             }
             maven {
-              url(project.properties['distMgmtSnapshotsUrl'] ?: isRelease()
+              url(project.properties['distMgmtSnapshotsUrl'] ?: isRelease(project)
                       ? 'https://repository.apache.org/service/local/staging/deploy/maven2'
                       : 'https://repository.apache.org/content/repositories/snapshots')
 
@@ -812,7 +812,7 @@ artifactId=${project.name}
               // </settings>
               def settingsXml = new File(System.getProperty('user.home'), '.m2/settings.xml')
               if (settingsXml.exists()) {
-                def serverId = (isRelease() ? 'apache.releases.https' : 'apache.snapshots.https')
+                def serverId = (isRelease(project) ? 'apache.releases.https' : 'apache.snapshots.https')
                 def m2SettingCreds = new XmlSlurper().parse(settingsXml).servers.server.find { server -> serverId.equals(server.id.text()) }
                 if (m2SettingCreds) {
                   credentials {