#6 [WIP] update to version 4.3.0
Closed 2 years ago by decathorpe. Opened 2 years ago by decathorpe.
Unknown source master  into  master

file modified
+13
@@ -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,13 @@

  /biz.aQute.bnd-3.5.0.pom

  /biz.aQute.bndlib-3.5.0.pom

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

+ /4.2.0.REL.tar.gz

+ /aQute.libg-4.2.0.pom

+ /biz.aQute.bnd-4.2.0.pom

+ /biz.aQute.bndlib-4.2.0.pom

+ /biz.aQute.bnd.annotation-4.2.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

@@ -4,14 +4,14 @@

  Subject: [PATCH 1/2] 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.21.0

  

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

- 

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

  

@@ -0,0 +1,102 @@

+ From 64a36cbc8d7c8234dfa2af8670c2e1ea4a5c3909 Mon Sep 17 00:00:00 2001

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

+ Date: Thu, 11 Jul 2019 14:29:26 +0200

+ Subject: [PATCH] Port to OSGI 7.0.0

+ 

+ ---

+  .../src/aQute/bnd/junit/ConsoleLogger.java    | 62 +++++++++++++++++++

+  1 file changed, 62 insertions(+)

+ 

+ diff --git a/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java b/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java

+ index 9c2591f..569b20e 100644

+ --- a/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java

+ +++ b/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java

+ @@ -15,9 +15,11 @@ import org.osgi.framework.ServiceFactory;

+  import org.osgi.framework.ServiceReference;

+  import org.osgi.framework.ServiceRegistration;

+  import org.osgi.service.log.LogEntry;

+ +import org.osgi.service.log.LogLevel;

+  import org.osgi.service.log.LogListener;

+  import org.osgi.service.log.LogReaderService;

+  import org.osgi.service.log.LogService;

+ +import org.osgi.service.log.Logger;

+  

+  @Deprecated // see biz.aQute.bnd.remote.junit

+  public class ConsoleLogger implements LogReaderService {

+ @@ -76,6 +78,36 @@ public class ConsoleLogger implements LogReaderService {

+  			return time;

+  		}

+  

+ +		@Override

+ +		public LogLevel getLogLevel() {

+ +			// TODO Auto-generated method stub

+ +			return null;

+ +		}

+ +

+ +		@Override

+ +		public String getLoggerName() {

+ +			// TODO Auto-generated method stub

+ +			return null;

+ +		}

+ +

+ +		@Override

+ +		public long getSequence() {

+ +			// TODO Auto-generated method stub

+ +			return 0;

+ +		}

+ +

+ +		@Override

+ +		public String getThreadInfo() {

+ +			// TODO Auto-generated method stub

+ +			return null;

+ +		}

+ +

+ +		@Override

+ +		public StackTraceElement getLocation() {

+ +			// TODO Auto-generated method stub

+ +			return null;

+ +		}

+ +

+  	}

+  

+  	public class Facade implements LogService {

+ @@ -112,6 +144,36 @@ public class ConsoleLogger implements LogReaderService {

+  

+  		}

+  

+ +		@Override

+ +		public Logger getLogger(String name) {

+ +			// TODO Auto-generated method stub

+ +			return null;

+ +		}

+ +

+ +		@Override

+ +		public Logger getLogger(Class<?> clazz) {

+ +			// TODO Auto-generated method stub

+ +			return null;

+ +		}

+ +

+ +		@Override

+ +		public <L 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.20.1

+ 

file modified
+42 -35
@@ -1,10 +1,9 @@

- 

  Name:           aqute-bnd

- Version:        3.5.0

- Release:        9%{?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,25 +21,29 @@

  

  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

  

  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)

+ BuildRequires:  mvn(jline:jline)

  BuildRequires:  mvn(org.apache.ant:ant)

- BuildRequires:  mvn(junit:junit)

+ BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)

+ BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)

+ BuildRequires:  mvn(org.apache.maven.plugins:maven-source-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.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.eclipse.aether:aether-api)

+ BuildRequires:  mvn(org.jtwig:jtwig-core)

+ 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
@@ -91,62 +94,65 @@

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

+ %pom_add_dep org.jtwig:jtwig-core

  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
@@ -155,14 +161,12 @@

  %pom_remove_plugin -r :flatten-maven-plugin

  popd

  

- 

  %mvn_alias biz.aQute.bnd:biz.aQute.bnd :bnd biz.aQute:bnd

  %mvn_alias biz.aQute.bnd:biz.aQute.bndlib :bndlib biz.aQute:bndlib

  

  %mvn_package biz.aQute.bnd:biz.aQute.bndlib bndlib

  %mvn_package biz.aQute.bnd:biz.aQute.bnd.annotation bndlib

  %mvn_package biz.aQute.bnd:aQute.libg bndlib

- %mvn_package biz.aQute.bnd:bnd-shared-maven-lib maven

  %mvn_package biz.aQute.bnd:bnd-maven-plugin maven

  %mvn_package biz.aQute.bnd:bnd-baseline-maven-plugin maven

  %mvn_package biz.aQute.bnd:parent __noinstall
@@ -193,6 +197,9 @@

  %license LICENSE

  

  %changelog

