#7 Update to upstream version 4.3.1
Merged 2 years ago by mbooth. Opened 2 years ago by mbooth.
Unknown source master  into  master

file modified
+6 -20
@@ -1,25 +1,11 @@

- /aqute-service.tar.gz

- /bnd-0.0.363.jar

+ /results_*

+ /*.src.rpm

+ /*.noarch.rpm

  /2.4.1.REL.tar.gz

- /biz.aQute.bnd-2.4.1.pom

- /biz.aQute.bndlib-2.4.1.pom

  /3.2.0.REL.tar.gz

- /aQute.libg-3.2.0.pom

- /biz.aQute.bnd-3.2.0.pom

- /biz.aQute.bndlib-3.2.0.pom

- /biz.aQute.bnd.annotation-3.2.0.pom

  /3.3.0.REL.tar.gz

- /aQute.libg-3.3.0.pom

- /biz.aQute.bnd-3.3.0.pom

- /biz.aQute.bndlib-3.3.0.pom

- /biz.aQute.bnd.annotation-3.3.0.pom

  /3.4.0.REL.tar.gz

- /aQute.libg-3.4.0.pom

- /biz.aQute.bnd-3.4.0.pom

- /biz.aQute.bndlib-3.4.0.pom

- /biz.aQute.bnd.annotation-3.4.0.pom

  /3.5.0.REL.tar.gz

- /aQute.libg-3.5.0.pom

- /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

+ /4.3.1.REL.tar.gz

+ /*.pom

@@ -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 <msimacek@redhat.com>

  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 @@

   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 @@

  -

  -	/**

  -	 * 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 @@

  -

  -	/**

  -	 * 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

  

@@ -1,117 +0,0 @@

- From e9469ae2ca9f3d64fd88e0d8aaf8ebeea7bb937d Mon Sep 17 00:00:00 2001

- From: Marian Koncek <mkoncek@redhat.com>

- 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 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;

-  

-  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 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;}

- +

-  }

- -- 

- 2.20.1

- 

@@ -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 <msimacek@redhat.com>

  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<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.26.2

  

@@ -0,0 +1,149 @@

+ From 07705c03182b11f525f87002ae0a687961f91da2 Mon Sep 17 00:00:00 2001

+ From: Marian Koncek <mkoncek@redhat.com>

+ 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 extends org.osgi.service.log.Logger> L getLogger(String name, Class<L> loggerType) {

+ +                // TODO Auto-generated method stub

+ +                return null;

+ +        }

+ +

+ +        @Override

+ +        public <L extends org.osgi.service.log.Logger> L getLogger(Class<?> clazz, Class<L> loggerType) {

+ +                // TODO Auto-generated method stub

+ +                return null;

+ +        }

+ +

+ +        @Override

+ +        public <L extends org.osgi.service.log.Logger> L getLogger(Bundle bundle, String name, Class<L> 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 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;

+ +		}

+ +

+  	}

+  

+  	public ConsoleLogger(BundleContext context) {

+ -- 

+ 2.26.2

+ 

@@ -0,0 +1,98 @@

+ From b2c3aed5b82c92d13997b49c7748bab9781f8d68 Mon Sep 17 00:00:00 2001

+ From: Mat Booth <mat.booth@redhat.com>

+ 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

+ 

file modified
+80 -37
@@ -1,10 +1,10 @@

  

  Name:           aqute-bnd

- Version:        3.5.0

- Release:        11%{?dist}

+ Version:        4.3.1

+ 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

  
@@ -14,24 +14,32 @@

  # ./repack-tarball.sh

  Source1:        repack-tarball.sh

  

+ # A custom aggregator pom to run the build

  Source2:        parent.pom

+ # Poms from maven central since upstream uses gradle to build

  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

+ Source8:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.reporter/%{version}/biz.aQute.bnd.reporter-%{version}.pom

  

+ # Remove support for remote and resolve commands since they bring more deps than we want

  Patch0:         0001-Disable-removed-commands.patch

+ 

+ # Fix build failure against ant

  Patch1:         0002-Fix-ant-compatibility.patch

- Patch2:         0001-Port-to-OSGI-7.0.0.patch

+ 

+ # Fix unimplemented new APIs introduced in OSGi R7

+ 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 +47,15 @@

  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,69 +99,91 @@

  %patch0 -p1

  %patch1 -p1

  %patch2 -p1

- 

- # the commands pull in more dependencies than we want (felix-resolver, jetty)

- rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java

+ %patch3 -p1

  

  sed 's/@VERSION@/%{version}/' %SOURCE2 > pom.xml

  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_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.cmpn

- %pom_add_dep org.slf4j:slf4j-api

+ %pom_add_dep org.osgi:osgi.core

  popd

  

- # bndlib.annotations

- pushd biz.aQute.bnd.annotation

- cp -p %{SOURCE6} pom.xml

+ # bnd

+ pushd biz.aQute.bnd

+ cp -p %{SOURCE4} pom.xml

+ sed -i -r 's/provided/compile/' pom.xml

  %pom_add_parent biz.aQute.bnd:parent:%{version}

+ # add missing dep for ant tasks

+ %pom_add_dep org.apache.ant:ant

+ # remove support for remote and resolve commands

+ rm src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java

+ %pom_remove_dep :biz.aQute.resolve

+ %pom_remove_dep :biz.aQute.repository

+ %pom_remove_dep :biz.aQute.remote.api

+ %pom_remove_dep :snakeyaml

  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

- pushd biz.aQute.bnd

- cp -p %{SOURCE4} pom.xml

+ # bnd.annotation

+ 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

  

- %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_add_dep org.apache.ant:ant

- %pom_add_dep org.osgi:osgi.annotation

+ # bnd.exporters

+ pushd biz.aQute.bnd.exporters

+ cp -p %{SOURCE7} pom.xml

+ %pom_add_parent biz.aQute.bnd:parent:%{version}

  %pom_add_dep org.osgi:osgi.core

  %pom_add_dep org.osgi:osgi.cmpn

- %pom_add_dep org.slf4j:slf4j-api

+ popd

  

- %pom_add_dep org.slf4j:slf4j-simple::runtime

+ # bnd.reporter

+ pushd biz.aQute.bnd.reporter

+ cp -p %{SOURCE8} pom.xml

+ %pom_add_parent biz.aQute.bnd:parent:%{version}

+ %pom_add_dep org.osgi:osgi.core

+ %pom_add_dep org.osgi:osgi.cmpn

+ # remove twig dep and friends (twig is dead upstream)

+ rm src/biz/aQute/bnd/reporter/plugins/transformer/JtwigTransformerPlugin.java

+ %pom_remove_dep org.jtwig:

+ %pom_remove_dep com.googlecode.concurrentlinkedhashmap:

+ %pom_remove_dep com.google.guava:

+ # uneeded dependency

+ %pom_remove_dep :commons-lang3

  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 +201,7 @@

          <jdk>[9,)</jdk>

        </activation>

        <properties>

-         <maven.compiler.release>7</maven.compiler.release>

+         <maven.compiler.release>8</maven.compiler.release>

        </properties>

      </profile>

    </profiles>"
@@ -190,7 +227,7 @@

  install -d -m 755 %{buildroot}%{_sysconfdir}/ant.d

  echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium" >%{buildroot}%{_sysconfdir}/ant.d/%{name}

  

- %jpackage_script aQute.bnd.main.bnd "" "" aqute-bnd:slf4j/slf4j-api:slf4j/slf4j-simple:osgi-annotation:osgi-core:osgi-compendium bnd 1

+ %jpackage_script aQute.bnd.main.bnd "" "" aqute-bnd:slf4j/slf4j-api:slf4j/slf4j-simple:jline/jline:jansi/jansi:osgi-annotation:osgi-core:osgi-compendium bnd 1

  

  %files -f .mfiles

  %license LICENSE
@@ -206,6 +243,12 @@

  %license LICENSE

  

  %changelog

+ * Tue Jul 28 2020 Mat Booth <mat.booth@redhat.com> - 4.3.1-1

+ - Update to latest 4.x release

+ 

+ * Mon Jul 27 2020 Mat Booth <mat.booth@redhat.com> - 4.3.0-1

+ - Update to upstream version 4.3.0

+ 

  * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-11

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

  

file modified
+5 -157
@@ -9,165 +9,13 @@

  

      <packaging>pom</packaging>

  

-     <name>Parent project for bnd tool suite</name>

-     <description>Project information for bnd.</description>

-     <url>http://www.aQute.biz/Code/Bnd</url>

- 

-     <organization>

-         <name>aQute SARL</name>

-         <url>http://www.aQute.biz</url>

-     </organization>

- 

-     <licenses>

-         <license>

-             <name>Apache Software License 2.0</name>

-             <url>http://www.opensource.org/licenses/apache2.0.php</url>

-             <distribution>repo</distribution>

-         </license>

-     </licenses>

- 

-     <developers>

-         <developer>

-             <id>bnd</id>

-             <name>Peter Kriens</name>

-             <organization>aQute SARL</organization>

-             <roles>

-                 <role>Primary Developer</role>

-             </roles>

-         </developer>

-         <developer>

-             <id>bjhargrave</id>

-             <name>BJ Hargrave</name>

-         </developer>

-         <developer>

-             <id>mcculls</id>

-             <name>Stuart McCulloch</name>

-         </developer>

-         <developer>

-             <id>njbartlett</id>

-             <name>Neil Bartlett</name>

-             <organization>Paremus</organization>

-         </developer>

-         <developer>

-             <id>fhuberts</id>

-             <name>Ferry Huberts</name>

-             <organization>Pelagic</organization>

-         </developer>

-         <developer>

-             <id>psoreide</id>

-             <name>PK S&#248;reide</name>

-             <organization>Comactivity AB</organization>

-         </developer>

-     </developers>

-     <contributors>

-         <contributor>

-             <!--<id>derheld42</id>-->

-             <name>Carter Smithhart</name>

-         </contributor>

-         <contributor>

-             <!--<id>cchabanois</id>-->

-             <name>Chabanois Cédric</name>

-             <organization>Entropysoft</organization>

-         </contributor>

-         <contributor>

-             <!--<id>paulbakker</id>-->

-             <name>Paul Bakker</name>

-             <organization>Luminis Technologies</organization>

-         </contributor>

-         <contributor>

-             <!--<id>djencks</id>-->

-             <name>David Jencks</name>

-         </contributor>

-         <contributor>

-             <!--<id>rkrzewski</id>-->

-             <name>Rafa&#322; Krzewski</name>

-             <organization>Caltha - Krzewski, Mach, Potempski Sp. J.</organization>

-         </contributor>

-         <contributor>

-             <!--<id>xfournet</id>-->

-             <name>Xavier Fournet</name>

-         </contributor>

-         <contributor>

-             <!--<id>crabbkw</id>-->

-             <name>Casey Crabb</name>

-         </contributor>

-         <contributor>

-             <!--<id>david.bosschaert</id>-->

-             <name>David Bosschaert</name>

-         </contributor>

-         <contributor>

-             <!--<id>harald.wellmann</id>-->

-             <name>Harald Wellmann</name>

-         </contributor>

-         <contributor>

-             <!--<id>janwillem.janssen</id>-->

-             <name>Jan Willem Janssen</name>

-         </contributor>

-         <contributor>

-             <!--<id>marcel.offermans</id>-->

-             <name>Marcel Offermans</name>

-         </contributor>

-         <contributor>

-             <!--<id>marian.grigoras</id>-->

-             <name>Marian Grigoras</name>

-         </contributor>

-         <contributor>

-             <!--<id>markuswolf</id>-->

-             <name>Markus Wolf</name>

-         </contributor>

-         <contributor>

-             <!--<id>nicolas.lalevee</id>-->

-             <name>Nicolas Lalevée</name>

-         </contributor>

-         <contributor>

-             <!--<id>pierre.labiausse</id>-->

-             <name>Pierre Labiausse</name>

-         </contributor>

-         <contributor>

-             <!--<id>raymond.auge</id>-->

-             <name>Raymond Auge</name>

-         </contributor>

-         <contributor>

-             <!--<id>timothyjward</id>-->

-             <name>Tim Ward</name>

-         </contributor>

-         <contributor>

-             <!--<id>bramk</id>-->

-             <name>Bram de Kruijff</name>

-         </contributor>

-         <contributor>

-             <!--<id>tangyong</id>-->

-             <name>Tang Yong</name>

-         </contributor>

-         <contributor>

-             <!--<id>gamerson</id>-->

-             <name>Gregory Amerson</name>

-         </contributor>

-         <contributor>

-             <!--<id>gnodet</id>-->

-             <name>Guillaume Nodet</name>

-         </contributor>

-         <contributor>

-             <!--<id>marcdejonge</id>-->

-             <name>Marc de Jonge</name>

-         </contributor>

-         <contributor>

-             <!--<id>trespasserw</id>-->

-             <name>Roman Shevchenko</name>

-         </contributor>

-     </contributors>

- 

-     <scm>

-         <url>https://github.com/bndtools/bnd</url>

-         <connection>scm:git:git://github.com/bndtools/bnd.git</connection>

-         <developerConnection>scm:git:ssh://github.com/bndtools/bnd.git</developerConnection>

-     </scm>

- 

      <modules>

          <module>aQute.libg</module>

          <module>biz.aQute.bndlib</module>

          <module>biz.aQute.bnd</module>

          <module>biz.aQute.bnd.annotation</module>

+         <module>biz.aQute.bnd.exporters</module>

+         <module>biz.aQute.bnd.reporter</module>

          <module>maven</module>

      </modules>

  
@@ -186,10 +34,10 @@

              <plugin>

                  <groupId>org.apache.maven.plugins</groupId>

                  <artifactId>maven-compiler-plugin</artifactId>

-                 <version>3.5.1</version>

+                 <version>3.8.1</version>

                  <configuration>

-                     <source>1.7</source>

-                     <target>1.7</target>

+                     <source>1.8</source>

+                     <target>1.8</target>

                  </configuration>

              </plugin>

          </plugins>

file modified
+7 -5
@@ -1,5 +1,7 @@

- 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.1.REL.tar.gz) = 103d5cba7a7f62b845c362001717eac0409b801813464252d5d4f8dd2aadd24f61e278309e92ba5dc20acc1940ba99b25b26bfa8437560169a84e34751d84ca1

+ SHA512 (aQute.libg-4.3.1.pom) = 63b17d0519224e872007e5327e4743494b0654c43caab1204831f707f45a64c1691d92e0bccefc490476ab832f74dea871944251dadd037a74f0eba8ad7e640b

+ SHA512 (biz.aQute.bnd-4.3.1.pom) = fa4ab223840ccb089ec2e2fc9bcf23849ead09ba9119c8e56047464bca6116c3a159b53d2b8374a057a77c9968ba852b2b10c6bd0a77e66043a4ddad761a6cb5

+ SHA512 (biz.aQute.bnd.annotation-4.3.1.pom) = 24fd9ad310177edf65ad9ef3b890834dc46c7fd86071d3afef47b24a5bbc4f2d08d4d5c376b6e49699bdf38e35d719267f5ffc3e5537ddcf52fc94ab9427a0e4

+ SHA512 (biz.aQute.bnd.exporters-4.3.1.pom) = 95303ed421f9514165ac8cd077ba7391852a3d195ab6603b2425fc5a5cdcd0a768ea746cfcf2d0ffa0d9c8f4de5c7a1856b361b9ddf1fd11ce69b73cde3e5f97

+ SHA512 (biz.aQute.bndlib-4.3.1.pom) = ba8d535afdb94a2d74c67bd954216cccfd08a2f674dae959a9cd3df3a3d66248000b959c696b59f22b12f29f34bdda2e60a3d20880190d33f61abedef955cb91

+ SHA512 (biz.aQute.bnd.reporter-4.3.1.pom) = 41181d44d01205679ea62f62dd57480a554e20b7c55470fd8d2204bbbeb6856e9728d826359c859f508f029551edfb9edb30d6a96110916e05d65eb917ee17b9

I tried rebuilding jdom2 against this version of aqute and it seemed to work. Probably should be tested against some other packages that ship OSGi metadata too, to ensure (a) it generally works and (b) the metadata generated is the same as before.

I've pointed the stewardship-sig review_pr script at it. I added the required maven-mapping and javaparser 3.14.16 builds in the COPR as well, since they're not yet part of a rawhide compose. Builds are now running:

https://copr.fedorainfracloud.org/coprs/decathorpe/aqute-bnd-4.3.0-mbooth-pr/monitor/

I see multiple build failures with error messages like these (from bouncycastle):

+ bnd wrap -b bcprov -v 1.65 -p bnd.bnd -o bcprov.jar build/artifacts/jdk1.5/jars/bcprov-jdk15on-165.jar
/usr/bin/build-classpath: Could not find osgi-annotation Java extension for this JVM
/usr/bin/build-classpath: Could not find osgi-core Java extension for this JVM
/usr/bin/build-classpath: Could not find osgi-compendium Java extension for this JVM
/usr/bin/build-classpath: error: Some specified jars were not found

Or, in jdom2:

+ bnd wrap --output build/package/jdom-2.0.6.bar --properties /builddir/build/SOURCES/bnd.properties --version 2.0.6 build/package/jdom-2.0.6.jar
/usr/bin/build-classpath: Could not find osgi-annotation Java extension for this JVM
/usr/bin/build-classpath: Could not find osgi-core Java extension for this JVM
/usr/bin/build-classpath: Could not find osgi-compendium Java extension for this JVM
/usr/bin/build-classpath: error: Some specified jars were not found
Error: Could not find or load main class aQute.bnd.main.bnd
Caused by: java.lang.NoClassDefFoundError: aQute/bnd/osgi/Processor

jakarta-activation also fails with weird errors ... not sure what that's about.

Hmm, I see. When I tested jdom2 I had manually installed the new aqute-bnd and aqute-bndlib packages, but I notice now that aqute-bnd no longer has a generated dependency on aqute-bndlib .... So packages that BR only aqute-bnd no longer work.

Also, I'm pretty sure nothing should ever need osgi-annotation at runtime... This package, man.

:grin: yeah ... would adding Requires: aqute-bndlib = %{version}-%{release} to aqute-bnd manually do the trick?

1 new commit added

  • Update to latest 4.x release
2 years ago

@decathorpe Hey, could you try the COPR builds again with this new version?

Looks pretty good now! No new build failures, and packages seem to have used aqute-bnd 4.3.1 packages for their successful builds.

Pull-Request has been merged by mbooth

2 years ago