[bnd] 05/32: Bootstrap the Gradle plugin

[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 effebc3bdb0c6788a5279cfc4325251f161d196c
Author: 殷啟聰 | Kai-Chung Yan <seamlikok at gmail.com>
Date:   Wed Feb 28 17:59:31 2018 +0800

    Bootstrap the Gradle plugin
---
 debian/bootstrap.xml | 15 ++++++++++++---
 debian/control       |  4 +++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/bootstrap.xml b/debian/bootstrap.xml
index d1d3e8f..e1ecfa9 100644
--- a/debian/bootstrap.xml
+++ b/debian/bootstrap.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 
 <project name="bootstrap" default="bootstrap" basedir="..">
+    <property name="compileClasspath" value="/usr/share/java/osgi.core.jar:/usr/share/java/osgi.cmpn.jar:/usr/share/java/bindex.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/osgi.annotation.jar:/usr/share/java/org.apache.felix.resolver.jar"/>
+    <property name="gradleClasspath" value="/usr/share/java/gradle-base-services.jar:/usr/share/java/gradle-base-services-groovy.jar:/usr/share/java/gradle-process-services.jar:/usr/share/java/gradle-core.jar:/usr/share/java/gradle-logging.jar:/usr/share/java/gradle-model-core.jar:/usr/share/java/xz.jar:/usr/share/java/gradle-language-java.jar:/usr/share/java/gradle-language-jvm.jar:/usr/share/java/gradle-plugins.jar:/usr/share/java/gradle-platform-jvm.jar:/usr/share/java/gradle-native.jar"/>
     
     <target name="clean">
         <delete dir="bootstrap"/>
@@ -10,17 +12,24 @@
         <mkdir dir="bootstrap/build"/>
         <javac
                 destdir="bootstrap/build"
-                classpath="/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar:/usr/share/java/bindex.jar"
+                classpath="${compileClasspath}"
                 encoding="UTF-8"
                 debug="true">
             <src path="aQute.libg/src"/>
             <src path="biz.aQute.bndlib/src"/>
-            <src path="biz.aQute.bnd/src"/>
+            <src path="biz.aQute.bnd.annotation/src"/>
+            <src path="biz.aQute.repository/src"/>
+            <src path="org.osgi.impl.bundle.repoindex.api/src"/>
+            <src path="org.osgi.impl.bundle.repoindex.lib/src"/>
+            <src path="biz.aQute.resolve/src"/>
             <exclude name="aQute/bnd/plugin/**"/>
             <exclude name="aQute/bnd/launch/**"/>
             <exclude name="aQute/bnd/classpath/**"/>
             <exclude name="aQute/bnd/jareditor/**"/>
+            <exclude name="aQute/bnd/jpm/**"/>
             <exclude name="aQute/bnd/junit/**"/>
+            <exclude name="aQute/lib/spring/**"/>
+            <exclude name="aQute/p2/**"/>
             <exclude name="swing2swt/**"/>
             <exclude name="biz/aqute/bnd/eclipse/**"/>
             <exclude name="test/**"/>
@@ -31,7 +40,7 @@
 
         <!-- Build the Gradle plugin -->
         <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="/usr/share/java/groovy-all.jar"/>
-        <groovyc srcdir="biz.aQute.bnd.gradle/src" destdir="bootstrap/build" classpath="bootstrap/build:/usr/share/java/slf4j-api.jar:/usr/share/java/gradle-base-services.jar:/usr/share/java/gradle-base-services-groovy.jar:/usr/share/java/gradle-process-services.jar:/usr/share/java/gradle-core.jar:/usr/share/java/gradle-logging.jar"></groovyc>
+        <groovyc srcdir="biz.aQute.bnd.gradle/src" destdir="bootstrap/build" classpath="bootstrap/build:${compileClasspath}:${gradleClasspath}"></groovyc>
 
         <jar destfile="bootstrap/bnd.jar">
            <fileset dir="bootstrap/build/"/>
diff --git a/debian/control b/debian/control
index 780f93b..bc69006 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,10 @@ Build-Depends:
  junit,
  junit4,
  libbindex-java (>= 2.2+svn101),
- libosgi-compendium-java (>= 5.0.0-3~),
+ libfelix-resolver-java,
+ libosgi-compendium-java (>= 6),
  libosgi-core-java (>= 6.0.0),
+ libxz-java,
  maven-repo-helper
 Standards-Version: 4.1.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/bnd.git

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