beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From al...@apache.org
Subject [beam] branch master updated: [BEAM-6811] only depend on spring.io for pentaho
Date Wed, 13 Mar 2019 19:04:50 GMT
This is an automated email from the ASF dual-hosted git repository.

altay 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 b2e4907  [BEAM-6811] only depend on spring.io for pentaho
     new 78455a8  Merge pull request #8041 from ibzib/no-spring-io
b2e4907 is described below

commit b2e49070a98f9137b38b995a7bdbbb421f951526
Author: Kyle Weaver <kcweaver@google.com>
AuthorDate: Tue Mar 12 14:01:35 2019 -0700

    [BEAM-6811] only depend on spring.io for pentaho
---
 buildSrc/build.gradle                                              | 5 ++++-
 .../src/main/groovy/org/apache/beam/gradle/Repositories.groovy     | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 020000c..62469c3 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -27,7 +27,10 @@ plugins {
 repositories {
   jcenter()
   maven { url "https://plugins.gradle.org/m2/" }
-  maven { url "http://repo.spring.io/plugins-release" }
+  maven {
+    url "https://repo.spring.io/plugins-release/"
+    content { includeGroup "io.spring.gradle" }
+  }
 }
 
 // Dependencies on other plugins used when this plugin is invoked
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/Repositories.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/Repositories.groovy
index 8840d4c..1c59dee 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/Repositories.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/Repositories.groovy
@@ -40,8 +40,11 @@ class Repositories {
       mavenLocal()
       jcenter()
 
-      // Spring for resolving pentaho dependency.
-      maven { url "https://repo.spring.io/plugins-release/" }
+      // Spring only for resolving pentaho dependency.
+      maven {
+        url "https://repo.spring.io/plugins-release/"
+        content { includeGroup "org.pentaho" }
+      }
 
       // Release staging repository
       maven { url "https://oss.sonatype.org/content/repositories/staging/" }


Mime
View raw message