[bnd] 14/32: use-bootstrapped-gradle-plugin.patch: Fixes

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository bnd.

commit e7e091ed2163cf4e60239a570b9c9c15c4b2ed3d
Author: 殷啟聰 | Kai-Chung Yan <seamlikok at gmail.com>
Date:   Sat Mar 3 13:42:51 2018 +0800

    use-bootstrapped-gradle-plugin.patch: Fixes
---
 debian/patches/use-bootstrapped-gradle-plugin.patch | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/patches/use-bootstrapped-gradle-plugin.patch b/debian/patches/use-bootstrapped-gradle-plugin.patch
index b13ec21..3fdab97 100644
--- a/debian/patches/use-bootstrapped-gradle-plugin.patch
+++ b/debian/patches/use-bootstrapped-gradle-plugin.patch
@@ -3,21 +3,30 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/settings.gradle
 +++ b/settings.gradle
-@@ -10,7 +10,7 @@
+@@ -6,11 +6,12 @@
+ buildscript {
+   repositories {
+     maven {
+-      url uri(bnd_repourl)
++      url '/usr/share/maven-repo'
      }
    }
    dependencies {
 -    classpath bnd_plugin
 +    classpath fileTree(dir: 'bootstrap', include: ['*.jar'])
++    classpath 'org.osgi:osgi.cmpn:debian'
    }
    /* Since the files in the repository change with each build, we need to recheck for changes */
    configurations.classpath {
-@@ -31,7 +31,7 @@
+@@ -30,8 +31,10 @@
+   def bndPlugin = files(configurations.classpath.files)
    gradle.projectsLoaded { gradle ->
      gradle.rootProject.buildscript {
++      repositories { maven { url 'file:///usr/share/maven-repo' } }
        dependencies {
 -        classpath bndPlugin
 +        classpath fileTree(dir: 'bootstrap', include: ['*.jar'])
++        classpath 'org.osgi:osgi.cmpn:debian'
        }
      }
    }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git