geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [geode] Diff for: [GitHub] PurelyApplied merged pull request #3067: GEODE-6259: Correct issues with publish targets
Date Mon, 14 Jan 2019 18:55:37 GMT
diff --git a/ci/pipelines/meta/jinja.template.yml b/ci/pipelines/meta/jinja.template.yml
index e4066724b97..639e3225e86 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -44,6 +44,7 @@ resources:
     - ci/pipelines/geode-build/*
     - ci/pipelines/shared/*
     - ci/pipelines/render.py
+    - ci/pipelines/meta/meta.properties
 - name: geode-images-pipeline
   type: git
   source:
@@ -81,6 +82,7 @@ resources:
     - ci/pipelines/examples/*
     - ci/pipelines/shared/*
     - ci/pipelines/render.py
+    - ci/pipelines/meta/meta.properties
 - name: geode-pr-pipeline
   type: git
   source:
@@ -90,6 +92,7 @@ resources:
     - ci/pipelines/pull-request/*
     - ci/pipelines/shared/*
     - ci/pipelines/render.py
+    - ci/pipelines/meta/meta.properties
 {% endif %}
 - name: geode-metrics-pipeline
   type: git
diff --git a/gradle.properties b/gradle.properties
index 19983a48ea7..6b06c5dfd40 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,8 +31,8 @@
 version = 1.9.0-SNAPSHOT
 
 # Default Maven targets
-mavenSnapshotUrl = "gcs://maven.apachegeode-ci.info/snapshots"
-mavenReleaseUrl = "https://repository.apache.org/service/local/staging/deploy/maven2"
+mavenSnapshotUrl = gcs://maven.apachegeode-ci.info/snapshots
+mavenReleaseUrl = https://repository.apache.org/service/local/staging/deploy/maven2
 
 # Maven also uses the project group as a prefix.
 group = org.apache.geode
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 927aebd7eea..f201d071ba5 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -107,11 +107,15 @@ publishing {
   repositories {
     maven {
       // Use specified mavenRepository if provided, else use release or snapshot defaults.
-      url = project.findProperty("mavenRepository") ||
+      url = project.findProperty("mavenRepository") ?:
           project.isReleaseVersion ? project.mavenReleaseUrl : project.mavenSnapshotUrl
-      credentials {
-        username project.findProperty("mavenUsername")
-        password project.findProperty("mavenPassword")
+      if (url.toString().startsWith("http") || url.toString().startsWith("sftp")) {
+        // Username / password credentials are only supported for http, https, and sftp repos.
+        // See the Gradle documentation on Repository Types for more information.
+        credentials {
+          username project.findProperty("mavenUsername")
+          password project.findProperty("mavenPassword")
+        }
       }
     }
   }


With regards,
Apache Git Services

Mime
View raw message