This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository bnd.
commit 9f620cb44b04b0e1abefb96e4efd7f015af662a9
Author: 殷啟聰 | Kai-Chung Yan <seamli...@gmail.com>
Date: Sat Mar 3 13:41:13 2018 +0800
New build-scripts.patch: Make the build scripts behave without the help of
gradle-debian-helper
---
debian/patches/build-scripts.patch | 265 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 266 insertions(+)
diff --git a/debian/patches/build-scripts.patch
b/debian/patches/build-scripts.patch
new file mode 100644
index 0000000..92b9b55
--- /dev/null
+++ b/debian/patches/build-scripts.patch
@@ -0,0 +1,265 @@
+Description: Make the Build Scripts Buildable
+ This project does not use the standard Gradle plugins to resolve dependencies
so we have to make
+ it behave without the help of "gradle-debian-helper". Changes include:
+ .
+ * Remove "-baseline *": Otherwise errors occur.
+ * Replace the versions specified to dependencies to "latest": Avoid hardcoded
versions.
+ * Remove some remote repositories in "repositories.bnd": Or it attempts to
access internet.
+Author: Kai-Chung Yan (殷啟聰) <seamli...@gmail.com>
+Last-Update: 2018-03-03
+--- a/biz.aQute.bnd.gradle/build.gradle
++++ b/biz.aQute.bnd.gradle/build.gradle
+@@ -15,13 +15,6 @@
+ compileOnly 'org.gradle:gradle-native:2.0'
+ compileOnly 'org.codehaus.groovy:groovy-all:2.3.3'
+ compileOnly 'org.slf4j:slf4j-api:1.7.5'
+-
+- testCompile gradleTestKit()
+- testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
+- exclude module: 'groovy-all'
+- }
+- testCompile localGroovy()
+- testCompile gradleApi()
+ }
+
+ test {
+--- a/aQute.libg/bnd.bnd
++++ b/aQute.libg/bnd.bnd
+@@ -3,8 +3,8 @@
+
+ -buildpath: \
+ slf4j.api;version=latest,\
+- org.osgi.util.function;version=latest,\
+- org.osgi.util.promise;version=latest
++ osgi.core;version=latest,\
++ osgi.cmpn;version=latest
+
+ -testpath: \
+ ${junit}
+@@ -13,7 +13,6 @@
+ Bundle-Description: A library to be statically linked. Contains many small
utilities. This bundle \
+ should not be installed in a framework, it is compile only.
+
+--baseline: *
+ -sources= true
+
+ -fixupmessages.baseline: The bundle version * is too low
+--- a/biz.aQute.bndlib/bnd.bnd
++++ b/biz.aQute.bndlib/bnd.bnd
+@@ -48,11 +48,11 @@
+ -includeresource: ${workspace}/LICENSE,
img/=img/, {readme.md}
+
+ -buildpath: \
+- osgi.annotation;version=6.0.1,\
+- osgi.core;version=@6,\
++ osgi.annotation;version=latest,\
++ osgi.core;version=latest,\
+ org.osgi.util.function;version=latest,\
+ org.osgi.util.promise;version=latest,\
+- osgi.cmpn;version=@6,\
++ osgi.cmpn;version=latest,\
+ aQute.libg;version=project, \
+ biz.aQute.bnd.annotation;version=project,\
+ slf4j.api;version=latest
+@@ -66,7 +66,6 @@
+ Bundle-Developers: peter.kri...@aqute.biz, njbartl...@gmail.com
+ Bundle-Contributors: per.kristian.sore...@comactivity.net,
ferry.hube...@pelagic.nl, b...@bjhargrave.com
+
+--baseline: *
+
+ -fixupmessages: "Export aQute.bnd.http"
+ -fixupmessages.baseline: The bundle version * is too low
+--- a/biz.aQute.bnd/bnd.bnd
++++ b/biz.aQute.bnd/bnd.bnd
+@@ -36,12 +36,12 @@
+ -dependson: biz.aQute.bnd.embedded-repo
+
+ -buildpath: \
+- aQute.libg;version=latest,\
++ aQute.libg;version=project,\
+ biz.aQute.bnd.annotation;version=project,\
+ biz.aQute.bndlib;version=project,\
+- org.apache.ant:ant;version=latest,\
+- osgi.core;version=6.0,\
+- osgi.cmpn;version=6.0,\
++ ant;version=latest,\
++ osgi.core;version=latest,\
++ osgi.cmpn;version=latest,\
+ org.osgi.impl.bundle.bindex;version=latest,\
+ biz.aQute.repository;version=latest,\
+ biz.aQute.resolve;version=latest,\
+--- a/biz.aQute.launcher/bnd.bnd
++++ b/biz.aQute.launcher/bnd.bnd
+@@ -5,7 +5,7 @@
+
+ -buildpath: biz.aQute.bndlib;version=project,\
+ aQute.libg;version=project,\
+- osgi.core;version=4.2,\
++ osgi.core;version=latest,\
+ slf4j.api;version=latest
+
+ -testpath: \
+@@ -21,4 +21,3 @@
+
+ Premain-Class: aQute.launcher.agent.LauncherAgent
+
+--baseline: *
+--- a/biz.aQute.junit/bnd.bnd
++++ b/biz.aQute.junit/bnd.bnd
+@@ -2,8 +2,8 @@
+ -include: ${workspace}/cnf/eclipse/jdt.bnd
+
+ -buildpath: \
+- osgi.core;version=4.2,\
+- osgi.cmpn;version=4.2,\
++ osgi.core;version=latest,\
++ osgi.cmpn;version=latest,\
+ biz.aQute.bndlib;version=project,\
+ aQute.libg;version=project,\
+ ${junit}
+@@ -30,5 +30,4 @@
+ Embedded-Activator: aQute.junit.Activator
+ Bundle-Release: Use main thread for testing, optionally allowing old separate
thread model
+
+--baseline: *
+ -diffpackages: !org.junit.*, *
+--- a/org.osgi.impl.bundle.repoindex.api/bnd.bnd
++++ b/org.osgi.impl.bundle.repoindex.api/bnd.bnd
+@@ -3,6 +3,5 @@
+
+ Export-Package: org.osgi.service.indexer
+ -buildpath: \
+- osgi.annotation;version=6.0.1
++ osgi.annotation;version=latest
+
+--baseline: *
+--- a/org.osgi.impl.bundle.repoindex.lib/bnd.bnd
++++ b/org.osgi.impl.bundle.repoindex.lib/bnd.bnd
+@@ -3,8 +3,8 @@
+
+ -buildpath: \
+ org.osgi.impl.bundle.repoindex.api;version=project,\
+- osgi.core;version=4.3.1,\
+- osgi.cmpn;version=4.3.1
++ osgi.core;version=latest,\
++ osgi.cmpn;version=latest
+ -testpath: \
+ ${junit},\
+ ${mockito}
+@@ -33,4 +33,3 @@
+ org.osgi.service.indexer.impl.types,\
+ org.osgi.service.indexer.impl.util
+
+--baseline: *
+--- a/cnf/ext/junit.bnd
++++ b/cnf/ext/junit.bnd
+@@ -1,4 +1,3 @@
+-junit: org.apache.servicemix.bundles.junit;version="[4.11,5)"
+-mockito: org.mockito.mockito-core;version="[1.9,2)",\
+- org.objenesis;version="[2.1,3)"
++junit: org.apache.servicemix.bundles.junit;version=latest
++mockito:
+ -runsystempackages.objenesis: sun.misc,sun.reflect
+--- a/biz.aQute.remote/bnd.bnd
++++ b/biz.aQute.remote/bnd.bnd
+@@ -7,8 +7,8 @@
+ aQute.agent.server.port = 29998
+
+ -buildpath: \
+- osgi.core;version=@6,\
+- osgi.cmpn;version=@6,\
++ osgi.core;version=latest,\
++ osgi.cmpn;version=latest,\
+ aQute.libg;version=latest,\
+ biz.aQute.bndlib;version=latest,\
+ biz.aQute.junit;version=latest,\
+@@ -29,4 +29,3 @@
+ #
+ -nojunit: true
+
+--baseline: *
+--- a/biz.aQute.resolve/bnd.bnd
++++ b/biz.aQute.resolve/bnd.bnd
+@@ -1,8 +1,8 @@
+ # Set javac settings from JDT prefs
+ -include: ${workspace}/cnf/eclipse/jdt.bnd
+
+--buildpath: osgi.core;version=@5,\
+- osgi.cmpn;version=@5, \
++-buildpath: osgi.core;version=latest,\
++ osgi.cmpn;version=latest, \
+ aQute.libg;version=latest,\
+ biz.aQute.bndlib;version=snapshot,\
+ biz.aQute.repository;version=snapshot,\
+@@ -27,4 +27,3 @@
+
+ -fixupmessages: private references
+
+--baseline: *
+--- a/biz.aQute.repository/bnd.bnd
++++ b/biz.aQute.repository/bnd.bnd
+@@ -11,26 +11,22 @@
+ org.eclipse.jetty.util;version=7.6.3
+
+ -buildpath: \
+- osgi.annotation;version=6.0.1,\
+- osgi.core;version=@6,\
++ osgi.annotation;version=latest,\
++ osgi.core;version=latest,\
+ org.osgi.util.function;version=latest,\
+ org.osgi.util.promise;version=latest,\
+ aQute.libg;version=project,\
+ biz.aQute.bndlib;version=latest,\
+
org.osgi.impl.bundle.bindex;version=latest;packages=org.osgi.*.bindex.*,\
+ org.osgi.impl.bundle.repoindex.lib;version=latest,\
+- osgi.cmpn;version=@6,\
+- javax.xml.stream;version=latest,\
++ osgi.cmpn;version=latest,\
+ slf4j.api;version=latest,\
+- aQute.jpm.clnt;version=latest;packages=*,\
+ org.tukaani.xz;version=latest,\
+ biz.aQute.bnd.annotation;version=latest
+
+ -testpath: \
+ ${junit},\
+ ${mockito},\
+- ${jetty.libs},\
+- biz.aQute.http.testservers;version=latest,\
+ slf4j.simple;version=latest
+
+ bindex-pkgs: \
+@@ -100,4 +96,3 @@
+
+ -fixupmessages: "private references"
+
+--baseline: *
+--- a/biz.aQute.tester/bnd.bnd
++++ b/biz.aQute.tester/bnd.bnd
+@@ -34,8 +34,7 @@
+
+ -buildpath: \
+ biz.aQute.junit;version=latest;packages=aQute.junit.*, \
+- osgi.core;version=4.2,\
++ osgi.core;version=latest,\
+ biz.aQute.bndlib;version=latest,\
+ ${junit}
+
+--baseline: *
+--- a/cnf/ext/repositories.bnd
++++ b/cnf/ext/repositories.bnd
+@@ -4,7 +4,6 @@
+
+ -plugin:\
+ aQute.bnd.repository.maven.provider.MavenBndRepository;\
+- releaseUrl="https://repo1.maven.org/maven2";\
+ index=${.}/central.mvn;\
+ name='Maven Central';\
+ readOnly=true,\
+@@ -18,7 +17,6 @@
+ aQute.bnd.signing.JartoolSigner, \
+ aQute.bnd.repository.osgi.OSGiRepository; \
+ name='Baseline'; \
+- locations=${baselinerepo}/index.xml.gz; \
+ poll.time=-1; \
+ cache=${workspace}/cnf/cache/stable/Baseline
+
diff --git a/debian/patches/series b/debian/patches/series
index f3922a3..60deb51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ no-osgi-annotations.patch
use-bootstrapped-gradle-plugin.patch
reproducible-timestamps.patch
reproducible-packages-list.patch
+build-scripts.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/bnd.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
