Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aqute-bnd for openSUSE:Factory checked in at 2021-10-19 23:03:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aqute-bnd (Old) and /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aqute-bnd" Tue Oct 19 23:03:57 2021 rev:6 rq:926192 version:5.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/aqute-bnd/aqute-bnd.changes 2020-04-01 19:18:53.119545882 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/aqute-bnd.changes 2021-10-19 23:04:20.833287112 +0200 @@ -1,0 +2,26 @@ +Tue Oct 19 07:20:57 UTC 2021 - Fridrich Strba <[email protected]> + +- Modified patches: + * 0001-Disable-removed-commands.patch + * 0002-Fix-ant-compatibility.patch + * 0001-Port-to-OSGI-7.0.0.patch -> 0003-Port-to-OSGI-7.0.0.patch + + rediff to changed context +- Added patch: + * 0004-maven-plugin-dependencies.patch + + Do not build a whole artifact, if we need only one source file + +------------------------------------------------------------------- +Mon Oct 18 06:21:29 UTC 2021 - Fridrich Strba <[email protected]> + +- Added patch: + + aqute-bnd-java8compat.patch + + Produce bytecode compatible with Java 8 + +------------------------------------------------------------------- +Thu Feb 18 01:00:32 UTC 2021 - Marcel Witte <[email protected]> + +- Update to aqute-bnd 5.1.1 +- Removed patch: + * aqute-bnd-3.5.0-java8compat.patch + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/aqute-bnd/bnd-maven-plugin.changes 2019-04-05 12:05:11.654592696 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/bnd-maven-plugin.changes 2021-10-19 23:04:20.897287141 +0200 @@ -1,0 +2,33 @@ +Tue Oct 19 07:20:57 UTC 2021 - Fridrich Strba <[email protected]> + +- Modified patches: + * 0001-Disable-removed-commands.patch + * 0002-Fix-ant-compatibility.patch + * 0001-Port-to-OSGI-7.0.0.patch -> 0003-Port-to-OSGI-7.0.0.patch + + rediff to changed context +- Added patch: + * 0004-maven-plugin-dependencies.patch + + Do not build a whole artifact, if we need only one source file + +------------------------------------------------------------------- +Mon Oct 18 06:21:29 UTC 2021 - Fridrich Strba <[email protected]> + +- Added patch: + + aqute-bnd-java8compat.patch + + Produce bytecode compatible with Java 8 + +------------------------------------------------------------------- +Thu Feb 18 01:00:32 UTC 2021 - Marcel Witte <[email protected]> + +- Update to aqute-bnd 5.1.1 +- Removed patch: + * aqute-bnd-3.5.0-java8compat.patch + +------------------------------------------------------------------- +Wed Apr 1 08:09:22 UTC 2020 - Fridrich Strba <[email protected]> + +- Addes patch: + * 0001-Port-to-OSGI-7.0.0.patch + + Port to OSGI 7.0.0 + +------------------------------------------------------------------- Old: ---- 0001-Port-to-OSGI-7.0.0.patch 3.5.0.REL.tar.gz aQute.libg-3.5.0.pom aqute-bnd-3.5.0-java8compat.patch biz.aQute.bnd-3.5.0.pom biz.aQute.bnd.annotation-3.5.0.pom biz.aQute.bndlib-3.5.0.pom bnd-3.5.0.REL-build_xml.tar.xz New: ---- 0003-Port-to-OSGI-7.0.0.patch 0004-maven-plugin-dependencies.patch 5.1.1.REL.tar.gz aQute.libg-5.1.1.pom aqute-bnd-java8compat.patch biz.aQute.bnd-5.1.1.pom biz.aQute.bnd.annotation-5.1.1.pom biz.aQute.bnd.exporters-5.1.1.pom biz.aQute.bndlib-5.1.1.pom bnd-5.1.1.REL-build_xml.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aqute-bnd.spec ++++++ --- /var/tmp/diff_new_pack.jZfvDe/_old 2021-10-19 23:04:22.581287906 +0200 +++ /var/tmp/diff_new_pack.jZfvDe/_new 2021-10-19 23:04:22.585287908 +0200 @@ -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,7 +17,7 @@ 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 @@ -30,13 +30,16 @@ 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 +Patch3: aqute-bnd-java8compat.patch +Patch4: 0004-maven-plugin-dependencies.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local +BuildRequires: jline BuildRequires: osgi-annotation BuildRequires: osgi-compendium BuildRequires: osgi-core @@ -63,6 +66,8 @@ %package -n aqute-bndlib Summary: BND library Group: Development/Libraries/Java +Requires: mvn(biz.aQute.bnd:aQute.libg) +Requires: mvn(biz.aQute.bnd:biz.aQute.bnd.annotation) Requires: mvn(org.osgi:osgi.annotation) Requires: mvn(org.osgi:osgi.cmpn) Requires: mvn(org.osgi:osgi.core) @@ -87,21 +92,25 @@ 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 +%patch4 -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 # libg pushd aQute.libg cp -p %{SOURCE3} pom.xml +%pom_remove_dep :::provided:: +%pom_remove_dep -r org.osgi:org.osgi.util.function +%pom_remove_dep -r org.osgi:org.osgi.util.promise %pom_add_dep org.osgi:osgi.cmpn %pom_add_dep org.slf4j:slf4j-api popd @@ -109,22 +118,33 @@ # 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 pushd biz.aQute.bndlib cp -p %{SOURCE5} pom.xml -%pom_add_dep org.osgi:osgi.annotation -%pom_add_dep org.osgi:osgi.core +%pom_remove_dep :::provided:: %pom_add_dep org.osgi:osgi.cmpn -%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} popd +# bnd.exporters +pushd biz.aQute.bnd.exporters +cp -p %{SOURCE7} pom.xml +%pom_remove_dep :::provided:: +%pom_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version} +%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version} +popd + # bnd pushd biz.aQute.bnd cp -p %{SOURCE4} pom.xml +%pom_remove_dep :::provided:: %pom_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version} %pom_add_dep biz.aQute.bnd:aQute.libg:%{version} %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version} @@ -133,13 +153,12 @@ %pom_add_dep org.osgi:osgi.core %pom_add_dep org.osgi:osgi.cmpn %pom_add_dep org.slf4j:slf4j-api - %pom_add_dep org.slf4j:slf4j-simple::runtime 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 @@ -151,7 +170,6 @@ # Integration tests require Internet access %pom_remove_plugin -r :maven-invoker-plugin %pom_remove_plugin -r :maven-javadoc-plugin - %pom_remove_plugin -r :flatten-maven-plugin popd @@ -162,12 +180,15 @@ %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 @@ %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 ++++++ bnd-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.jZfvDe/_old 2021-10-19 23:04:22.605287917 +0200 +++ /var/tmp/diff_new_pack.jZfvDe/_new 2021-10-19 23:04:22.605287917 +0200 @@ -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,7 +17,7 @@ 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 @@ -25,16 +25,23 @@ Group: Development/Libraries/Java URL: https://bnd.bndtools.org/ Source0: https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz +Patch0: 0001-Disable-removed-commands.patch +Patch1: 0002-Fix-ant-compatibility.patch +Patch2: 0003-Port-to-OSGI-7.0.0.patch +Patch3: aqute-bnd-java8compat.patch +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 +59,29 @@ %prep %setup -q -n bnd-%{version}.REL +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + 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 +94,7 @@ %build pushd maven -%{mvn_build} -- -Dproject.build.sourceEncoding=UTF-8 -Dsource=7 +%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 -Dsource=8 popd %install ++++++ 0001-Disable-removed-commands.patch ++++++ --- /var/tmp/diff_new_pack.jZfvDe/_old 2021-10-19 23:04:22.621287924 +0200 +++ /var/tmp/diff_new_pack.jZfvDe/_new 2021-10-19 23:04:22.621287924 +0200 @@ -1,36 +1,27 @@ -From c250eb3ebbb9afb650edc080708c5e4c3cccbb78 Mon Sep 17 00:00:00 2001 -From: Michael Simacek <[email protected]> -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 @@ - - /** - * 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 @@ - - /** - * 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 - ++++++ 0002-Fix-ant-compatibility.patch ++++++ --- /var/tmp/diff_new_pack.jZfvDe/_old 2021-10-19 23:04:22.629287927 +0200 +++ /var/tmp/diff_new_pack.jZfvDe/_new 2021-10-19 23:04:22.629287927 +0200 @@ -8,18 +8,18 @@ 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<Object,Object> antProps = getProject().getProperties(); +- Hashtable<Object, Object> antProps = getProject().getProperties(); + Hashtable<String,Object> antProps = getProject().getProperties(); projectProperties.putAll(antProps); projectProperties.putAll(builder.getProperties()); builder.setProperties(projectProperties); -- -2.13.5 +2.20.1 ++++++ 0001-Port-to-OSGI-7.0.0.patch -> 0003-Port-to-OSGI-7.0.0.patch ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/0001-Port-to-OSGI-7.0.0.patch 2020-04-01 19:18:52.115545430 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/0003-Port-to-OSGI-7.0.0.patch 2021-10-19 23:04:19.289286411 +0200 @@ -1,117 +1,102 @@ -From e9469ae2ca9f3d64fd88e0d8aaf8ebeea7bb937d Mon Sep 17 00:00:00 2001 +From 64a36cbc8d7c8234dfa2af8670c2e1ea4a5c3909 Mon Sep 17 00:00:00 2001 From: Marian Koncek <[email protected]> -Date: Fri, 12 Apr 2019 14:59:30 +0200 +Date: Thu, 11 Jul 2019 14:29:26 +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(+) + .../src/aQute/bnd/junit/ConsoleLogger.java | 62 +++++++++++++++++++ + 1 file changed, 62 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; +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.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); ++import org.osgi.service.log.Logger; - private Reporter reporter; -@@ -108,4 +110,18 @@ public class ReporterLogger implements LogService { + @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 org.osgi.service.log.Logger getLogger(String name) {throw UNSUPPORTED;} -+ -+ @Override -+ public org.osgi.service.log.Logger getLogger(Class< ? > clazz) {throw UNSUPPORTED;} ++ @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; ++ } + -+ @Override -+ public <L extends org.osgi.service.log.Logger> L getLogger(String name, Class<L> loggerType) {throw UNSUPPORTED;} -+ -+ @Override -+ public <L extends org.osgi.service.log.Logger> L getLogger(Class< ? > clazz, Class<L> loggerType) {throw UNSUPPORTED;} -+ -+ @Override -+ public <L extends org.osgi.service.log.Logger> L getLogger(Bundle bundle, String name, Class<L> 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; + public class Facade implements LogService { +@@ -112,6 +144,36 @@ public class ConsoleLogger implements LogReaderService { - 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 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 extends Logger> L getLogger(String name, Class<L> loggerType) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ @Override ++ public <L extends Logger> L getLogger(Class<?> clazz, Class<L> loggerType) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ @Override ++ public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) { ++ // TODO Auto-generated method stub ++ return null; ++ } + -+ @Override -+ public <L extends Logger> L getLogger(String name, Class<L> loggerType) {throw UNSUPPORTED;} -+ -+ @Override -+ public <L extends Logger> L getLogger(Class< ? > clazz, Class<L> loggerType) {throw UNSUPPORTED;} -+ -+ @Override -+ public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {throw UNSUPPORTED;} -+ - } + } + + public ConsoleLogger(BundleContext context) { -- 2.20.1 ++++++ 0004-maven-plugin-dependencies.patch ++++++ 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("(?<name>[^\\.\\[]+)(?:\\[(?<index>\\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; + } +} ++++++ 3.5.0.REL.tar.gz -> 5.1.1.REL.tar.gz ++++++ /work/SRC/openSUSE:Factory/aqute-bnd/3.5.0.REL.tar.gz /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/5.1.1.REL.tar.gz differ: char 12, line 1 ++++++ aQute.libg-3.5.0.pom -> aQute.libg-5.1.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/aQute.libg-3.5.0.pom 2019-03-22 14:58:24.713907604 +0100 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/aQute.libg-5.1.1.pom 2021-10-19 23:04:20.813287103 +0200 @@ -3,27 +3,27 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>aQute.libg</artifactId> - <version>3.5.0</version> + <version>5.1.1</version> <description>A library to be statically linked. Contains many small utilities. This bundle should not be installed in a framework, it is compile only.</description> <name>aQute.libg</name> - <url>http://bnd.bndtools.org/</url> + <url>https://bnd.bndtools.org/</url> <organization> <name>Bndtools</name> - <url>http://bndtools.org/</url> + <url>https://bndtools.org/</url> </organization> <licenses> <license> - <name>Apache-2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> + <name>(Apache-2.0 OR EPL-2.0)</name> + <url>https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0</url> <distribution>repo</distribution> - <comments>Apache License, Version 2.0</comments> + <comments>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.</comments> </license> </licenses> <scm> <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:[email protected]:bndtools/bnd.git</developerConnection> - <tag>3.5.0.REL</tag> + <tag>5.1.1.REL</tag> </scm> <developers> <developer> @@ -38,5 +38,49 @@ </roles> <timezone>1</timezone> </developer> + <developer> + <id>bjhargrave</id> + <name>BJ Hargrave</name> + <email>[email protected]</email> + <url>https://github.com/bjhargrave</url> + <organization>IBM</organization> + <organizationUrl>https://developer.ibm.com</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>America/New_York</timezone> + </developer> </developers> + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.annotation</artifactId> + <version>7.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.25</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.function</artifactId> + <version>1.1.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.promise</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <version>6.0.0</version> + <scope>compile</scope> + </dependency> + </dependencies> </project> ++++++ aqute-bnd-java8compat.patch ++++++ ++++ 658 lines (skipped) ++++++ biz.aQute.bnd-3.5.0.pom -> biz.aQute.bnd-5.1.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd-3.5.0.pom 2019-03-22 14:58:26.253906543 +0100 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/biz.aQute.bnd-5.1.1.pom 2021-10-19 23:04:20.853287121 +0200 @@ -3,27 +3,27 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd</artifactId> - <version>3.5.0</version> + <version>5.1.1</version> <description>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.</description> <name>biz.aQute.bnd</name> - <url>http://bnd.bndtools.org/</url> + <url>https://bnd.bndtools.org/</url> <organization> <name>Bndtools</name> - <url>http://bndtools.org/</url> + <url>https://bndtools.org/</url> </organization> <licenses> <license> - <name>Apache-2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> + <name>(Apache-2.0 OR EPL-2.0)</name> + <url>https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0</url> <distribution>repo</distribution> - <comments>Apache License, Version 2.0</comments> + <comments>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.</comments> </license> </licenses> <scm> <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:[email protected]:bndtools/bnd.git</developerConnection> - <tag>3.5.0.REL</tag> + <tag>5.1.1.REL</tag> </scm> <developers> <developer> @@ -38,5 +38,103 @@ </roles> <timezone>1</timezone> </developer> + <developer> + <id>bjhargrave</id> + <name>BJ Hargrave</name> + <email>[email protected]</email> + <url>https://github.com/bjhargrave</url> + <organization>IBM</organization> + <organizationUrl>https://developer.ibm.com</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>America/New_York</timezone> + </developer> </developers> + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <version>6.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.log</artifactId> + <version>1.3.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.repository</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.bndlib</artifactId> + <version>5.1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.resolve</artifactId> + <version>5.1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.repository</artifactId> + <version>5.1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.bnd.exporters</artifactId> + <version>5.1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.bnd.reporter</artifactId> + <version>5.1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.remote.api</artifactId> + <version>5.1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.15</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.25</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.25</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>2.14.6</version> + <scope>provided</scope> + </dependency> + </dependencies> </project> ++++++ biz.aQute.bnd.annotation-3.5.0.pom -> biz.aQute.bnd.annotation-5.1.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd.annotation-3.5.0.pom 2019-03-22 14:58:26.469906393 +0100 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/biz.aQute.bnd.annotation-5.1.1.pom 2021-10-19 23:04:20.861287125 +0200 @@ -3,27 +3,27 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.annotation</artifactId> - <version>3.5.0</version> - <description>Contains only the annotations for bnd.</description> - <name>bnd Annotations Library</name> - <url>http://www.aQute.biz/Code/Bnd</url> + <version>5.1.1</version> + <description>bnd Annotations Library</description> + <name>biz.aQute.bnd.annotation</name> + <url>https://bnd.bndtools.org/</url> <organization> <name>Bndtools</name> - <url>http://bndtools.org/</url> + <url>https://bndtools.org/</url> </organization> <licenses> <license> - <name>Apache-2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> + <name>(Apache-2.0 OR EPL-2.0)</name> + <url>https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0</url> <distribution>repo</distribution> - <comments>Apache License, Version 2.0</comments> + <comments>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.</comments> </license> </licenses> <scm> <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:[email protected]:bndtools/bnd.git</developerConnection> - <tag>3.5.0.REL</tag> + <tag>5.1.1.REL</tag> </scm> <developers> <developer> @@ -38,5 +38,49 @@ </roles> <timezone>1</timezone> </developer> + <developer> + <id>bjhargrave</id> + <name>BJ Hargrave</name> + <email>[email protected]</email> + <url>https://github.com/bjhargrave</url> + <organization>IBM</organization> + <organizationUrl>https://developer.ibm.com</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>America/New_York</timezone> + </developer> </developers> + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.annotation</artifactId> + <version>7.0.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.namespace.extender</artifactId> + <version>1.0.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.namespace.service</artifactId> + <version>1.0.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.resource</artifactId> + <version>1.0.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.serviceloader</artifactId> + <version>1.0.0</version> + <scope>compile</scope> + </dependency> + </dependencies> </project> ++++++ biz.aQute.bnd.exporters-5.1.1.pom ++++++ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.exporters</artifactId> <version>5.1.1</version> <description>biz.aQute.bnd.exporters</description> <name>biz.aQute.bnd.exporters</name> <url>https://bnd.bndtools.org/</url> <organization> <name>Bndtools</name> <url>https://bndtools.org/</url> </organization> <licenses> <license> <name>(Apache-2.0 OR EPL-2.0)</name> <url>https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0</url> <distribution>repo</distribution> <comments>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.</comments> </license> </licenses> <scm> <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:[email protected]:bndtools/bnd.git</developerConnection> <tag>5.1.1.REL</tag> </scm> <developers> <developer> <id>pkriens</id> <email>[email protected]</email> <name>Peter Kriens</name> <organization>Bndtools</organization> <organizationUrl>https://github.com/bndtools</organizationUrl> <roles> <role>architect</role> <role>developer</role> </roles> <timezone>1</timezone> </developer> <developer> <id>bjhargrave</id> <name>BJ Hargrave</name> <email>[email protected]</email> <url>https://github.com/bjhargrave</url> <organization>IBM</organization> <organizationUrl>https://developer.ibm.com</organizationUrl> <roles> <role>developer</role> </roles> <timezone>America/New_York</timezone> </developer> </developers> <dependencies> <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.core</artifactId> <version>6.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.subsystem</artifactId> <version>1.1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> <version>5.1.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>1.7.25</version> <scope>compile</scope> </dependency> </dependencies> </project> ++++++ biz.aQute.bndlib-3.5.0.pom -> biz.aQute.bndlib-5.1.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bndlib-3.5.0.pom 2019-03-22 14:58:26.629906283 +0100 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/biz.aQute.bndlib-5.1.1.pom 2021-10-19 23:04:20.881287134 +0200 @@ -3,36 +3,120 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>3.5.0</version> - <description>A Swiss Army Knife for OSGi</description> - <name>bndlib</name> - <url>http://bnd.bndtools.org/</url> + <version>5.1.1</version> + <description>bndlib: A Swiss Army Knife for OSGi</description> + <name>biz.aQute.bndlib</name> + <url>https://bnd.bndtools.org/</url> <organization> <name>Bndtools</name> - <url>http://bndtools.org/</url> + <url>https://bndtools.org/</url> </organization> <licenses> <license> - <name>Apache-2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> + <name>(Apache-2.0 OR EPL-2.0)</name> + <url>https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0</url> <distribution>repo</distribution> - <comments>Apache License, Version 2.0</comments> + <comments>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.</comments> </license> </licenses> <scm> <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:[email protected]:bndtools/bnd.git</developerConnection> - <tag>3.5.0.REL</tag> + <tag>5.1.1.REL</tag> </scm> <developers> <developer> - <id>[email protected]</id> - <email>[email protected]</email> + <id>pkriens</id> + <email>[email protected]</email> + <name>Peter Kriens</name> + <organization>Bndtools</organization> + <organizationUrl>https://github.com/bndtools</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>1</timezone> </developer> <developer> - <id>[email protected]</id> - <email>[email protected]</email> + <id>bjhargrave</id> + <name>BJ Hargrave</name> + <email>[email protected]</email> + <url>https://github.com/bjhargrave</url> + <organization>IBM</organization> + <organizationUrl>https://developer.ibm.com</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>America/New_York</timezone> </developer> </developers> + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.annotation</artifactId> + <version>7.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <version>6.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.namespace.contract</artifactId> + <version>1.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.namespace.extender</artifactId> + <version>1.0.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.namespace.implementation</artifactId> + <version>1.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.namespace.service</artifactId> + <version>1.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.log</artifactId> + <version>1.3.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.repository</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.function</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.promise</artifactId> + <version>1.1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.25</version> + <scope>compile</scope> + </dependency> + </dependencies> </project> ++++++ bnd-3.5.0.REL-build_xml.tar.xz -> bnd-5.1.1.REL-build_xml.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biz.aQute.bnd/build.xml new/biz.aQute.bnd/build.xml --- old/biz.aQute.bnd/build.xml 2019-02-11 17:32:37.765192096 +0100 +++ new/biz.aQute.bnd/build.xml 2021-02-17 10:56:06.000000000 +0100 @@ -28,6 +28,7 @@ <fileset dir="${libdir}"> <include name="**/*.jar"/> </fileset> + <pathelement location="../biz.aQute.bnd.exporters/target/biz.aQute.bnd.exporters-${project.version}.jar"/> <pathelement location="../biz.aQute.bnd.annotation/target/biz.aQute.bnd.annotation-${project.version}.jar"/> <pathelement location="../aQute.libg/target/aQute.libg-${project.version}.jar"/> <pathelement location="../biz.aQute.bndlib/target/biz.aQute.bndlib-${project.version}.jar"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biz.aQute.bnd.annotation/build.xml new/biz.aQute.bnd.annotation/build.xml --- old/biz.aQute.bnd.annotation/build.xml 2019-02-11 17:38:02.242706231 +0100 +++ new/biz.aQute.bnd.annotation/build.xml 2021-02-18 01:47:17.000000000 +0100 @@ -8,6 +8,8 @@ <property file="build.properties"/> + <property name="libdir" value="../lib"/> + <property name="project.artifactId" value="biz.aQute.bnd.annotation"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/> @@ -19,6 +21,16 @@ <property name="reporting.outputDirectory" value="${build.dir}/site"/> <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <fileset dir="${libdir}"> + <include name="**/*.jar"/> + </fileset> + </path> + + <!-- ====================================================================== --> <!-- Cleaning up target --> <!-- ====================================================================== --> @@ -45,6 +57,7 @@ <src> <pathelement location="${build.srcDir}"/> </src> + <classpath refid="build.classpath"/> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"> @@ -78,7 +91,9 @@ serialwarn="false" encoding="UTF-8" linksource="false" - breakiterator="false"/> + breakiterator="false"> + <classpath refid="build.classpath"/> + </javadoc> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biz.aQute.bnd.exporters/build.xml new/biz.aQute.bnd.exporters/build.xml --- old/biz.aQute.bnd.exporters/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/biz.aQute.bnd.exporters/build.xml 2021-02-18 01:47:30.000000000 +0100 @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="biz.aQute.bnd.exporters" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="build.properties"/> + + <property name="libdir" value="../lib"/> + + <property name="project.artifactId" value="biz.aQute.bnd.exporters"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src"/> + <property name="build.resourceDir" value="src"/> + + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <fileset dir="${libdir}"> + <include name="**/*.jar"/> + </fileset> + <pathelement location="../biz.aQute.bnd.annotation/target/biz.aQute.bnd.annotation-${project.version}.jar"/> + <pathelement location="../aQute.libg/target/aQute.libg-${project.version}.jar"/> + <pathelement location="../biz.aQute.bndlib/target/biz.aQute.bndlib-${project.version}.jar"/> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + encoding="UTF-8" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <copy todir="${build.outputDir}"> + <fileset dir="${build.resourceDir}"> + <exclude name="**/*.java"/> + <exclude name="**/packageinfo"/> + </fileset> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + source="${compiler.source}" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + encoding="UTF-8" + linksource="false" + breakiterator="false"> + <classpath refid="build.classpath"/> + </javadoc> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biz.aQute.bnd.reporter/build.xml new/biz.aQute.bnd.reporter/build.xml --- old/biz.aQute.bnd.reporter/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/biz.aQute.bnd.reporter/build.xml 2021-02-17 11:16:13.000000000 +0100 @@ -0,0 +1,124 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="biz.aQute.bnd.reporter" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="build.properties"/> + + <property name="libdir" value="../lib"/> + + <property name="project.artifactId" value="biz.aQute.bnd.reporter"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src"/> + <property name="build.resourceDir" value="src"/> + + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <fileset dir="${libdir}"> + <include name="**/*.jar"/> + </fileset> + <pathelement location="../biz.aQute.bnd.annotation/target/biz.aQute.bnd.annotation-${project.version}.jar"/> + <pathelement location="../aQute.libg/target/aQute.libg-${project.version}.jar"/> + <pathelement location="../biz.aQute.bndlib/target/biz.aQute.bndlib-${project.version}.jar"/> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + encoding="UTF-8" + target="${compiler.target}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <copy todir="${build.outputDir}"> + <fileset dir="${build.resourceDir}"> + <exclude name="**/*.java"/> + <exclude name="**/packageinfo"/> + </fileset> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + source="${compiler.source}" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + encoding="UTF-8" + linksource="false" + breakiterator="false"/> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build.xml new/build.xml --- old/build.xml 2019-02-11 17:35:59.366141014 +0100 +++ new/build.xml 2021-02-17 11:26:32.000000000 +0100 @@ -2,8 +2,8 @@ <project name="parent" default="package" basedir="."> - <property name="project.version" value="3.5.0"/> - <property name="compiler.source" value="1.7"/> + <property name="project.version" value="5.1.1"/> + <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> <property name="project.groupId" value="biz.aQute.bnd"/> @@ -15,6 +15,7 @@ <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="clean"/> <ant antfile="build.xml" dir="aQute.libg" target="clean"/> <ant antfile="build.xml" dir="biz.aQute.bndlib" target="clean"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.exporters" target="clean"/> <ant antfile="build.xml" dir="biz.aQute.bnd" target="clean"/> </target> @@ -26,6 +27,7 @@ <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="compile"/> <ant antfile="build.xml" dir="aQute.libg" target="compile"/> <ant antfile="build.xml" dir="biz.aQute.bndlib" target="compile"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.exporters" target="compile"/> <ant antfile="build.xml" dir="biz.aQute.bnd" target="compile"/> </target> @@ -37,6 +39,7 @@ <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="javadoc"/> <ant antfile="build.xml" dir="aQute.libg" target="javadoc"/> <ant antfile="build.xml" dir="biz.aQute.bndlib" target="javadoc"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.exporters" target="javadoc"/> <ant antfile="build.xml" dir="biz.aQute.bnd" target="javadoc"/> </target> @@ -48,6 +51,7 @@ <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="package"/> <ant antfile="build.xml" dir="aQute.libg" target="package"/> <ant antfile="build.xml" dir="biz.aQute.bndlib" target="package"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.exporters" target="package"/> <ant antfile="build.xml" dir="biz.aQute.bnd" target="package"/> </target>