+ * Thu Jul 16 2020 Marian Koncek <mkoncek@redhat.com> - 4.3.0-1

+ - Update to upstream version 4.3.0

+ 

  * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.5.0-9

  - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11

  

file modified
+3 -3
@@ -186,10 +186,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
+5 -5
@@ -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

  • update to a newer version (3.5.0 → 4.3.0)
  • merges changes from javapackages-tools-201902 branch (plus one small fix on top)

rebased onto 4c4427a

2 years ago

Fixed the missing osgi-foo components in classpath by adding "Requires: aqute-bndlib" to aqute-bnd.

New build failures with aqute-bnd 4.3.0:

  • dnsjava
bundle:
  [taskdef] Could not load definitions from resource aQute/bnd/ant/taskdef.properties. It could not be found.
BUILD FAILED
/builddir/build/BUILD/dnsjava-2.1.3/build.xml:63: Problem: failed to create task or type bndwrap
Cause: The name is undefined.
Action: Check the spelling.
Action: Check that any custom tasks/types have been declared.
Action: Check that any <presetdef>/<macrodef> declarations have taken place.
  • freemarker:
jar:
[ivy:cachepath] :: resolving dependencies :: org.freemarker#freemarker;working@b3a5b0d466df41a5807d61b193c9618c
[ivy:cachepath]     confs: [bnd]
[ivy:cachepath]     found biz.aQute#bnd;SYSTEM in xmvn
[ivy:cachepath]     [SYSTEM] biz.aQute#bnd;1.50.0 (forced)
[ivy:cachepath] :: resolution report :: resolve 14ms :: artifacts dl 0ms
    ---------------------------------------------------------------------
    |                  |            modules            ||   artifacts   |
    |       conf       | number| search|dwnlded|evicted|| number|dwnlded|
    ---------------------------------------------------------------------
    |        bnd       |   1   |   1   |   0   |   0   ||   1   |   1   |
    ---------------------------------------------------------------------
  [taskdef] Could not load definitions from resource aQute/bnd/ant/taskdef.properties. It could not be found.
BUILD FAILED
/builddir/build/BUILD/freemarker-2.3.29/build.xml:409: Problem: failed to create task or type http://www.aqute.biz/bnd:bnd
Cause: The name is undefined.
Action: Check the spelling.
Action: Check that any custom tasks/types have been declared.
Action: Check that any <presetdef>/<macrodef> declarations have taken place.
No types or tasks have been defined in this namespace yet
  • 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
Error: Could not find or load main class aQute.bnd.main.bnd
  • jgraphx:
+ bnd wrap --output jgraphx.bar --properties /builddir/build/SOURCES/bnd.properties --version 3.6.0.0 jgraphx.jar
Error: Could not find or load main class aQute.bnd.main.bnd
  • rxtx:
+ bnd wrap -p /builddir/build/SOURCES/rxtx-osgi.bnd -v 2.2 -o RXTXcomm-bnd.jar RXTXcomm.jar
Error: Could not find or load main class aQute.bnd.main.bnd
  • tomcat:
     [echo] add-osgi /builddir/build/BUILD/apache-tomcat-9.0.37-src/output/build/lib/annotations-api.jar true
BUILD FAILED
/builddir/build/BUILD/apache-tomcat-9.0.37-src/build.xml:760: The following error occurred while executing this line:
/builddir/build/BUILD/apache-tomcat-9.0.37-src/build.xml:3357: The following error occurred while executing this line:
/builddir/build/BUILD/apache-tomcat-9.0.37-src/build.xml:3378: Problem: failed to create task or type bnd
Cause: The name is undefined.

Builds in COPR: https://copr.fedorainfracloud.org/coprs/decathorpe/aqute-bnd-4.3.0-pr/monitor/

rebased onto bf2712b

2 years ago

I would love to have this upgrade to fix an identified by the latest Tomcat release. I took a look at the COPR build and see that Tomcat failed. Upon further inspection I found that the Tomcat failure is due to the aqute-bnd jar not actually containing any classes :)

More specifically, aqute-bnd-4.3.0-2.module_f31+7074+f8e1675d.noarch.rpm/usr/share/java/aqute-bnd/biz.aQute.bnd.jar only contains META-INF. The aqute-bndlib package jars seem to be fine (at least the couple I checked).

I can rebase but 4.x is still hot broken garbage, which is why this is only WIP PR :cry:

See: https://pagure.io/java-maint-sig/issue/5

I would love to have this upgrade to fix an identified by the latest Tomcat release. I took a look at the COPR build and see that Tomcat failed. Upon further inspection I found that the Tomcat failure is due to the aqute-bnd jar not actually containing any classes :)
More specifically, aqute-bnd-4.3.0-2.module_f31+7074+f8e1675d.noarch.rpm/usr/share/java/aqute-bnd/biz.aQute.bnd.jar only contains META-INF. The aqute-bndlib package jars seem to be fine (at least the couple I checked).

Yeah, we noticed this as well, but making the "biz.aqute.bnd" package actually compile revealed a treasure trove of new issues, and now the package doesn't even compile anymore (missing dependencies, build system borked, etc.)

rebased onto a6ac6d9

2 years ago

Pull-Request has been closed by decathorpe

2 years ago