diff --git a/0001-Disable-removed-commands.patch b/0001-Disable-removed-commands.patch index 26fe2e0..533ce6f 100644 --- a/0001-Disable-removed-commands.patch +++ b/0001-Disable-removed-commands.patch @@ -1,36 +1,27 @@ -From c250eb3ebbb9afb650edc080708c5e4c3cccbb78 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Tue, 4 Oct 2016 18:02:26 +0200 -Subject: [PATCH 1/2] Disable removed commands - ---- - biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 45 ------------------------------- - 1 file changed, 45 deletions(-) - -diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java -index 1cc3216..c669e4a 100644 ---- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java -+++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java -@@ -105,7 +105,6 @@ import aQute.bnd.osgi.Processor; - import aQute.bnd.osgi.Resource; +diff -Napur bnd-5.1.1.REL.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java bnd-5.1.1.REL/biz.aQute.bnd/src/aQute/bnd/main/bnd.java +--- bnd-5.1.1.REL.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java 2020-06-16 23:03:04.000000000 +0200 ++++ bnd-5.1.1.REL/biz.aQute.bnd/src/aQute/bnd/main/bnd.java 2021-02-17 12:56:39.434022335 +0100 +@@ -104,7 +104,6 @@ import aQute.bnd.osgi.Resource; import aQute.bnd.osgi.Verifier; import aQute.bnd.osgi.eclipse.EclipseClasspath; + import aQute.bnd.print.JarPrinter; -import aQute.bnd.repository.maven.provider.NexusCommand; import aQute.bnd.service.Actionable; import aQute.bnd.service.RepositoryPlugin; import aQute.bnd.service.action.Action; -@@ -4064,50 +4063,6 @@ public class bnd extends Processor { +@@ -3905,54 +3904,6 @@ public class bnd extends Processor { } /** - * Resolve command -- * +- * - * @throws Exception - */ - - public void _resolve(ResolveCommand.ResolveOptions options) throws Exception { - ResolveCommand rc = new ResolveCommand(this); -- String help = options._command().subCmd(options, rc); +- String help = options._command() +- .subCmd(options, rc); - if (help != null) - out.println(help); - getInfo(rc); @@ -39,13 +30,14 @@ index 1cc3216..c669e4a 100644 - - /** - * Remote command -- * +- * - * @throws Exception - */ - - public void _remote(RemoteCommand.RemoteOptions options) throws Exception { - RemoteCommand rc = new RemoteCommand(this, options); -- String help = options._command().subCmd(options, rc); +- String help = options._command() +- .subCmd(options, rc); - if (help != null) - out.println(help); - getInfo(rc); @@ -54,22 +46,46 @@ index 1cc3216..c669e4a 100644 - - /** - * Nexus commands -- * +- * - * @throws Exception - */ - - public void _nexus(NexusCommand.NexusOptions options) throws Exception { - NexusCommand rc = new NexusCommand(this, options); -- String help = options._command().subCmd(options, rc); +- String help = options._command() +- .subCmd(options, rc); - if (help != null) - out.println(help); - getInfo(rc); - rc.close(); - } +- - /** * Export a bndrun file */ + interface ExportOptions extends ProjectWorkspaceOptions { +@@ -4462,24 +4413,6 @@ public class bnd extends Processor { + + } + +- @Description("Generate and export reports of a workspace, a project or of a jar.") +- public void _exportreport(ExportReportCommand.ReporterOptions options) throws Exception { +- ExportReportCommand mc = new ExportReportCommand(this); +- mc.run(options); +- getInfo(mc); +- } +- +- @Description("Maintain Maven Bnd Repository GAV files") +- public void _mbr(MbrCommand.MrOptions options) throws Exception { +- MbrCommand c = new MbrCommand(this, options); +- CommandLine cl = new CommandLine(this); +- String s = cl.subCmd(options, c); +- if (s != null) { +- out.println(s); +- } +- getInfo(c); +- } +- + @Description("Generate source code") + interface GenerateOptions extends ProjectWorkspaceOptions { --- -2.13.5 - diff --git a/0001-Port-to-OSGI-7.0.0.patch b/0001-Port-to-OSGI-7.0.0.patch deleted file mode 100644 index d6b5182..0000000 --- a/0001-Port-to-OSGI-7.0.0.patch +++ /dev/null @@ -1,117 +0,0 @@ -From e9469ae2ca9f3d64fd88e0d8aaf8ebeea7bb937d Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Fri, 12 Apr 2019 14:59:30 +0200 -Subject: [PATCH] Port to OSGI 7.0.0 - ---- - .../src/aQute/bnd/main/ReporterLogger.java | 16 +++++++++ - .../src/aQute/bnd/testing/TestingLog.java | 35 +++++++++++++++++++ - 2 files changed, 51 insertions(+) - -diff --git a/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java b/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java -index ce86cd6..735db9c 100644 ---- a/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java -+++ b/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java -@@ -1,5 +1,6 @@ - package aQute.bnd.main; - -+import org.osgi.framework.Bundle; - import org.osgi.framework.ServiceReference; - import org.osgi.service.log.LogService; - import org.slf4j.Logger; -@@ -8,6 +9,7 @@ import org.slf4j.LoggerFactory; - import aQute.service.reporter.Reporter; - - public class ReporterLogger implements LogService { -+ private final static RuntimeException UNSUPPORTED = new UnsupportedOperationException("This method is provided for backwards compatibility"); - private final static Logger logger = LoggerFactory.getLogger(ReporterLogger.class); - - private Reporter reporter; -@@ -108,4 +110,18 @@ public class ReporterLogger implements LogService { - } - } - -+ @Override -+ public org.osgi.service.log.Logger getLogger(String name) {throw UNSUPPORTED;} -+ -+ @Override -+ public org.osgi.service.log.Logger getLogger(Class< ? > clazz) {throw UNSUPPORTED;} -+ -+ @Override -+ public L getLogger(String name, Class loggerType) {throw UNSUPPORTED;} -+ -+ @Override -+ public L getLogger(Class< ? > clazz, Class loggerType) {throw UNSUPPORTED;} -+ -+ @Override -+ public L getLogger(Bundle bundle, String name, Class loggerType) {throw UNSUPPORTED;} - } -diff --git a/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java b/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java -index d9c3e78..ec7dd27 100644 ---- a/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java -+++ b/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java -@@ -8,7 +8,9 @@ import java.util.regex.Pattern; - - import org.osgi.framework.Bundle; - import org.osgi.framework.ServiceReference; -+import org.osgi.service.log.Logger; - import org.osgi.service.log.LogEntry; -+import org.osgi.service.log.LogLevel; - import org.osgi.service.log.LogService; - - import aQute.bnd.annotation.component.Activate; -@@ -26,6 +28,8 @@ import aQute.bnd.testing.TestingLog.Config; - @Component(designate = Config.class) - @SuppressWarnings("rawtypes") - public class TestingLog implements LogService { -+ private final static RuntimeException UNSUPPORTED = new UnsupportedOperationException("This method is provided for backwards compatibility"); -+ - boolean stacktrace; - boolean direct; - int level; -@@ -125,6 +129,22 @@ public class TestingLog implements LogService { - return sb.toString(); - } - } -+ -+ @Override -+ public LogLevel getLogLevel() {throw UNSUPPORTED;} -+ -+ @Override -+ public String getLoggerName() {throw UNSUPPORTED;} -+ -+ @Override -+ public long getSequence() {throw UNSUPPORTED;} -+ -+ @Override -+ public String getThreadInfo() {throw UNSUPPORTED;} -+ -+ @Override -+ public StackTraceElement getLocation() {throw UNSUPPORTED;} -+ - }; - entries.add(entry); - if (direct) -@@ -197,4 +217,19 @@ public class TestingLog implements LogService { - return n != 0; - } - -+ @Override -+ public Logger getLogger(String name) {throw UNSUPPORTED;} -+ -+ @Override -+ public Logger getLogger(Class< ? > clazz) {throw UNSUPPORTED;} -+ -+ @Override -+ public L getLogger(String name, Class loggerType) {throw UNSUPPORTED;} -+ -+ @Override -+ public L getLogger(Class< ? > clazz, Class loggerType) {throw UNSUPPORTED;} -+ -+ @Override -+ public L getLogger(Bundle bundle, String name, Class loggerType) {throw UNSUPPORTED;} -+ - } --- -2.20.1 - diff --git a/0002-Fix-ant-compatibility.patch b/0002-Fix-ant-compatibility.patch index 6dbf457..48bd881 100644 --- a/0002-Fix-ant-compatibility.patch +++ b/0002-Fix-ant-compatibility.patch @@ -8,18 +8,18 @@ Subject: [PATCH 2/2] Fix ant compatibility 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java -index aac8b8a..26dfe59 100644 +index dd438a5..6b714be 100644 --- a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java +++ b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java @@ -220,7 +220,7 @@ public class BndTask extends BaseTask { if (inherit) { Properties projectProperties = new UTF8Properties(); @SuppressWarnings("unchecked") -- Hashtable antProps = getProject().getProperties(); +- Hashtable antProps = getProject().getProperties(); + Hashtable antProps = getProject().getProperties(); projectProperties.putAll(antProps); projectProperties.putAll(builder.getProperties()); builder.setProperties(projectProperties); -- -2.13.5 +2.20.1 diff --git a/0003-Port-to-OSGI-7.0.0.patch b/0003-Port-to-OSGI-7.0.0.patch new file mode 100644 index 0000000..79da882 --- /dev/null +++ b/0003-Port-to-OSGI-7.0.0.patch @@ -0,0 +1,102 @@ +From 64a36cbc8d7c8234dfa2af8670c2e1ea4a5c3909 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Thu, 11 Jul 2019 14:29:26 +0200 +Subject: [PATCH] Port to OSGI 7.0.0 + +--- + .../src/aQute/bnd/junit/ConsoleLogger.java | 62 +++++++++++++++++++ + 1 file changed, 62 insertions(+) + +diff --git a/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java b/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java +index 9c2591f..569b20e 100644 +--- a/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java ++++ b/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java +@@ -15,9 +15,11 @@ import org.osgi.framework.ServiceFactory; + import org.osgi.framework.ServiceReference; + import org.osgi.framework.ServiceRegistration; + import org.osgi.service.log.LogEntry; ++import org.osgi.service.log.LogLevel; + import org.osgi.service.log.LogListener; + import org.osgi.service.log.LogReaderService; + import org.osgi.service.log.LogService; ++import org.osgi.service.log.Logger; + + @Deprecated // see biz.aQute.bnd.remote.junit + public class ConsoleLogger implements LogReaderService { +@@ -76,6 +78,36 @@ public class ConsoleLogger implements LogReaderService { + return time; + } + ++ @Override ++ public LogLevel getLogLevel() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ @Override ++ public String getLoggerName() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ @Override ++ public long getSequence() { ++ // TODO Auto-generated method stub ++ return 0; ++ } ++ ++ @Override ++ public String getThreadInfo() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ @Override ++ public StackTraceElement getLocation() { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ + } + + public class Facade implements LogService { +@@ -112,6 +144,36 @@ public class ConsoleLogger implements LogReaderService { + + } + ++ @Override ++ public Logger getLogger(String name) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ @Override ++ public Logger getLogger(Class clazz) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ @Override ++ public L getLogger(String name, Class loggerType) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ @Override ++ public L getLogger(Class clazz, Class loggerType) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ @Override ++ public L getLogger(Bundle bundle, String name, Class loggerType) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ + } + + public ConsoleLogger(BundleContext context) { +-- +2.20.1 + diff --git a/0004-maven-plugin-dependencies.patch b/0004-maven-plugin-dependencies.patch new file mode 100644 index 0000000..d0d5006 --- /dev/null +++ b/0004-maven-plugin-dependencies.patch @@ -0,0 +1,116 @@ +diff -Natur bnd-5.1.1.REL-orig/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java bnd-5.1.1.REL/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java +--- bnd-5.1.1.REL-orig/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java 2020-06-16 23:03:04.000000000 +0200 ++++ bnd-5.1.1.REL/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java 2021-10-17 22:35:26.583884078 +0200 +@@ -56,7 +56,6 @@ + + import aQute.bnd.build.Project; + import aQute.bnd.header.OSGiHeader; +-import aQute.bnd.maven.lib.configuration.BeanProperties; + import aQute.bnd.osgi.Builder; + import aQute.bnd.osgi.Constants; + import aQute.bnd.osgi.FileResource; +diff -Natur bnd-5.1.1.REL-orig/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/BeanProperties.java bnd-5.1.1.REL/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/BeanProperties.java +--- bnd-5.1.1.REL-orig/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/BeanProperties.java 1970-01-01 01:00:00.000000000 +0100 ++++ bnd-5.1.1.REL/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/BeanProperties.java 2021-10-17 22:35:31.151908789 +0200 +@@ -0,0 +1,101 @@ ++package aQute.bnd.maven.plugin; ++ ++import static java.lang.invoke.MethodHandles.publicLookup; ++ ++import java.lang.invoke.MethodHandle; ++import java.lang.reflect.Array; ++import java.lang.reflect.Modifier; ++import java.util.Iterator; ++import java.util.List; ++import java.util.Properties; ++import java.util.regex.Matcher; ++import java.util.regex.Pattern; ++ ++import org.slf4j.Logger; ++import org.slf4j.LoggerFactory; ++ ++public class BeanProperties extends Properties { ++ private static final Logger logger = LoggerFactory.getLogger(BeanProperties.class); ++ ++ private static final Pattern KEY_P = Pattern ++ .compile("(?[^\\.\\[]+)(?:\\[(?\\d+)\\])?\\.?"); ++ private static final long serialVersionUID = 1L; ++ ++ protected Properties defaults; ++ ++ public BeanProperties() { ++ this(null); ++ } ++ ++ public BeanProperties(Properties defaults) { ++ this.defaults = defaults; ++ } ++ ++ @Override ++ public String getProperty(String key) { ++ final Matcher m = KEY_P.matcher(key); ++ if (!m.find()) { ++ return defaultValue(key); ++ } ++ String name = m.group("name"); ++ Object value = value(name, get(name), m.group("index")); ++ while ((value != null) && m.find()) { ++ name = m.group("name"); ++ value = value(name, getField(value, name), m.group("index")); ++ } ++ return (value != null) ? value.toString() : defaultValue(key); ++ } ++ ++ private String defaultValue(String key) { ++ return (defaults != null) ? defaults.getProperty(key) : null; ++ } ++ ++ private Object getField(Object target, String fieldName) { ++ try { ++ String getterSuffix = Character.toUpperCase(fieldName.charAt(0)) + fieldName.substring(1); ++ Class targetClass = target.getClass(); ++ while (!Modifier.isPublic(targetClass.getModifiers())) { ++ targetClass = targetClass.getSuperclass(); ++ } ++ MethodHandle mh; ++ try { ++ mh = publicLookup().unreflect(targetClass.getMethod("get" + getterSuffix)); ++ } catch (NoSuchMethodException nsme) { ++ mh = publicLookup().unreflect(targetClass.getMethod("is" + getterSuffix)); ++ } ++ return mh.invoke(target); ++ } catch (Error e) { ++ throw e; ++ } catch (Throwable e) { ++ logger.debug("Could not find getter method for field {}", fieldName, e); ++ } ++ return null; ++ } ++ ++ private Object value(String name, Object value, String index) { ++ if ((value == null) || (index == null)) { ++ return value; ++ } ++ try { ++ int i = Integer.parseInt(index); ++ if (value instanceof List) { ++ return ((List) value).get(i); ++ } else if (value instanceof Iterable) { ++ if (i < 0) { ++ throw new IndexOutOfBoundsException("index < 0"); ++ } ++ Iterator iter = ((Iterable) value).iterator(); ++ for (; i > 0; i--) { ++ iter.next(); ++ } ++ return iter.next(); ++ } else if (value.getClass() ++ .isArray()) { ++ return Array.get(value, i); ++ } ++ } catch (Exception e) { ++ logger.debug("Could not find field {}[{}]", name, index, e); ++ } ++ return value; ++ } ++} diff --git a/3.5.0.REL.tar.gz b/3.5.0.REL.tar.gz deleted file mode 100644 index 86b046c..0000000 --- a/3.5.0.REL.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b461470b48d09352d23e440b77cbde758a2351820da831c667c601ad008efebd -size 79949018 diff --git a/aQute.libg-3.5.0.pom b/aQute.libg-3.5.0.pom deleted file mode 100644 index dda1cc3..0000000 --- a/aQute.libg-3.5.0.pom +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - aQute.libg - 3.5.0 - A library to be statically linked. Contains many small utilities. This bundle should not be installed in a framework, it is compile only. - aQute.libg - http://bnd.bndtools.org/ - - Bndtools - http://bndtools.org/ - - - - Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - Apache License, Version 2.0 - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 3.5.0.REL - - - - pkriens - Peter.Kriens@aQute.biz - Peter Kriens - Bndtools - https://github.com/bndtools - - architect - developer - - 1 - - - diff --git a/aQute.libg-5.1.1.pom b/aQute.libg-5.1.1.pom new file mode 100644 index 0000000..e157aea --- /dev/null +++ b/aQute.libg-5.1.1.pom @@ -0,0 +1,86 @@ + + + 4.0.0 + biz.aQute.bnd + aQute.libg + 5.1.1 + A library to be statically linked. Contains many small utilities. This bundle should not be installed in a framework, it is compile only. + aQute.libg + https://bnd.bndtools.org/ + + Bndtools + https://bndtools.org/ + + + + (Apache-2.0 OR EPL-2.0) + https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0 + repo + This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0. + + + + https://github.com/bndtools/bnd + scm:git:https://github.com/bndtools/bnd.git + scm:git:git@github.com:bndtools/bnd.git + 5.1.1.REL + + + + pkriens + Peter.Kriens@aQute.biz + Peter Kriens + Bndtools + https://github.com/bndtools + + architect + developer + + 1 + + + bjhargrave + BJ Hargrave + bj@bjhargrave.com + https://github.com/bjhargrave + IBM + https://developer.ibm.com + + developer + + America/New_York + + + + + org.osgi + osgi.annotation + 7.0.0 + provided + + + org.slf4j + slf4j-api + 1.7.25 + compile + + + org.osgi + org.osgi.util.function + 1.1.0 + compile + + + org.osgi + org.osgi.util.promise + 1.1.1 + compile + + + org.osgi + osgi.core + 6.0.0 + compile + + + diff --git a/aqute-bnd-3.5.0-java8compat.patch b/aqute-bnd-3.5.0-java8compat.patch deleted file mode 100644 index 344ac6b..0000000 --- a/aqute-bnd-3.5.0-java8compat.patch +++ /dev/null @@ -1,386 +0,0 @@ ---- bnd-3.5.0.REL/aQute.libg/src/aQute/lib/io/ByteBufferDataInput.java 2017-09-29 20:03:19.000000000 +0200 -+++ bnd-3.5.0.REL/aQute.libg/src/aQute/lib/io/ByteBufferDataInput.java 2018-11-13 11:54:47.408250050 +0100 -@@ -3,6 +3,7 @@ - import java.io.DataInput; - import java.io.DataInputStream; - import java.io.IOException; -+import java.nio.Buffer; - import java.nio.ByteBuffer; - import java.util.Objects; - public class ByteBufferDataInput implements DataInput { -@@ -32,7 +33,7 @@ - return 0; - } - int skipped = Math.min(n, bb.remaining()); -- bb.position(bb.position() + skipped); -+ ((Buffer)bb).position(bb.position() + skipped); - return skipped; - } - ---- bnd-3.5.0.REL/aQute.libg/src/aQute/lib/io/ByteBufferInputStream.java 2017-09-29 20:03:19.000000000 +0200 -+++ bnd-3.5.0.REL/aQute.libg/src/aQute/lib/io/ByteBufferInputStream.java 2018-11-13 11:53:37.615873907 +0100 -@@ -2,13 +2,14 @@ - - import java.io.IOException; - import java.io.InputStream; -+import java.nio.Buffer; - import java.nio.ByteBuffer; - - public class ByteBufferInputStream extends InputStream { - private final ByteBuffer bb; - - public ByteBufferInputStream(ByteBuffer buffer) { -- buffer.mark(); -+ ((Buffer)buffer).mark(); - bb = buffer; - } - -@@ -37,7 +38,7 @@ - return 0L; - } - int skipped = Math.min((int) n, bb.remaining()); -- bb.position(bb.position() + skipped); -+ ((Buffer)bb).position(bb.position() + skipped); - return skipped; - } - -@@ -48,17 +49,17 @@ - - @Override - public void close() throws IOException { -- bb.position(bb.limit()); -+ ((Buffer)bb).position(((Buffer)bb).limit()); - } - - @Override - public void mark(int readlimit) { -- bb.mark(); -+ ((Buffer)bb).mark(); - } - - @Override - public void reset() throws IOException { -- bb.reset(); -+ ((Buffer)bb).reset(); - } - - @Override ---- bnd-3.5.0.REL/aQute.libg/src/aQute/lib/io/CharBufferReader.java 2017-09-29 20:03:19.000000000 +0200 -+++ bnd-3.5.0.REL/aQute.libg/src/aQute/lib/io/CharBufferReader.java 2018-11-13 11:45:05.349112131 +0100 -@@ -2,13 +2,14 @@ - - import java.io.IOException; - import java.io.Reader; -+import java.nio.Buffer; - import java.nio.CharBuffer; - - public class CharBufferReader extends Reader { - private final CharBuffer cb; - - public CharBufferReader(CharBuffer buffer) { -- buffer.mark(); -+ ((Buffer)buffer).mark(); - cb = buffer; - } - -@@ -25,7 +26,7 @@ - - @Override - public void close() throws IOException { -- cb.position(cb.limit()); -+ ((Buffer)cb).position(((Buffer)cb).limit()); - } - - @Override -@@ -42,7 +43,7 @@ - return 0L; - } - int skipped = Math.min((int) n, cb.remaining()); -- cb.position(cb.position() + skipped); -+ ((Buffer)cb).position(cb.position() + skipped); - return skipped; - } - -@@ -58,11 +59,11 @@ - - @Override - public void mark(int readAheadLimit) throws IOException { -- cb.mark(); -+ ((Buffer)cb).mark(); - } - - @Override - public void reset() throws IOException { -- cb.reset(); -+ ((Buffer)cb).reset(); - } - } ---- bnd-3.5.0.REL/aQute.libg/src/aQute/lib/io/IO.java 2017-09-29 20:03:19.000000000 +0200 -+++ bnd-3.5.0.REL/aQute.libg/src/aQute/lib/io/IO.java 2018-11-13 11:50:46.002948997 +0100 -@@ -23,6 +23,7 @@ - import java.net.MalformedURLException; - import java.net.URL; - import java.net.URLConnection; -+import java.nio.Buffer; - import java.nio.ByteBuffer; - import java.nio.CharBuffer; - import java.nio.channels.Channels; -@@ -196,11 +197,11 @@ - try { - ByteBuffer bb = ByteBuffer.allocateDirect(BUFFER_SIZE); - while (in.read(bb) > 0) { -- bb.flip(); -+ ((Buffer)bb).flip(); - out.write(bb); - bb.compact(); - } -- for (bb.flip(); bb.hasRemaining();) { -+ for (((Buffer)bb).flip(); bb.hasRemaining();) { - out.write(bb); - } - return out; -@@ -216,7 +217,7 @@ - int offset = bb.arrayOffset(); - for (int size; bb.hasRemaining() - && (size = in.read(buffer, offset + bb.position(), bb.remaining())) > 0;) { -- bb.position(bb.position() + size); -+ ((Buffer)bb).position(bb.position() + size); - } - } else { - int length = Math.min(bb.remaining(), BUFFER_SIZE); -@@ -250,7 +251,7 @@ - public static OutputStream copy(ByteBuffer bb, OutputStream out) throws IOException { - if (bb.hasArray()) { - out.write(bb.array(), bb.arrayOffset() + bb.position(), bb.remaining()); -- bb.position(bb.limit()); -+ ((Buffer)bb).position(((Buffer)bb).limit()); - } else { - int length = Math.min(bb.remaining(), BUFFER_SIZE); - byte[] buffer = new byte[length]; -@@ -295,11 +296,11 @@ - try { - ByteBuffer bb = ByteBuffer.allocate(BUFFER_SIZE); - while (in.read(bb) > 0) { -- bb.flip(); -+ ((Buffer)bb).flip(); - md.update(bb); - bb.compact(); - } -- for (bb.flip(); bb.hasRemaining();) { -+ for (((Buffer)bb).flip(); bb.hasRemaining();) { - md.update(bb); - } - return md; -@@ -425,12 +426,12 @@ - ByteBuffer bb = ByteBuffer.allocate(BUFFER_SIZE); - byte[] buffer = bb.array(); - for (int size; (size = in.read(buffer, bb.position(), bb.remaining())) > 0;) { -- bb.position(bb.position() + size); -- bb.flip(); -+ ((Buffer)bb).position(bb.position() + size); -+ ((Buffer)bb).flip(); - out.write(bb); - bb.compact(); - } -- for (bb.flip(); bb.hasRemaining();) { -+ for (((Buffer)bb).flip(); bb.hasRemaining();) { - out.write(bb); - } - return out; -@@ -443,7 +444,7 @@ - try { - ByteBuffer bb = ByteBuffer.allocate(BUFFER_SIZE); - byte[] buffer = bb.array(); -- for (; in.read(bb) > 0; bb.clear()) { -+ for (; in.read(bb) > 0; ((Buffer)bb).clear()) { - out.write(buffer, 0, bb.position()); - } - return out; -@@ -468,7 +469,7 @@ - } - ByteBuffer bb = ByteBuffer.allocate((int) size); - while (in.read(bb) > 0) {} -- bb.flip(); -+ ((Buffer)bb).flip(); - return bb; - } - } ---- bnd-3.5.0.REL/aQute.libg/src/aQute/lib/utf8properties/UTF8Properties.java 2017-09-29 20:03:19.000000000 +0200 -+++ bnd-3.5.0.REL/aQute.libg/src/aQute/lib/utf8properties/UTF8Properties.java 2018-11-13 11:35:27.673997245 +0100 -@@ -10,6 +10,7 @@ - import java.io.Reader; - import java.io.StringWriter; - import java.io.Writer; -+import java.nio.Buffer; - import java.nio.ByteBuffer; - import java.nio.CharBuffer; - import java.nio.charset.CharsetDecoder; -@@ -87,10 +88,10 @@ - } - decoder.reset(); - if (success) { -- return cb.flip().toString(); -+ return ((Buffer)cb).flip().toString(); - } -- bb.rewind(); -- cb.clear(); -+ ((Buffer)bb).rewind(); -+ ((Buffer)cb).clear(); - } - return new String(buffer); // default decoding - } ---- bnd-3.5.0.REL/aQute.libg/test/aQute/lib/io/IOTest.java 2017-09-29 20:03:19.000000000 +0200 -+++ bnd-3.5.0.REL/aQute.libg/test/aQute/lib/io/IOTest.java 2018-11-13 11:57:46.305214231 +0100 -@@ -2,6 +2,7 @@ - - import java.io.File; - import java.io.InputStream; -+import java.nio.Buffer; - import java.nio.ByteBuffer; - import java.nio.file.Files; - -@@ -60,7 +61,7 @@ - assertEquals((int) src.length(), bb.position()); - assertEquals(bb.capacity(), bb.position()); - assertFalse(bb.hasRemaining()); -- bb.flip(); -+ ((Buffer)bb).flip(); - int length = bb.remaining(); - for (int i = 0; i < length; i++) { - assertEquals(file[i], bb.get()); -@@ -73,7 +74,7 @@ - ByteBuffer bb = IO.copy(IO.stream(src), ByteBuffer.allocate((int) src.length() - 8)); - assertEquals(bb.capacity(), bb.position()); - assertFalse(bb.hasRemaining()); -- bb.flip(); -+ ((Buffer)bb).flip(); - int length = bb.remaining(); - for (int i = 0; i < length; i++) { - assertEquals(file[i], bb.get()); -@@ -86,7 +87,7 @@ - ByteBuffer bb = IO.copy(IO.stream(src), ByteBuffer.allocate((int) src.length() + 20)); - assertEquals((int) src.length(), bb.position()); - assertTrue(bb.hasRemaining()); -- bb.flip(); -+ ((Buffer)bb).flip(); - int length = bb.remaining(); - for (int i = 0; i < length; i++) { - assertEquals(file[i], bb.get()); -@@ -100,7 +101,7 @@ - assertEquals((int) src.length(), bb.position()); - assertEquals(bb.capacity(), bb.position()); - assertFalse(bb.hasRemaining()); -- bb.flip(); -+ ((Buffer)bb).flip(); - int length = bb.remaining(); - for (int i = 0; i < length; i++) { - assertEquals(file[i], bb.get()); -@@ -113,7 +114,7 @@ - ByteBuffer bb = IO.copy(IO.stream(src), ByteBuffer.allocateDirect((int) src.length() - 8)); - assertEquals(bb.capacity(), bb.position()); - assertFalse(bb.hasRemaining()); -- bb.flip(); -+ ((Buffer)bb).flip(); - int length = bb.remaining(); - for (int i = 0; i < length; i++) { - assertEquals(file[i], bb.get()); -@@ -126,7 +127,7 @@ - ByteBuffer bb = IO.copy(IO.stream(src), ByteBuffer.allocateDirect((int) src.length() + 20)); - assertEquals((int) src.length(), bb.position()); - assertTrue(bb.hasRemaining()); -- bb.flip(); -+ ((Buffer)bb).flip(); - int length = bb.remaining(); - for (int i = 0; i < length; i++) { - assertEquals(file[i], bb.get()); -@@ -139,7 +140,7 @@ - ByteBuffer bb = IO.copy(IO.stream(src), ByteBuffer.allocateDirect(IOConstants.PAGE_SIZE * 32)); - assertEquals((int) src.length(), bb.position()); - assertTrue(bb.hasRemaining()); -- bb.flip(); -+ ((Buffer)bb).flip(); - int length = bb.remaining(); - for (int i = 0; i < length; i++) { - assertEquals(file[i], bb.get()); -@@ -161,7 +162,7 @@ - for (int i = 1; i < length; i++) { - assertEquals(file[i - 1], wrapped[i]); - } -- slice.flip(); -+ ((Buffer)slice).flip(); - length = slice.remaining(); - for (int i = 0; i < length; i++) { - assertEquals(file[i], slice.get()); ---- bnd-3.5.0.REL/biz.aQute.bndlib/src/aQute/bnd/osgi/Clazz.java 2017-09-29 20:03:19.000000000 +0200 -+++ bnd-3.5.0.REL/biz.aQute.bndlib/src/aQute/bnd/osgi/Clazz.java 2018-11-13 12:06:21.331989997 +0100 -@@ -7,6 +7,7 @@ - import java.lang.annotation.ElementType; - import java.lang.annotation.RetentionPolicy; - import java.lang.reflect.Modifier; -+import java.nio.Buffer; - import java.nio.ByteBuffer; - import java.nio.ByteOrder; - import java.util.Collection; -@@ -1308,7 +1309,7 @@ - int low = bb.getInt(); - int high = bb.getInt(); - try { -- bb.position(bb.position() + (high - low + 1) * 4); -+ ((Buffer)bb).position(bb.position() + (high - low + 1) * 4); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); -@@ -1325,13 +1326,13 @@ - /* deflt = */ - int deflt = bb.getInt(); - int npairs = bb.getInt(); -- bb.position(bb.position() + npairs * 8); -+ ((Buffer)bb).position(bb.position() + npairs * 8); - lastReference = -1; - break; - - default : - lastReference = -1; -- bb.position(bb.position() + OpCodes.OFFSETS[instruction]); -+ ((Buffer)bb).position(bb.position() + OpCodes.OFFSETS[instruction]); - } - } - } ---- bnd-3.5.0.REL/biz.aQute.bndlib/src/aQute/bnd/osgi/URLResource.java 2017-09-29 20:03:19.000000000 +0200 -+++ bnd-3.5.0.REL/biz.aQute.bndlib/src/aQute/bnd/osgi/URLResource.java 2018-11-13 12:01:36.758456308 +0100 -@@ -6,6 +6,7 @@ - import java.io.OutputStream; - import java.net.URL; - import java.net.URLConnection; -+import java.nio.Buffer; - import java.nio.ByteBuffer; - - import aQute.lib.io.IO; -@@ -41,7 +42,7 @@ - return buffer = ByteBuffer.wrap(IO.read(conn.getInputStream())); - } - ByteBuffer bb = IO.copy(conn.getInputStream(), ByteBuffer.allocate(size)); -- bb.flip(); -+ ((Buffer)bb).flip(); - return buffer = bb; - } - ---- bnd-3.5.0.REL/biz.aQute.bndlib/src/aQute/bnd/osgi/ZipResource.java 2017-09-29 20:03:19.000000000 +0200 -+++ bnd-3.5.0.REL/biz.aQute.bndlib/src/aQute/bnd/osgi/ZipResource.java 2018-11-13 12:03:47.143158991 +0100 -@@ -5,6 +5,7 @@ - import java.io.IOException; - import java.io.InputStream; - import java.io.OutputStream; -+import java.nio.Buffer; - import java.nio.ByteBuffer; - import java.util.zip.ZipEntry; - import java.util.zip.ZipFile; -@@ -44,7 +45,7 @@ - return buffer = ByteBuffer.wrap(IO.read(zip.getInputStream(entry))); - } - ByteBuffer bb = IO.copy(zip.getInputStream(entry), ByteBuffer.allocate((int) size)); -- bb.flip(); -+ ((Buffer)bb).flip(); - return buffer = bb; - } - diff --git a/aqute-bnd.changes b/aqute-bnd.changes index c5344fd..8932f75 100644 --- a/aqute-bnd.changes +++ b/aqute-bnd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 18 01:00:32 UTC 2021 - Marcel Witte + +- Update to aqute-bnd 5.1.1 + ------------------------------------------------------------------- Wed Apr 1 08:09:22 UTC 2020 - Fridrich Strba diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 56dcd33..a393339 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -1,7 +1,7 @@ # # spec file for package aqute-bnd # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,26 +17,27 @@ Name: aqute-bnd -Version: 3.5.0 +Version: 5.1.1 Release: 0 Summary: BND Tool # Part of jpm is under BSD, but jpm is not included in binary RPM License: Apache-2.0 Group: Development/Libraries/Java URL: https://bnd.bndtools.org/ -Source0: https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz +Source0: https://github.com/bndtools/bnd/archive/bnd-%{version}.REL.tar.gz Source1: bnd-%{version}.REL-build_xml.tar.xz Source3: https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom Source4: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{version}/biz.aQute.bnd-%{version}.pom Source5: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/%{version}/biz.aQute.bndlib-%{version}.pom Source6: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/%{version}/biz.aQute.bnd.annotation-%{version}.pom +Source7: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.exporters/%{version}/biz.aQute.bnd.exporters-%{version}.pom Patch0: 0001-Disable-removed-commands.patch Patch1: 0002-Fix-ant-compatibility.patch -Patch2: 0001-Port-to-OSGI-7.0.0.patch -Patch3: aqute-bnd-3.5.0-java8compat.patch +Patch2: 0003-Port-to-OSGI-7.0.0.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local +BuildRequires: jline BuildRequires: osgi-annotation BuildRequires: osgi-compendium BuildRequires: osgi-core @@ -63,6 +64,7 @@ The tool is capable of acting as: %package -n aqute-bndlib Summary: BND library Group: Development/Libraries/Java +Requires: mvn(jline:jline) Requires: mvn(org.osgi:osgi.annotation) Requires: mvn(org.osgi:osgi.cmpn) Requires: mvn(org.osgi:osgi.core) @@ -87,15 +89,14 @@ rm -f $(find | grep -E '\.(.ar|exe|tar\.(gz|bz2|xz)|zip)$' | xargs) mkdir -p lib build-jar-repository -s lib \ - slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium ant + slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium ant jline %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -# the commands pull in more dependencies than we want (felix-resolver, jetty) -rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java +# the commands pull in more dependencies than we want (felix-resolver, jetty, jtwig, javapackager) +rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand,ExportReportCommand,MbrCommand,ReporterLogger}.java sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info @@ -104,11 +105,17 @@ pushd aQute.libg cp -p %{SOURCE3} pom.xml %pom_add_dep org.osgi:osgi.cmpn %pom_add_dep org.slf4j:slf4j-api +%pom_remove_dep -r org.osgi:org.osgi.util.function +%pom_remove_dep -r org.osgi:org.osgi.util.promise popd # bndlib.annotations pushd biz.aQute.bnd.annotation cp -p %{SOURCE6} pom.xml +%pom_remove_dep -r org.osgi:org.osgi.namespace.extender +%pom_remove_dep -r org.osgi:org.osgi.namespace.service +%pom_remove_dep -r org.osgi:org.osgi.resource +%pom_remove_dep -r org.osgi:org.osgi.service.serviceloader popd # bndlib @@ -120,6 +127,17 @@ cp -p %{SOURCE5} pom.xml %pom_add_dep org.slf4j:slf4j-api %pom_add_dep biz.aQute.bnd:aQute.libg:%{version} %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version} +%pom_remove_dep -r org.osgi:org.osgi.namespace.extender +%pom_remove_dep -r org.osgi:org.osgi.namespace.service +%pom_remove_dep -r org.osgi:org.osgi.util.function +%pom_remove_dep -r org.osgi:org.osgi.util.promise +popd + +# bnd.exporters +pushd biz.aQute.bnd.exporters +cp -p %{SOURCE7} pom.xml +%pom_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version} +%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version} popd # bnd @@ -139,7 +157,7 @@ popd # maven-plugins pushd maven -rm bnd-shared-maven-lib/src/main/java/aQute/bnd/maven/lib/resolve/DependencyResolver.java +#rm bnd-shared-maven-lib/src/main/java/aQute/bnd/maven/lib/resolve/DependencyResolver.java %pom_remove_dep -r :biz.aQute.resolve %pom_remove_dep -r :biz.aQute.repository # Unavailable reactor dependency - org.osgi.impl.bundle.repoindex.cli @@ -162,12 +180,15 @@ popd %install # jars install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 biz.aQute.bnd.exporters/target/biz.aQute.bnd.exporters-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bnd.exporters.jar install -pm 0644 biz.aQute.bnd.annotation/target/biz.aQute.bnd.annotation-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bnd.annotation.jar install -pm 0644 aQute.libg/target/aQute.libg-%{version}.jar %{buildroot}%{_javadir}/%{name}/aQute.libg.jar install -pm 0644 biz.aQute.bndlib/target/biz.aQute.bndlib-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bndlib.jar install -pm 0644 biz.aQute.bnd/target/biz.aQute.bnd-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bnd.jar # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -pm 0644 biz.aQute.bnd.exporters/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.exporters.pom +%add_maven_depmap %{name}/biz.aQute.bnd.exporters.pom %{name}/biz.aQute.bnd.exporters.jar -f bndlib install -pm 0644 biz.aQute.bnd.annotation/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.annotation.pom %add_maven_depmap %{name}/biz.aQute.bnd.annotation.pom %{name}/biz.aQute.bnd.annotation.jar -f bndlib install -pm 0644 aQute.libg/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/aQute.libg.pom @@ -178,6 +199,7 @@ install -pm 0644 biz.aQute.bnd/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.a %add_maven_depmap %{name}/biz.aQute.bnd.pom %{name}/biz.aQute.bnd.jar -a biz.aQute.bnd:bnd,biz.aQute:bnd # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +mv biz.aQute.bnd.exporters/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bnd.exporters mv biz.aQute.bnd.annotation/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bnd.annotation mv aQute.libg/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/aQute.libg mv biz.aQute.bndlib/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bndlib diff --git a/biz.aQute.bnd-3.5.0.pom b/biz.aQute.bnd-3.5.0.pom deleted file mode 100644 index 5dbc0b6..0000000 --- a/biz.aQute.bnd-3.5.0.pom +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - biz.aQute.bnd - 3.5.0 - This command line utility is the Swiss army knife of OSGi. It provides you with a breadth of tools to understand and manage OSGi based systems. This project basically uses bndlib. - biz.aQute.bnd - http://bnd.bndtools.org/ - - Bndtools - http://bndtools.org/ - - - - Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - Apache License, Version 2.0 - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 3.5.0.REL - - - - pkriens - Peter.Kriens@aQute.biz - Peter Kriens - Bndtools - https://github.com/bndtools - - architect - developer - - 1 - - - diff --git a/biz.aQute.bnd-5.1.1.pom b/biz.aQute.bnd-5.1.1.pom new file mode 100644 index 0000000..07d8171 --- /dev/null +++ b/biz.aQute.bnd-5.1.1.pom @@ -0,0 +1,140 @@ + + + 4.0.0 + biz.aQute.bnd + biz.aQute.bnd + 5.1.1 + This command line utility is the Swiss army knife of OSGi. It provides you with a breadth of tools to understand and manage OSGi based systems. This project basically uses bndlib. + biz.aQute.bnd + https://bnd.bndtools.org/ + + Bndtools + https://bndtools.org/ + + + + (Apache-2.0 OR EPL-2.0) + https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0 + repo + This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0. + + + + https://github.com/bndtools/bnd + scm:git:https://github.com/bndtools/bnd.git + scm:git:git@github.com:bndtools/bnd.git + 5.1.1.REL + + + + pkriens + Peter.Kriens@aQute.biz + Peter Kriens + Bndtools + https://github.com/bndtools + + architect + developer + + 1 + + + bjhargrave + BJ Hargrave + bj@bjhargrave.com + https://github.com/bjhargrave + IBM + https://developer.ibm.com + + developer + + America/New_York + + + + + org.osgi + osgi.core + 6.0.0 + provided + + + org.osgi + org.osgi.service.log + 1.3.0 + provided + + + org.osgi + org.osgi.service.repository + 1.1.0 + provided + + + biz.aQute.bnd + biz.aQute.bndlib + 5.1.1 + provided + + + biz.aQute.bnd + biz.aQute.resolve + 5.1.1 + provided + + + biz.aQute.bnd + biz.aQute.repository + 5.1.1 + provided + + + biz.aQute.bnd + biz.aQute.bnd.exporters + 5.1.1 + provided + + + biz.aQute.bnd + biz.aQute.bnd.reporter + 5.1.1 + provided + + + org.apache.ant + ant + 1.7.1 + provided + + + biz.aQute.bnd + biz.aQute.remote.api + 5.1.1 + provided + + + org.yaml + snakeyaml + 1.15 + provided + + + org.slf4j + slf4j-api + 1.7.25 + provided + + + org.slf4j + slf4j-simple + 1.7.25 + provided + + + jline + jline + 2.14.6 + provided + + + diff --git a/biz.aQute.bnd.annotation-3.5.0.pom b/biz.aQute.bnd.annotation-3.5.0.pom deleted file mode 100644 index 86e37ea..0000000 --- a/biz.aQute.bnd.annotation-3.5.0.pom +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - biz.aQute.bnd.annotation - 3.5.0 - Contains only the annotations for bnd. - bnd Annotations Library - http://www.aQute.biz/Code/Bnd - - Bndtools - http://bndtools.org/ - - - - Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - Apache License, Version 2.0 - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 3.5.0.REL - - - - pkriens - Peter.Kriens@aQute.biz - Peter Kriens - Bndtools - https://github.com/bndtools - - architect - developer - - 1 - - - diff --git a/biz.aQute.bnd.annotation-5.1.1.pom b/biz.aQute.bnd.annotation-5.1.1.pom new file mode 100644 index 0000000..d2176db --- /dev/null +++ b/biz.aQute.bnd.annotation-5.1.1.pom @@ -0,0 +1,86 @@ + + + 4.0.0 + biz.aQute.bnd + biz.aQute.bnd.annotation + 5.1.1 + bnd Annotations Library + biz.aQute.bnd.annotation + https://bnd.bndtools.org/ + + Bndtools + https://bndtools.org/ + + + + (Apache-2.0 OR EPL-2.0) + https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0 + repo + This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0. + + + + https://github.com/bndtools/bnd + scm:git:https://github.com/bndtools/bnd.git + scm:git:git@github.com:bndtools/bnd.git + 5.1.1.REL + + + + pkriens + Peter.Kriens@aQute.biz + Peter Kriens + Bndtools + https://github.com/bndtools + + architect + developer + + 1 + + + bjhargrave + BJ Hargrave + bj@bjhargrave.com + https://github.com/bjhargrave + IBM + https://developer.ibm.com + + developer + + America/New_York + + + + + org.osgi + osgi.annotation + 7.0.0 + compile + + + org.osgi + org.osgi.namespace.extender + 1.0.1 + compile + + + org.osgi + org.osgi.namespace.service + 1.0.0 + compile + + + org.osgi + org.osgi.resource + 1.0.0 + compile + + + org.osgi + org.osgi.service.serviceloader + 1.0.0 + compile + + + diff --git a/biz.aQute.bnd.exporters-5.1.1.pom b/biz.aQute.bnd.exporters-5.1.1.pom new file mode 100644 index 0000000..47bbaf7 --- /dev/null +++ b/biz.aQute.bnd.exporters-5.1.1.pom @@ -0,0 +1,80 @@ + + + 4.0.0 + biz.aQute.bnd + biz.aQute.bnd.exporters + 5.1.1 + biz.aQute.bnd.exporters + biz.aQute.bnd.exporters + https://bnd.bndtools.org/ + + Bndtools + https://bndtools.org/ + + + + (Apache-2.0 OR EPL-2.0) + https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0 + repo + This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0. + + + + https://github.com/bndtools/bnd + scm:git:https://github.com/bndtools/bnd.git + scm:git:git@github.com:bndtools/bnd.git + 5.1.1.REL + + + + pkriens + Peter.Kriens@aQute.biz + Peter Kriens + Bndtools + https://github.com/bndtools + + architect + developer + + 1 + + + bjhargrave + BJ Hargrave + bj@bjhargrave.com + https://github.com/bjhargrave + IBM + https://developer.ibm.com + + developer + + America/New_York + + + + + org.osgi + osgi.core + 6.0.0 + provided + + + org.osgi + org.osgi.service.subsystem + 1.1.0 + provided + + + biz.aQute.bnd + biz.aQute.bndlib + 5.1.1 + compile + + + org.slf4j + slf4j-api + 1.7.25 + compile + + + diff --git a/biz.aQute.bndlib-3.5.0.pom b/biz.aQute.bndlib-3.5.0.pom deleted file mode 100644 index 1d112f0..0000000 --- a/biz.aQute.bndlib-3.5.0.pom +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - biz.aQute.bndlib - 3.5.0 - A Swiss Army Knife for OSGi - bndlib - http://bnd.bndtools.org/ - - Bndtools - http://bndtools.org/ - - - - Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - Apache License, Version 2.0 - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 3.5.0.REL - - - - peter.kriens@aQute.biz - peter.kriens@aQute.biz - - - njbartlett@gmail.com - njbartlett@gmail.com - - - diff --git a/biz.aQute.bndlib-5.1.1.pom b/biz.aQute.bndlib-5.1.1.pom new file mode 100644 index 0000000..9f4a280 --- /dev/null +++ b/biz.aQute.bndlib-5.1.1.pom @@ -0,0 +1,122 @@ + + + 4.0.0 + biz.aQute.bnd + biz.aQute.bndlib + 5.1.1 + bndlib: A Swiss Army Knife for OSGi + biz.aQute.bndlib + https://bnd.bndtools.org/ + + Bndtools + https://bndtools.org/ + + + + (Apache-2.0 OR EPL-2.0) + https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0 + repo + This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0. + + + + https://github.com/bndtools/bnd + scm:git:https://github.com/bndtools/bnd.git + scm:git:git@github.com:bndtools/bnd.git + 5.1.1.REL + + + + pkriens + Peter.Kriens@aQute.biz + Peter Kriens + Bndtools + https://github.com/bndtools + + architect + developer + + 1 + + + bjhargrave + BJ Hargrave + bj@bjhargrave.com + https://github.com/bjhargrave + IBM + https://developer.ibm.com + + developer + + America/New_York + + + + + org.osgi + osgi.annotation + 7.0.0 + provided + + + org.osgi + osgi.core + 6.0.0 + provided + + + org.osgi + org.osgi.namespace.contract + 1.0.0 + provided + + + org.osgi + org.osgi.namespace.extender + 1.0.1 + provided + + + org.osgi + org.osgi.namespace.implementation + 1.0.0 + provided + + + org.osgi + org.osgi.namespace.service + 1.0.0 + provided + + + org.osgi + org.osgi.service.log + 1.3.0 + provided + + + org.osgi + org.osgi.service.repository + 1.1.0 + provided + + + org.osgi + org.osgi.util.function + 1.1.0 + provided + + + org.osgi + org.osgi.util.promise + 1.1.1 + provided + + + org.slf4j + slf4j-api + 1.7.25 + compile + + + diff --git a/bnd-3.5.0.REL-build_xml.tar.xz b/bnd-3.5.0.REL-build_xml.tar.xz deleted file mode 100644 index f53c684..0000000 --- a/bnd-3.5.0.REL-build_xml.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cdff0738b7dcfb37e45b17a5b3311f960c186af89a16947df5cd5e351ba38f8 -size 1920 diff --git a/bnd-5.1.1.REL-build_xml.tar.xz b/bnd-5.1.1.REL-build_xml.tar.xz new file mode 100644 index 0000000..9693f7c --- /dev/null +++ b/bnd-5.1.1.REL-build_xml.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:463d299c107233f71344b51f52a8eb1329a763dfd0ca834ea14872b77006a69f +size 2028 diff --git a/bnd-5.1.1.REL.tar.gz b/bnd-5.1.1.REL.tar.gz new file mode 100644 index 0000000..6a5e179 --- /dev/null +++ b/bnd-5.1.1.REL.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:859b702bd16a1424fd399693398ba49f6e0966333f5ff809b6bd02c0cabf1748 +size 125176106 diff --git a/bnd-maven-plugin.changes b/bnd-maven-plugin.changes index 0025a82..a40b27b 100644 --- a/bnd-maven-plugin.changes +++ b/bnd-maven-plugin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 18 01:00:32 UTC 2021 - Marcel Witte + +- Update to aqute-bnd 5.1.1 + ------------------------------------------------------------------- Wed Apr 3 09:33:04 UTC 2019 - Fridrich Strba diff --git a/bnd-maven-plugin.spec b/bnd-maven-plugin.spec index 68e3e12..12cad42 100644 --- a/bnd-maven-plugin.spec +++ b/bnd-maven-plugin.spec @@ -1,7 +1,7 @@ # # spec file for package bnd-maven-plugin # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,24 +17,27 @@ Name: bnd-maven-plugin -Version: 3.5.0 +Version: 5.1.1 Release: 0 Summary: BND Maven plugin # Part of jpm is under BSD, but jpm is not included in binary RPM License: Apache-2.0 Group: Development/Libraries/Java URL: https://bnd.bndtools.org/ -Source0: https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz +Source0: https://github.com/bndtools/bnd/archive/bnd-%{version}.REL.tar.gz +Patch4: 0004-maven-plugin-dependencies.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.shared:maven-mapping) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-compat) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.eclipse.aether:aether-api) +BuildRequires: mvn(org.osgi:osgi.cmpn) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) BuildArch: noarch @@ -52,18 +55,24 @@ API documentation for %{name}. %prep %setup -q -n bnd-%{version}.REL +%patch4 -p 1 + rm gradlew* rm -f $(find | grep -E '\.(.ar|exe|tar\.(gz|bz2|xz)|zip)$' | xargs) pushd maven -rm bnd-shared-maven-lib/src/main/java/aQute/bnd/maven/lib/resolve/DependencyResolver.java +%pom_remove_dep -r :biz.aQute.bnd.maven %pom_remove_dep -r :biz.aQute.resolve %pom_remove_dep -r :biz.aQute.repository +%pom_remove_dep -r :biz.aQute.bnd.embedded-repo # Unavailable reactor dependency - org.osgi.impl.bundle.repoindex.cli %pom_disable_module bnd-indexer-maven-plugin # Requires unbuilt parts of bnd +%pom_disable_module bnd-baseline-maven-plugin %pom_disable_module bnd-export-maven-plugin +%pom_disable_module bnd-reporter-maven-plugin %pom_disable_module bnd-resolver-maven-plugin +%pom_disable_module bnd-run-maven-plugin %pom_disable_module bnd-testing-maven-plugin # Integration tests require Internet access %pom_remove_plugin -r :maven-invoker-plugin @@ -76,7 +85,7 @@ popd %build pushd maven -%{mvn_build} -- -Dproject.build.sourceEncoding=UTF-8 -Dsource=7 +%{mvn_build} -- -Dproject.build.sourceEncoding=UTF-8 -Dsource=8 popd %install