diff --git a/.gitignore b/.gitignore index b21555c..9d1f87a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/results_* +/*.src.rpm + /aqute-service.tar.gz /bnd-0.0.363.jar /2.4.1.REL.tar.gz @@ -23,3 +26,8 @@ /biz.aQute.bnd-3.5.0.pom /biz.aQute.bndlib-3.5.0.pom /biz.aQute.bnd.annotation-3.5.0.pom +/4.3.0.REL.tar.gz +/aQute.libg-4.3.0.pom +/biz.aQute.bnd-4.3.0.pom +/biz.aQute.bndlib-4.3.0.pom +/biz.aQute.bnd.annotation-4.3.0.pom diff --git a/0001-Disable-removed-commands.patch b/0001-Disable-removed-commands.patch index 1a6ed57..d9aeb9a 100644 --- a/0001-Disable-removed-commands.patch +++ b/0001-Disable-removed-commands.patch @@ -1,17 +1,17 @@ -From c250eb3ebbb9afb650edc080708c5e4c3cccbb78 Mon Sep 17 00:00:00 2001 +From 4ef3677674f105b633709a974f5744ad77f001b6 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 +Subject: [PATCH 1/4] Disable removed commands --- - biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 45 ------------------------------- - 1 file changed, 45 deletions(-) + biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 48 ----------------------- + 1 file changed, 48 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 +index 3f21168..d6c9ccd 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; +@@ -110,7 +110,6 @@ import aQute.bnd.osgi.Processor; import aQute.bnd.osgi.Resource; import aQute.bnd.osgi.Verifier; import aQute.bnd.osgi.eclipse.EclipseClasspath; @@ -19,18 +19,20 @@ index 1cc3216..c669e4a 100644 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 { +@@ -4213,53 +4212,6 @@ public class bnd extends Processor { + getInfo(profiles); } - /** +- /** - * 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 +41,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 +57,22 @@ 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 - */ + /** + * Export a bndrun file -- -2.13.5 +2.26.2 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 b51897c..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 12d2b1e..0da2bb0 100644 --- a/0002-Fix-ant-compatibility.patch +++ b/0002-Fix-ant-compatibility.patch @@ -1,25 +1,25 @@ -From bb26bdfa9f742a6ae5d39e0312aeadb8e9b48940 Mon Sep 17 00:00:00 2001 +From aa2930336341f50f84a7fd8196d12edf5ca8d2ef Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 12 Sep 2017 18:11:27 +0300 -Subject: [PATCH 2/2] Fix ant compatibility +Subject: [PATCH 2/4] Fix ant compatibility --- biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java | 2 +- 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 f39f9b1..a9db014 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.26.2 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..9a06242 --- /dev/null +++ b/0003-Port-to-OSGI-7.0.0.patch @@ -0,0 +1,149 @@ +From 07705c03182b11f525f87002ae0a687961f91da2 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Thu, 11 Jul 2019 14:29:26 +0200 +Subject: [PATCH 3/4] Port to OSGI 7.0.0 + +--- + .../src/aQute/bnd/main/ReporterLogger.java | 31 ++++++++++ + .../src/aQute/bnd/junit/ConsoleLogger.java | 62 +++++++++++++++++++ + 2 files changed, 93 insertions(+) + +diff --git a/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java b/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java +index 84dd290..287f6fb 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; +@@ -108,4 +109,34 @@ public class ReporterLogger implements LogService { + } + } + ++ @Override ++ public org.osgi.service.log.Logger getLogger(String name) { ++ // TODO Auto-generated method stub ++ return null; ++ } ++ ++ @Override ++ public org.osgi.service.log.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; ++ } ++ + } +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.26.2 + diff --git a/0004-Patch-out-twig-plugin-for-report-generation.patch b/0004-Patch-out-twig-plugin-for-report-generation.patch new file mode 100644 index 0000000..c818bb1 --- /dev/null +++ b/0004-Patch-out-twig-plugin-for-report-generation.patch @@ -0,0 +1,98 @@ +From b2c3aed5b82c92d13997b49c7748bab9781f8d68 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Mon, 27 Jul 2020 16:53:49 +0100 +Subject: [PATCH 4/4] Patch out twig plugin for report generation + +--- + biz.aQute.bnd.reporter/bnd.bnd | 15 --------------- + .../reporter/exporter/ReportExporterBuilder.java | 4 ---- + biz.aQute.bnd/bnd.bnd | 5 ----- + 3 files changed, 24 deletions(-) + +diff --git a/biz.aQute.bnd.reporter/bnd.bnd b/biz.aQute.bnd.reporter/bnd.bnd +index 76fefa9..245a75b 100644 +--- a/biz.aQute.bnd.reporter/bnd.bnd ++++ b/biz.aQute.bnd.reporter/bnd.bnd +@@ -1,27 +1,12 @@ + # Set javac settings from JDT prefs + -include: ${workspace}/cnf/includes/jdt.bnd + +--maven-dependencies.jtwig:\ +- jtwig-core;\ +- groupId=org.jtwig;\ +- artifactId=jtwig-core;\ +- version=5.86.1.RELEASE;\ +- scope=compile,\ +- \ +- jtwig-reflection;\ +- groupId=org.jtwig;\ +- artifactId=jtwig-reflection;\ +- version=5.86.1.RELEASE;\ +- scope=compile +- + -buildpath: \ + osgi.annotation;version=latest;maven-scope=provided,\ + osgi.core;version=latest;maven-scope=provided,\ + aQute.libg;version=project,\ + biz.aQute.bndlib;version=latest,\ + slf4j.api;version=latest,\ +- org.jtwig:jtwig-core;version=latest,\ +- org.jtwig:jtwig-reflection;version=latest,\ + org.parboiled:parboiled-java;version=latest,\ + org.parboiled:parboiled-core;version=latest,\ + org.apache.commons.lang3;version="[3.4,4.0)",\ +diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/exporter/ReportExporterBuilder.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/exporter/ReportExporterBuilder.java +index ca064d2..8f75a74 100644 +--- a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/exporter/ReportExporterBuilder.java ++++ b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/exporter/ReportExporterBuilder.java +@@ -10,7 +10,6 @@ import biz.aQute.bnd.reporter.plugins.resource.converter.PropertiesConverterPlug + import biz.aQute.bnd.reporter.plugins.resource.converter.XmlConverterPlugin; + import biz.aQute.bnd.reporter.plugins.serializer.JsonReportSerializerPlugin; + import biz.aQute.bnd.reporter.plugins.serializer.XmlReportSerializerPlugin; +-import biz.aQute.bnd.reporter.plugins.transformer.JtwigTransformerPlugin; + import biz.aQute.bnd.reporter.plugins.transformer.XsltTransformerPlugin; + + /** +@@ -112,9 +111,6 @@ public class ReportExporterBuilder { + if (processor.getPlugin(XmlReportSerializerPlugin.class) == null) { + processor.addBasicPlugin(new XmlReportSerializerPlugin()); + } +- if (processor.getPlugin(JtwigTransformerPlugin.class) == null) { +- processor.addBasicPlugin(new JtwigTransformerPlugin()); +- } + if (processor.getPlugin(XsltTransformerPlugin.class) == null) { + processor.addBasicPlugin(new XsltTransformerPlugin()); + } +diff --git a/biz.aQute.bnd/bnd.bnd b/biz.aQute.bnd/bnd.bnd +index 2c91999..3ff7f09 100644 +--- a/biz.aQute.bnd/bnd.bnd ++++ b/biz.aQute.bnd/bnd.bnd +@@ -43,7 +43,6 @@ Private-Package: \ + aQute.bnd.enroute.commands,\ + aQute.bnd.main, \ + org.objectweb.asm.*,\ +- org.jtwig.*,\ + org.parboiled.*;-split-package:=merge-first,\ + com.github.javaparser.*,\ + !org.slf4j.impl,\ +@@ -91,8 +90,6 @@ Bundle-Description: This command line utility is the Swiss army knife of OSGi. I + # These dependencies are not on the -buildpath so no other part of bnd can + # use them in the source code. + -classpath: \ +- ${repo;org.jtwig:jtwig-core;latest},\ +- ${repo;org.jtwig:jtwig-reflection;latest},\ + ${repo;org.parboiled:parboiled-java;latest},\ + ${repo;org.parboiled:parboiled-core;latest},\ + ${repo;org.apache.commons.lang3;[3.4,4.0)},\ +@@ -106,8 +103,6 @@ Bundle-Description: This command line utility is the Swiss army knife of OSGi. I + + + -testpath.reporter: \ +- org.jtwig:jtwig-core;version=latest,\ +- org.jtwig:jtwig-reflection;version=latest,\ + org.parboiled:parboiled-java;version=latest,\ + org.parboiled:parboiled-core;version=latest,\ + org.apache.commons.lang3;version="[3.4,4.0)",\ +-- +2.26.2 + diff --git a/aqute-bnd.spec b/aqute-bnd.spec index d13c04b..ac39ac2 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -1,10 +1,10 @@ Name: aqute-bnd -Version: 3.5.0 -Release: 11%{?dist} +Version: 4.3.0 +Release: 1%{?dist} Summary: BND Tool # Part of jpm is under BSD, but jpm is not included in binary RPM -License: ASL 2.0 +License: ASL 2.0 or EPL-2.0 URL: http://bnd.bndtools.org/ BuildArch: noarch @@ -22,16 +22,15 @@ Source6: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annot Patch0: 0001-Disable-removed-commands.patch Patch1: 0002-Fix-ant-compatibility.patch -Patch2: 0001-Port-to-OSGI-7.0.0.patch +Patch2: 0003-Port-to-OSGI-7.0.0.patch + +# Twig is dead upstream, so patch out the option to use it for reports +Patch3: 0004-Patch-out-twig-plugin-for-report-generation.patch BuildRequires: maven-local -BuildRequires: mvn(org.osgi:osgi.annotation) -BuildRequires: mvn(org.osgi:osgi.cmpn) -BuildRequires: mvn(org.osgi:osgi.core) -BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.slf4j:slf4j-simple) +BuildRequires: mvn(com.github.javaparser:javaparser-core) >= 3.14.16 +BuildRequires: mvn(jline:jline) BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-compat) BuildRequires: mvn(org.apache.maven:maven-core) @@ -39,8 +38,15 @@ BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.shared:maven-mapping) BuildRequires: mvn(org.eclipse.aether:aether-api) +BuildRequires: mvn(org.osgi:osgi.annotation) +BuildRequires: mvn(org.osgi:osgi.cmpn) +BuildRequires: mvn(org.osgi:osgi.core) +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) + # Explicit javapackages-tools requires since bnd script uses # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -84,6 +90,7 @@ rm gradlew* %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 @@ -91,62 +98,67 @@ rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java sed 's/@VERSION@/%{version}/' %SOURCE2 > pom.xml sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info - +# remove twig plugin for report generator (twig is dead upstream) +rm biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/transformer/JtwigTransformerPlugin.java # libg pushd aQute.libg cp -p %{SOURCE3} pom.xml %pom_add_parent biz.aQute.bnd:parent:%{version} +%pom_remove_dep :org.osgi.util.function +%pom_remove_dep :org.osgi.util.promise +%pom_add_dep org.osgi:osgi.core %pom_add_dep org.osgi:osgi.cmpn -%pom_add_dep org.slf4j:slf4j-api popd # bndlib.annotations pushd biz.aQute.bnd.annotation cp -p %{SOURCE6} pom.xml %pom_add_parent biz.aQute.bnd:parent:%{version} +%pom_add_dep org.osgi:osgi.core +%pom_add_dep org.osgi:osgi.cmpn popd # bndlib pushd biz.aQute.bndlib cp -p %{SOURCE5} pom.xml %pom_add_parent biz.aQute.bnd:parent:%{version} - -%pom_add_dep org.osgi:osgi.annotation +%pom_remove_dep :org.osgi.util.function +%pom_remove_dep :org.osgi.util.promise %pom_add_dep org.osgi:osgi.core %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 +cp -r biz.aQute.bnd.exporters/src/aQute/bnd/exporter biz.aQute.bnd/src/aQute/bnd/main/ +cp -r biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter biz.aQute.bnd/src/aQute/bnd/main/ pushd biz.aQute.bnd cp -p %{SOURCE4} pom.xml %pom_add_parent biz.aQute.bnd:parent:%{version} - -%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} +%pom_remove_dep :biz.aQute.resolve +%pom_remove_dep :biz.aQute.repository +%pom_remove_dep :biz.aQute.bnd.exporters +%pom_remove_dep :biz.aQute.bnd.reporter +%pom_remove_dep :biz.aQute.remote.api +%pom_remove_dep :snakeyaml +%pom_add_dep com.github.javaparser:javaparser-core %pom_add_dep org.apache.ant:ant -%pom_add_dep org.osgi:osgi.annotation -%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 +mkdir -p maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib +cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/configuration maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib/ pushd maven -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 +%pom_remove_dep -r :biz.aQute.bnd.maven # 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-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 @@ -164,7 +176,7 @@ popd [9,) - 7 + 8 " @@ -206,6 +218,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium %license LICENSE %changelog +* Mon Jul 27 2020 Mat Booth - 4.3.0-1 +- Update to upstream version 4.3.0 + * Mon Jul 27 2020 Fedora Release Engineering - 3.5.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/parent.pom b/parent.pom index e8bc7b0..e637e27 100644 --- a/parent.pom +++ b/parent.pom @@ -186,10 +186,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 diff --git a/sources b/sources index 8772cbe..ebf3d61 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (3.5.0.REL.tar.gz) = c0e1fb6370881ab5012bbfbeae8093c23b25083a8a82599a9ae1179d8efc051c3b4a5cf99473072b7cf1e84440e08f19a5731b6f3c8bb805f849aa4823c16062 -SHA512 (aQute.libg-3.5.0.pom) = 81a7f1350296c2bdd48755c38804520c80df2ed968186a35842284d55b4ac951092646c780a5bc91fca161f43515e3061b9003aa6674dd199297159b9a59eb60 -SHA512 (biz.aQute.bnd-3.5.0.pom) = 60ff58f4d366dccb26cee5ac3d0749a564e0eab41b4e493df1727c7a79d7159f0913d3d1dcd406963580b7063d8b76cd92088d9eee46a01a0f9dd33643a5c345 -SHA512 (biz.aQute.bndlib-3.5.0.pom) = 3987110f4fc1bedb13f3ad777cb33dc9db75ad81135fcbc49763dfb243c5053ea864d76d16f271547666c01f6dfbb104a9d4ee52496e62e6fb80dcfc02d23f75 -SHA512 (biz.aQute.bnd.annotation-3.5.0.pom) = c968e0586f55accb37d4caf4d8a6d509fd6f88982dcc464cfb0fd41f863eb0b7945aadafb97c79ba2d6d1fda59ef12e5bac4556e302599924130d69fb99ac31f +SHA512 (4.3.0.REL.tar.gz) = 0bae90a388fb52b9af88457b2a9b78530958be72567d66a0369c534df1aad7f2e7dae13e97a7153f847283b8fc31b1f76ef00c88944076a35e64b9e596925fec +SHA512 (aQute.libg-4.3.0.pom) = a60d7d41a3eae51827e30a683b078087dde2d7f1dca79a4acccee1e25df84f7498a3be01eea69bc06eba355f3df490452dd8edbac469c294b34327dd46802c9e +SHA512 (biz.aQute.bnd-4.3.0.pom) = e9b4f64359965c1b7799e545212f269fa5ced54d28160079e111529609b22e45eb9f0f0853e7270734cb2d468cbd4127601dcfe523d53ec2ba7c6af8f50f5346 +SHA512 (biz.aQute.bndlib-4.3.0.pom) = d74384a5d3f590d10a29b47734365eae1cdcf566bbab5a193db9b31fd64133091a2fe836e035f2add6c21b12a537bd3618c03d3b3e5412ccf8ff7765097a2df7 +SHA512 (biz.aQute.bnd.annotation-4.3.0.pom) = ef578cea5b1773e307f168ef27d91344f6f7d7ac874ff841e1831ff12ec741a568777931a29528a55812afed737af893740b8d812de4c72d8d9e07c027b56cd6