This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository bnd.
commit 966befca62eb64f829c74443c77b0f4cf53e3b31
Author: 殷啟聰 | Kai-Chung Yan <seamli...@gmail.com>
Date: Wed Feb 28 17:56:06 2018 +0800
Refreshed patches and disabled obsolete ones
---
debian/patches/display_bsn_on_missing_bundle.patch | 2 +-
debian/patches/embedded-repo.patch | 11 +-
debian/patches/implement-missing-methods.patch | 18 +--
debian/patches/java8-compatibility.patch | 147 +--------------------
debian/patches/no-osgi-annotations.patch | 30 ++---
debian/patches/reproducible-packages-list.patch | 17 ++-
debian/patches/reproducible-timestamps.patch | 18 +--
debian/patches/series | 6 -
debian/patches/transition_Gradle_3.1.patch | 36 ++---
.../patches/use-bootstrapped-gradle-plugin.patch | 13 +-
10 files changed, 72 insertions(+), 226 deletions(-)
diff --git a/debian/patches/display_bsn_on_missing_bundle.patch
b/debian/patches/display_bsn_on_missing_bundle.patch
index 22100c6..bfd79c3 100644
--- a/debian/patches/display_bsn_on_missing_bundle.patch
+++ b/debian/patches/display_bsn_on_missing_bundle.patch
@@ -12,7 +12,7 @@ Forwarded: no
--- a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
-@@ -964,8 +964,11 @@
+@@ -1166,8 +1166,11 @@
File file = plugin.get(bsn,
version, attrs, blocker);
// and the entry must exist
// if it does, return this as a
result
diff --git a/debian/patches/embedded-repo.patch
b/debian/patches/embedded-repo.patch
index edddb59..24e8aa5 100644
--- a/debian/patches/embedded-repo.patch
+++ b/debian/patches/embedded-repo.patch
@@ -6,12 +6,11 @@ The embedded-repo.jar is not built. To avoid a FTBFS the
error is commented
out.
--- a/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java
-@@ -401,7 +401,7 @@
- return true;
+@@ -485,7 +485,6 @@
+ }
}
-
-- error("Couldn't find
embedded-repo.jar in bundle ");
-+ //error("Couldn't find
embedded-repo.jar in bundle ");
}
- return true;
+- error("Couldn't find
biz.aQute.bnd.embedded-repo on the classpath");
+ return false;
} else
+ return false;
diff --git a/debian/patches/implement-missing-methods.patch
b/debian/patches/implement-missing-methods.patch
index 7c538c6..76d596c 100644
--- a/debian/patches/implement-missing-methods.patch
+++ b/debian/patches/implement-missing-methods.patch
@@ -9,8 +9,8 @@ R6.
Forwarded: no
--- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
+++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
-@@ -370,4 +370,11 @@
- // TODO Auto-generated method stub
+@@ -424,4 +424,11 @@
+ public <A> A adapt(Class<A> type) {
return null;
}
+
@@ -23,18 +23,8 @@ Forwarded: no
}
--- a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
+++ b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
-@@ -28,6 +28,9 @@
- state = Bundle.ACTIVE;
- }
-
-+ public void init(FrameworkListener... listeners) throws BundleException
{
-+ }
-+
- public FrameworkEvent waitForStop(long timeout) throws
InterruptedException {
- long deadline = System.currentTimeMillis() + timeout;
-
-@@ -325,4 +328,12 @@
- // TODO Auto-generated method stub
+@@ -382,4 +382,12 @@
+ public <A> A adapt(Class<A> type) {
return null;
}
+
diff --git a/debian/patches/java8-compatibility.patch
b/debian/patches/java8-compatibility.patch
index de4c41e..93f75e5 100644
--- a/debian/patches/java8-compatibility.patch
+++ b/debian/patches/java8-compatibility.patch
@@ -1,155 +1,14 @@
Description: Fixes the compilation errors with Java 8
Author: Emmanuel Bourg
Forwarded: no
---- a/biz.aQute.bndlib/src/aQute/bnd/signing/Signer.java
-+++ b/biz.aQute.bndlib/src/aQute/bnd/signing/Signer.java
-@@ -8,7 +8,7 @@
- import java.util.regex.*;
-
- import aQute.bnd.osgi.*;
--import aQute.lib.base64.*;
-+import aQute.lib.base64.Base64;
- import aQute.lib.io.*;
-
- /**
---- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java
-+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java
-@@ -11,7 +11,7 @@
- import java.util.zip.*;
-
- import aQute.bnd.version.*;
--import aQute.lib.base64.*;
-+import aQute.lib.base64.Base64;
- import aQute.lib.io.*;
- import aQute.lib.zip.*;
- import aQute.service.reporter.*;
---- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
-+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
-@@ -42,7 +42,7 @@
- import aQute.bnd.service.classparser.*;
- import aQute.bnd.version.*;
- import aQute.bnd.version.Version;
--import aQute.lib.base64.*;
-+import aQute.lib.base64.Base64;
- import aQute.lib.collections.*;
- import aQute.lib.filter.*;
- import aQute.lib.hex.*;
---- a/aQute.libg/src/aQute/lib/converter/Converter.java
-+++ b/aQute.libg/src/aQute/lib/converter/Converter.java
-@@ -5,7 +5,7 @@
- import java.util.concurrent.*;
- import java.util.regex.*;
-
--import aQute.lib.base64.*;
-+import aQute.lib.base64.Base64;
-
- /**
- * General Java type converter from an object to any type. Supports number
---- a/aQute.libg/src/aQute/lib/json/ByteArrayHandler.java
-+++ b/aQute.libg/src/aQute/lib/json/ByteArrayHandler.java
-@@ -5,7 +5,7 @@
- import java.util.*;
- import java.util.regex.*;
-
--import aQute.lib.base64.*;
-+import aQute.lib.base64.Base64;
- import aQute.lib.hex.*;
-
- /**
---- a/aQute.libg/src/aQute/lib/json/FileHandler.java
-+++ b/aQute.libg/src/aQute/lib/json/FileHandler.java
-@@ -4,7 +4,7 @@
- import java.lang.reflect.*;
- import java.util.*;
-
--import aQute.lib.base64.*;
-+import aQute.lib.base64.Base64;
-
- public class FileHandler extends Handler {
-
---- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-+++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-@@ -43,7 +43,7 @@
- import aQute.bnd.service.repository.SearchableRepository.ResourceDescriptor;
- import aQute.bnd.version.*;
- import aQute.configurable.*;
--import aQute.lib.base64.*;
-+import aQute.lib.base64.Base64;
- import aQute.lib.collections.*;
- import aQute.lib.filter.*;
- import aQute.lib.getopt.*;
---- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Verifier.java
-+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Verifier.java
-@@ -12,7 +12,7 @@
- import aQute.bnd.osgi.Descriptors.TypeRef;
- import aQute.bnd.util.dto.*;
- import aQute.bnd.version.*;
--import aQute.lib.base64.*;
-+import aQute.lib.base64.Base64;
- import aQute.lib.filter.*;
- import aQute.lib.io.*;
- import aQute.libg.cryptography.*;
---- a/aQute.libg/src/aQute/lib/collections/MultiMap.java
-+++ b/aQute.libg/src/aQute/lib/collections/MultiMap.java
-@@ -80,7 +80,7 @@
- }
- return set.addAll(value);
- }
--
-+/*
- public boolean remove(K key, V value) {
- assert keyClass.isInstance(key);
- assert valueClass.isInstance(value);
-@@ -94,7 +94,7 @@
- remove(key);
- return result;
- }
--
-+*/
- public boolean removeAll(K key, Collection<V> value) {
- assert keyClass.isInstance(key);
- List<V> set = get(key);
--- a/aQute.libg/src/aQute/lib/collections/SortedList.java
+++ b/aQute.libg/src/aQute/lib/collections/SortedList.java
-@@ -467,4 +467,8 @@
- return (SortedSet<T>) empty;
+@@ -465,4 +465,8 @@
+ return (SortedSet<T>) EMPTY;
}
+ public java.util.Spliterator<T> spliterator() {
-+ throw new UnsupportedOperationException();
++ return SortedSet.super.spliterator();
+ }
+
}
---- a/biz.aQute.bndlib/src/aQute/bnd/url/BasicAuthentication.java
-+++ b/biz.aQute.bndlib/src/aQute/bnd/url/BasicAuthentication.java
-@@ -6,7 +6,7 @@
-
- import javax.net.ssl.*;
-
--import aQute.lib.base64.*;
-+import aQute.lib.base64.Base64;
-
- /**
- * Provide Http Basic Authentication. This URL Connection Handler plugin will
---- a/biz.aQute.bndlib/src/aQute/bnd/url/BndAuthentication.java
-+++ b/biz.aQute.bndlib/src/aQute/bnd/url/BndAuthentication.java
-@@ -9,7 +9,7 @@
- import javax.net.ssl.*;
-
- import aQute.bnd.build.*;
--import aQute.lib.base64.*;
-+import aQute.lib.base64.Base64;
- import aQute.lib.hex.*;
- import aQute.lib.settings.*;
-
---- a/aQute.libg/test/aQute/lib/hex/HexTest.java
-+++ b/aQute.libg/test/aQute/lib/hex/HexTest.java
-@@ -3,7 +3,7 @@
- import java.util.*;
-
- import junit.framework.*;
--import aQute.lib.base64.*;
-+import aQute.lib.base64.Base64;
-
- public class HexTest extends TestCase {
-
diff --git a/debian/patches/no-osgi-annotations.patch
b/debian/patches/no-osgi-annotations.patch
index 70fda06..6be7c0a 100644
--- a/debian/patches/no-osgi-annotations.patch
+++ b/debian/patches/no-osgi-annotations.patch
@@ -3,23 +3,23 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/biz.aQute.bndlib/bnd.bnd
+++ b/biz.aQute.bndlib/bnd.bnd
-@@ -38,8 +38,6 @@
- -includeresource: LICENSE, img/=img/, {readme.md}
+@@ -48,8 +48,6 @@
+ -includeresource: ${workspace}/LICENSE,
img/=img/, {readme.md}
-buildpath: \
-- org.osgi.service.component.annotations;version=6.0.0,\
-- 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
+- org.osgi.service.component.annotations;version=latest,\
+- org.osgi.service.metatype.annotations;version=latest,\
+ osgi.annotation;version=6.0.1,\
+ osgi.core;version=@6,\
+ org.osgi.util.function;version=latest,\
--- a/biz.aQute.bnd/bnd.bnd
+++ b/biz.aQute.bnd/bnd.bnd
-@@ -45,8 +45,6 @@
- -buildpath: aQute.libg;version=latest,\
+@@ -40,8 +40,6 @@
+ biz.aQute.bnd.annotation;version=project,\
biz.aQute.bndlib;version=project,\
- org.apache.tools.ant,\
-- org.osgi.service.component.annotations;version=6.0.0,\
-- 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
+ org.apache.ant:ant;version=latest,\
+- org.osgi.service.component.annotations;version=latest,\
+- org.osgi.service.metatype.annotations;version=latest,\
+ osgi.core;version=6.0,\
+ osgi.cmpn;version=6.0,\
+ org.osgi.impl.bundle.bindex;version=latest,\
diff --git a/debian/patches/reproducible-packages-list.patch
b/debian/patches/reproducible-packages-list.patch
index 1f08773..a316281 100644
--- a/debian/patches/reproducible-packages-list.patch
+++ b/debian/patches/reproducible-packages-list.patch
@@ -3,36 +3,39 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: no
--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java
-@@ -6,12 +6,12 @@
+@@ -10,7 +10,7 @@
import aQute.bnd.osgi.Descriptors.PackageRef;
public class Packages implements Map<PackageRef,Attrs> {
- private LinkedHashMap<PackageRef,Attrs> map;
-+ private TreeMap<PackageRef,Attrs> map;
++ private Map<PackageRef,Attrs> map;
static Map<PackageRef,Attrs> EMPTY =
Collections.emptyMap();
+ public static enum QUERY {
+@@ -19,7 +19,7 @@
+
public Packages(Packages other) {
if (other.map != null) {
- map = new
LinkedHashMap<Descriptors.PackageRef,Attrs>(other.map);
-+ map = new
TreeMap<Descriptors.PackageRef,Attrs>(other.map);
++ map = new
java.util.TreeMap<Descriptors.PackageRef,Attrs>(other.map);
}
}
-@@ -100,7 +100,7 @@
+@@ -108,7 +108,7 @@
public Attrs put(PackageRef key, Attrs value) {
if (map == null)
- map = new LinkedHashMap<PackageRef,Attrs>();
-+ map = new TreeMap<PackageRef,Attrs>();
++ map = new java.util.TreeMap<PackageRef,Attrs>();
return map.put(key, value);
}
-@@ -109,7 +109,7 @@
+@@ -117,7 +117,7 @@
if (this.map == null) {
if (map.isEmpty())
return;
- this.map = new LinkedHashMap<PackageRef,Attrs>();
-+ this.map = new TreeMap<PackageRef,Attrs>();
++ this.map = new java.util.TreeMap<PackageRef,Attrs>();
}
this.map.putAll(map);
}
diff --git a/debian/patches/reproducible-timestamps.patch
b/debian/patches/reproducible-timestamps.patch
index bbe5746..ffd2872 100644
--- a/debian/patches/reproducible-timestamps.patch
+++ b/debian/patches/reproducible-timestamps.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: no
--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java
-@@ -456,6 +456,9 @@
+@@ -528,6 +528,9 @@
public Object _now(String args[]) {
verifyCommand(args, _nowHelp, null, 1, 2);
Date now = new Date();
@@ -13,7 +13,7 @@ Forwarded: no
if (args.length == 2) {
if ("long".equals(args[1]))
-@@ -676,6 +679,9 @@
+@@ -747,6 +750,9 @@
public String _tstamp(String args[]) {
String format = "yyyyMMddHHmm";
long now = System.currentTimeMillis();
@@ -25,9 +25,9 @@ Forwarded: no
if (args.length > 1) {
--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
-@@ -628,7 +628,7 @@
- main.putValue(CREATED_BY,
System.getProperty("java.version") + " (" + System.getProperty("java.vendor")
- + ")");
+@@ -704,7 +704,7 @@
+ main.putValue(CREATED_BY,
+
System.getProperty("java.version") + " (" + System.getProperty("java.vendor") +
")");
main.putValue(TOOL, "Bnd-" + getBndVersion());
- main.putValue(BND_LASTMODIFIED, "" +
System.currentTimeMillis());
+ main.putValue(BND_LASTMODIFIED, "" +
(System.getenv("SOURCE_DATE_EPOCH") != null ?
System.getenv("SOURCE_DATE_EPOCH") + "000" : System.currentTimeMillis()));
@@ -36,16 +36,16 @@ Forwarded: no
String exportHeader = printClauses(exports, true);
--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java
-@@ -328,7 +328,7 @@
+@@ -487,7 +487,7 @@
return;
JarEntry ze = new JarEntry(manifestName);
-- ZipUtil.setModifiedTime(ze,lastModified);
+- ZipUtil.setModifiedTime(ze, lastModified);
+ ZipUtil.setModifiedTime(ze, System.getenv("SOURCE_DATE_EPOCH")
!= null ? 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")) :
lastModified);
jout.putNextEntry(ze);
writeManifest(jout);
jout.closeEntry();
-@@ -550,6 +550,9 @@
+@@ -696,6 +696,9 @@
ZipEntry ze = new ZipEntry(path);
ze.setMethod(ZipEntry.DEFLATED);
long lastModified = resource.lastModified();
@@ -55,7 +55,7 @@ Forwarded: no
if (lastModified == 0L) {
lastModified = System.currentTimeMillis();
}
-@@ -573,6 +576,9 @@
+@@ -718,6 +721,9 @@
return;
createDirectories(directories, zip, path);
ZipEntry ze = new ZipEntry(path + '/');
diff --git a/debian/patches/series b/debian/patches/series
index b9ec3aa..f7b2aed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,15 +1,9 @@
-no_ee_minimum.patch
display_bsn_on_missing_bundle.patch
-no-ee.j2se.patch
embedded-repo.patch
implement-missing-methods.patch
-no-osgi.r5.patch
java8-compatibility.patch
no-osgi-annotations.patch
-disable-jpm-plugin.patch
-gradle-compatibility.patch
use-bootstrapped-gradle-plugin.patch
-remove-recursion-in-macro-warning.patch
reproducible-timestamps.patch
reproducible-packages-list.patch
transition_Gradle_3.1.patch
diff --git a/debian/patches/transition_Gradle_3.1.patch
b/debian/patches/transition_Gradle_3.1.patch
index e03cb71..794eccf 100644
--- a/debian/patches/transition_Gradle_3.1.patch
+++ b/debian/patches/transition_Gradle_3.1.patch
@@ -3,36 +3,28 @@ 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
-@@ -57,7 +57,6 @@
- }
- this.preCompileRefresh = project.hasProperty('bnd_preCompileRefresh') ?
parseBoolean(bnd_preCompileRefresh) : false
- extensions.create('bnd', BndProperties, bndProject)
-- bnd.ext.project = bndProject
- convention.plugins.bnd = new BndPluginConvention(this)
-
- buildDir = relativePath(bndProject.targetDir)
-@@ -100,7 +99,7 @@
- output.classesDir = output.resourcesDir =
relativePath(bndProject.testOutput)
+@@ -122,7 +122,7 @@
}
}
-- bnd.ext.allSrcDirs = files(bndProject.allsourcepath)
-+ bnd.allSrcDirs = files(bndProject.allsourcepath)
- /* Set up compile tasks */
- sourceCompatibility = bnd('javac.source', sourceCompatibility)
- def javacTarget = bnd('javac.target', targetCompatibility)
+
+- 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
-@@ -9,6 +9,7 @@
+@@ -12,6 +12,7 @@
class BndProperties {
- private final bndProject
+ final Project project
+ public allSrcDirs
- BndProperties(bndProject) {
- this.bndProject = bndProject
+ BndProperties(Project bndProject) {
+ this.project = bndProject
}
-@@ -36,4 +37,7 @@
- }
- return value
+@@ -46,4 +47,7 @@
+ def trimmed(value) {
+ return (value instanceof String) ? value.trim() : value
}
+ def getProject() {
+ bndProject
diff --git a/debian/patches/use-bootstrapped-gradle-plugin.patch
b/debian/patches/use-bootstrapped-gradle-plugin.patch
index a04daae..b13ec21 100644
--- a/debian/patches/use-bootstrapped-gradle-plugin.patch
+++ b/debian/patches/use-bootstrapped-gradle-plugin.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/settings.gradle
+++ b/settings.gradle
-@@ -18,7 +18,7 @@
+@@ -10,7 +10,7 @@
}
}
dependencies {
@@ -11,4 +11,13 @@ Forwarded: not-needed
+ classpath fileTree(dir: 'bootstrap', include: ['*.jar'])
}
/* Since the files in the repository change with each build, we need to
recheck for changes */
- configurations.classpath.resolutionStrategy.cacheChangingModulesFor 30,
'minutes'
+ configurations.classpath {
+@@ -31,7 +31,7 @@
+ gradle.projectsLoaded { gradle ->
+ gradle.rootProject.buildscript {
+ dependencies {
+- classpath bndPlugin
++ classpath fileTree(dir: 'bootstrap', include: ['*.jar'])
+ }
+ }
+ }
--
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
