This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository bnd.
commit 873d985b8c4b903312caf56fa24278a327f851bc Author: 殷啟聰 | Kai-Chung Yan <seamli...@gmail.com> Date: Sun Mar 4 11:31:06 2018 +0800 Remove all disabled patches --- debian/patches/OSGi-6-methods.patch | 53 --------- debian/patches/disable-jpm-plugin.patch | 19 --- debian/patches/findbugs.patch | 23 ---- debian/patches/gradle-compatibility.patch | 14 --- debian/patches/no-ee.j2se.patch | 131 --------------------- debian/patches/no-osgi.r5.patch | 37 ------ debian/patches/no_ee_minimum.patch | 62 ---------- .../remove-recursion-in-macro-warning.patch | 15 --- debian/patches/transition_Gradle_3.1.patch | 32 ----- 9 files changed, 386 deletions(-) diff --git a/debian/patches/OSGi-6-methods.patch b/debian/patches/OSGi-6-methods.patch deleted file mode 100644 index cd315f6..0000000 --- a/debian/patches/OSGi-6-methods.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Markus Koschany <a...@debian.org> -Date: Fri, 5 Jun 2015 23:41:41 +0200 -Subject: OSGi 6 methods - -Fix FTBFS due to unimplemented methods. - -Forwarded: not-needed ---- - biz.aQute.launcher/src/aQute/launcher/minifw/Context.java | 6 ++++++ - biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java -index a3d872a..07ac65e 100644 ---- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java -+++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java -@@ -357,4 +357,10 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu - java.util.Dictionary<java.lang.String,?> properties) { - throw new UnsupportedOperationException(); - } -+ public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) { -+ return null; -+ } -+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) { -+ return null; -+ } - } -diff --git a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java -index 8939ce6..50c4bd2 100644 ---- a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java -+++ b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java -@@ -27,6 +27,9 @@ public class MiniFramework implements Framework, Bundle, BundleContext { - state = Bundle.ACTIVE; - } - -+ public void init(FrameworkListener... listeners) throws BundleException { -+ } -+ - public FrameworkEvent waitForStop(long timeout) throws InterruptedException { - long deadline = System.currentTimeMillis() + timeout; - -@@ -315,5 +318,11 @@ public class MiniFramework implements Framework, Bundle, BundleContext { - java.util.Dictionary<java.lang.String,?> properties) { - throw new UnsupportedOperationException(); - } -+ public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) { -+ return null; -+ } - -+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) { -+ return null; -+ } - } diff --git a/debian/patches/disable-jpm-plugin.patch b/debian/patches/disable-jpm-plugin.patch deleted file mode 100644 index 51c5f03..0000000 --- a/debian/patches/disable-jpm-plugin.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Disable the JPM plugin (not available in the bootstrap jar) -Author: Emmanuel Bourg <ebo...@apache.org> -Forwarded: not-needed ---- a/cnf/ext/repositories.bnd -+++ b/cnf/ext/repositories.bnd -@@ -2,13 +2,6 @@ - aQute.lib.deployer.FileRepo;name='Main' ;location=${repo},\ - aQute.lib.deployer.FileRepo;name='Release';location=${releaserepo},\ - aQute.bnd.signing.JartoolSigner, \ -- aQute.bnd.jpm.Repository; \ -- includeStaged=true; \ -- name=JPM; \ -- location=~/.bnd/shacache; \ -- index=${workspace}/cnf/jpm4j.json; \ -- depository.group=bndtools; \ -- depository.name=dist, \ - - - -releaserepo: Release diff --git a/debian/patches/findbugs.patch b/debian/patches/findbugs.patch deleted file mode 100644 index e526be8..0000000 --- a/debian/patches/findbugs.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Markus Koschany <a...@debian.org> -Date: Thu, 14 May 2015 15:46:26 +0200 -Subject: findbugs - -Change fileset dir to /usr/share/java where all required jar files for findbugs -can be found on Debian systems. - -Forwarded: not-needed ---- - cnf/build.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/cnf/build.xml -+++ b/cnf/build.xml -@@ -123,7 +123,7 @@ - - <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"> - <classpath> -- <fileset dir="${workspacedir}/cnf/findbugs/lib"> -+ <fileset dir="/usr/share/java"> - <include name="**/*.jar" /> - </fileset> - </classpath> diff --git a/debian/patches/gradle-compatibility.patch b/debian/patches/gradle-compatibility.patch deleted file mode 100644 index eabab8a..0000000 --- a/debian/patches/gradle-compatibility.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fix the compatibility with the version of Gradle in Debian -Origin: backport, https://github.com/bndtools/bnd/commit/72d9e5b -Bug: https://github.com/bndtools/bnd/issues/799 ---- a/settings.gradle -+++ b/settings.gradle -@@ -24,7 +24,7 @@ - configurations.classpath.resolutionStrategy.cacheChangingModulesFor 30, 'minutes' - dependencies { - components { -- eachComponent { ComponentMetadataDetails details -> -+ all { ComponentMetadataDetails details -> - details.changing = true - } - } diff --git a/debian/patches/no-ee.j2se.patch b/debian/patches/no-ee.j2se.patch deleted file mode 100644 index 96c2ba9..0000000 --- a/debian/patches/no-ee.j2se.patch +++ /dev/null @@ -1,131 +0,0 @@ -From: Markus Koschany <a...@debian.org> -Date: Thu, 14 May 2015 13:21:39 +0200 -Subject: no ee.j2se - -We already ship a full-blown JDK in Debian. - -Forwarded: not-needed ---- a/aQute.libg/bnd.bnd -+++ b/aQute.libg/bnd.bnd -@@ -1,5 +1,4 @@ ---buildpath: \ -- ee.j2se;version=${javac.ee} -+-buildpath: - -testpath: \ - com.springsource.junit - ---- a/biz.aQute.bnd/bnd.bnd -+++ b/biz.aQute.bnd/bnd.bnd -@@ -43,7 +43,6 @@ - biz.aQute.launcher - - -buildpath: aQute.libg;version=latest,\ -- ee.j2se;version=${javac.ee},\ - biz.aQute.bndlib;version=project,\ - org.apache.tools.ant,\ - org.osgi.service.component.annotations;version=6.0.0,\ ---- a/biz.aQute.bndlib.tests/bnd.bnd -+++ b/biz.aQute.bndlib.tests/bnd.bnd -@@ -10,7 +10,6 @@ - osgi.core;version=@5,\ - osgi.cmpn;version=@4.3.1,\ - junit.osgi;version=3.8.2,\ -- ee.j2se;version=${javac.ee},\ - org.mockito.mockito-all;version=1.9.0 - - -runtrace: true ---- a/biz.aQute.jpm/bnd.bnd -+++ b/biz.aQute.jpm/bnd.bnd -@@ -24,7 +24,6 @@ - Bundle-Version: 1.0.2 - - -buildpath: aQute.libg;version=project,\ -- ee.j2se;version=${javac.ee},\ - biz.aQute.bndlib;version=latest,\ - aQute.jpm.clnt;version=2.1, \ - lib/WinRun4J.jar;version=file ---- a/biz.aQute.launcher/bnd.bnd -+++ b/biz.aQute.launcher/bnd.bnd -@@ -4,8 +4,7 @@ - - -buildpath: biz.aQute.bndlib;version=project,\ - aQute.libg;version=project,\ -- osgi.core;version=4.3.1,\ -- ee.j2se;version=${javac.ee} -+ osgi.core;version=4.3.1 - -testpath: \ - junit.osgi;version=3.8.2 - ---- a/biz.aQute.repository/bnd.bnd -+++ b/biz.aQute.repository/bnd.bnd -@@ -17,7 +17,6 @@ - osgi.cmpn;version=4.3.1,\ - osgi.r5;version=1.0.1,\ - javax.xml.stream-1.0.1.jar;version=file,\ -- ee.j2se;version=${javac.ee},\ - ${jetty.libs},\ - aQute.jpm.bndrepo;version=1.0 - -testpath: \ ---- a/biz.aQute.resolve/bnd.bnd -+++ b/biz.aQute.resolve/bnd.bnd -@@ -8,7 +8,6 @@ - osgi.r5;version=1.0.1,\ - biz.aQute.bndlib;version=snapshot,\ - biz.aQute.repository;version=snapshot,\ -- ee.j2se;version=${javac.ee},\ - org.apache.felix.resolver;version=1.1,\ - osgi.cmpn;version=4.3.1 - -testpath: \ ---- a/biz.aQute.bnd.annotation/bnd.bnd -+++ b/biz.aQute.bnd.annotation/bnd.bnd -@@ -5,5 +5,4 @@ - Export-Package: aQute.bnd.annotation.* - - -buildpath: \ -- ee.j2se;version=${javac.ee},\ - biz.aQute.bndlib;version=project ---- a/biz.aQute.bnd.gradle/bnd.bnd -+++ b/biz.aQute.bnd.gradle/bnd.bnd -@@ -10,7 +10,6 @@ - Bundle-Description: The bnd gradle plugin. - - -buildpath: \ -- ee.j2se;version=${javac.ee}, \ - aQute.libg;version=latest, \ - biz.aQute.bndlib;version=latest - ---- a/biz.aQute.bnd.test/bnd.bnd -+++ b/biz.aQute.bnd.test/bnd.bnd -@@ -5,7 +5,6 @@ - - - -buildpath: \ -- ee.j2se;version=${javac.ee},\ - aQute.libg;version=project,\ - biz.aQute.bndlib;version=project,\ - osgi.core;version=4.3.1,\ ---- a/biz.aQute.bnd.testextension/bnd.bnd -+++ b/biz.aQute.bnd.testextension/bnd.bnd -@@ -3,5 +3,4 @@ - Extension-Activator: aQute.bnd.ext.test.TestExtension - - -buildpath: \ -- ee.j2se;version=${javac.ee},\ - biz.aQute.bndlib;version=project ---- a/org.osgi.impl.bundle.repoindex.api/bnd.bnd -+++ b/org.osgi.impl.bundle.repoindex.api/bnd.bnd -@@ -1,5 +1,4 @@ - Bundle-Version: 2.0.1.${tstamp} - Export-Package: org.osgi.service.indexer - -buildpath: \ -- ee.j2se;version=${javac.ee},\ - biz.aQute.bnd.annotation;version=latest ---- a/org.osgi.impl.bundle.repoindex.lib/bnd.bnd -+++ b/org.osgi.impl.bundle.repoindex.lib/bnd.bnd -@@ -1,6 +1,5 @@ - -buildpath: \ - org.osgi.impl.bundle.repoindex.api;version=project,\ -- ee.j2se;version=${javac.ee},\ - osgi.core;version=4.3.1,\ - osgi.cmpn;version=4.3.1 - -testpath: \ diff --git a/debian/patches/no-osgi.r5.patch b/debian/patches/no-osgi.r5.patch deleted file mode 100644 index 71140a5..0000000 --- a/debian/patches/no-osgi.r5.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Markus Koschany <a...@debian.org> -Date: Mon, 18 May 2015 15:28:32 +0200 -Subject: no osgi.r5 - -Build without BND specific OSGi jars. - -Forwarded: not-needed ---- - biz.aQute.bnd/bnd.bnd | 3 +-- - biz.aQute.bndlib/bnd.bnd | 3 +-- - dist/bnd.bnd | 2 +- - 3 files changed, 3 insertions(+), 5 deletions(-) - ---- a/biz.aQute.bnd/bnd.bnd -+++ b/biz.aQute.bnd/bnd.bnd -@@ -49,8 +49,7 @@ - org.osgi.service.metatype.annotations;version=6.0.0,\ - osgi.cmpn;version=4.3.1,\ - osgi.core;version=4.3.1,\ -- org.osgi.impl.bundle.bindex,\ -- osgi.r5;version=1.0.1 -+ org.osgi.impl.bundle.bindex - -testpath: \ - junit.osgi - ---- a/biz.aQute.bndlib/bnd.bnd -+++ b/biz.aQute.bndlib/bnd.bnd -@@ -42,8 +42,7 @@ - org.osgi.service.metatype.annotations;version=6.0.0,\ - osgi.cmpn;version=4.3.1,\ - aQute.libg;version=project,\ -- osgi.core;version=4.3.1,\ -- osgi.r5;version=1.0.1,\ -+ osgi.core;version=4.3.1 - - Import-Package: junit.framework;resolution:=optional,\ - org.osgi.resource;resolution:=optional,\ diff --git a/debian/patches/no_ee_minimum.patch b/debian/patches/no_ee_minimum.patch deleted file mode 100644 index 4b943d2..0000000 --- a/debian/patches/no_ee_minimum.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Date: Thu, 14 May 2015 13:17:37 +0200 -Subject: no_ee_minimum - -We already ship a full-blown JDK in Debian. - -Forwarded: not-needed ---- - biz.aQute.bndlib/bnd.bnd | 1 - - biz.aQute.junit/bnd.bnd | 3 +-- - demo/bnd.bnd | 5 +---- - 3 files changed, 2 insertions(+), 7 deletions(-) - ---- a/biz.aQute.bndlib/bnd.bnd -+++ b/biz.aQute.bndlib/bnd.bnd -@@ -44,7 +44,6 @@ - aQute.libg;version=project,\ - osgi.core;version=4.3.1,\ - osgi.r5;version=1.0.1,\ -- ee.j2se;version=${javac.ee} - - Import-Package: junit.framework;resolution:=optional,\ - org.osgi.resource;resolution:=optional,\ ---- a/biz.aQute.junit/bnd.bnd -+++ b/biz.aQute.junit/bnd.bnd -@@ -6,8 +6,7 @@ - osgi.cmpn;version=4.3.1,\ - biz.aQute.bndlib;version=project,\ - aQute.libg;version=project,\ -- osgi.core;version=4.3.1,\ -- ee.j2se;version=${javac.ee} -+ osgi.core;version=4.3.1 - - Tester-Plugin: aQute.junit.plugin.ProjectTesterImpl - ---- a/demo/bnd.bnd -+++ b/demo/bnd.bnd -@@ -25,7 +25,6 @@ - - -buildpath: \ - osgi.core;version=4.3.1,\ -- ee.j2se;version=1.5.0,\ - biz.aQute.bnd.annotation;version=latest,\ - com.springsource.org.junit - ---- a/biz.aQute.launcher/bnd.bnd -+++ b/biz.aQute.launcher/bnd.bnd -@@ -6,7 +6,6 @@ - aQute.libg;version=project,\ - osgi.core;version=4.3.1,\ - ee.j2se;version=${javac.ee} --# ee.minimum;version=1.2.1 - -testpath: \ - junit.osgi;version=3.8.2 - -@@ -17,4 +16,4 @@ - - Bundle-Version: 1.4.0.${tstamp} - --Premain-Class: aQute.launcher.agent.LauncherAgent -\ No newline at end of file -+Premain-Class: aQute.launcher.agent.LauncherAgent diff --git a/debian/patches/remove-recursion-in-macro-warning.patch b/debian/patches/remove-recursion-in-macro-warning.patch deleted file mode 100644 index 417126f..0000000 --- a/debian/patches/remove-recursion-in-macro-warning.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Remove the recursion in macro warnings causing out of memory errors -Origin: backport, https://github.com/bjhargrave/bnd/commit/81f7fdb -Bug: https://github.com/bndtools/bnd/issues/724 -Bug-Debian: https://bugs.debian.org/809602 ---- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java -+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java -@@ -225,7 +225,7 @@ - if (value != null) - return value; - if (!flattening && !key.startsWith("@")) -- domain.warning("No translation found for macro: %s, in %s", key, domain); -+ domain.warning("No translation found for macro: %s", key); - return "${" + key + "}"; - } - diff --git a/debian/patches/transition_Gradle_3.1.patch b/debian/patches/transition_Gradle_3.1.patch deleted file mode 100644 index 794eccf..0000000 --- a/debian/patches/transition_Gradle_3.1.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: Transition to Gradle 3.1 -Author: Kai-Chung Yan (殷啟聰) -Lst-Update: 2016-11-04 ---- a/biz.aQute.bnd.gradle/src/aQute/bnd/gradle/BndPlugin.groovy -+++ b/biz.aQute.bnd.gradle/src/aQute/bnd/gradle/BndPlugin.groovy -@@ -122,7 +122,7 @@ - } - } - -- bnd.ext.allSrcDirs = files(bndProject.getAllsourcepath()) -+ bnd.allSrcDirs = files(bndProject.getAllsourcepath()) - /* Set up dependencies */ - Collection<String> projectDependencies = bndProject.getDependson()*.getName() - dependencies { ---- a/biz.aQute.bnd.gradle/src/aQute/bnd/gradle/BndProperties.groovy -+++ b/biz.aQute.bnd.gradle/src/aQute/bnd/gradle/BndProperties.groovy -@@ -12,6 +12,7 @@ - - class BndProperties { - final Project project -+ public allSrcDirs - BndProperties(Project bndProject) { - this.project = bndProject - } -@@ -46,4 +47,7 @@ - def trimmed(value) { - return (value instanceof String) ? value.trim() : value - } -+ def getProject() { -+ bndProject -+ } - } -- 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