diff --git a/biz.aQute.aggregate.provider/test.bndrun b/biz.aQute.aggregate.provider/test.bndrun index e08a9a02..a1f6f8db 100644 --- a/biz.aQute.aggregate.provider/test.bndrun +++ b/biz.aQute.aggregate.provider/test.bndrun @@ -1,17 +1,15 @@ -runpath: slf4j.simple, slf4j.api -resolve: cache --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runee: JavaSE-1.8 -runrequires: \ osgi.identity;filter:='(osgi.identity=org.apache.felix.scr)',\ osgi.identity;filter:='(osgi.identity=org.apache.felix.webconsole.plugins.scriptconsole)',\ osgi.identity;filter:='(osgi.identity=org.apache.felix.log)' -runbundles: \ - biz.aQute.gogo.commands.provider;version=snapshot,\ org.apache.commons.fileupload;version='[1.3.2,1.3.3)',\ org.apache.commons.io;version='[2.5.0,2.5.1)',\ org.apache.felix.configadmin;version='[1.9.12,1.9.13)',\ - org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ org.apache.felix.log;version='[1.2.4,1.2.5)',\ org.apache.felix.scr;version='[2.1.30,2.1.31)',\ diff --git a/biz.aQute.aggregate.test/test.bndrun b/biz.aQute.aggregate.test/test.bndrun index e0f72fca..7217d88b 100644 --- a/biz.aQute.aggregate.test/test.bndrun +++ b/biz.aQute.aggregate.test/test.bndrun @@ -1,6 +1,6 @@ -runpath: slf4j.simple, slf4j.api -resolve: cache --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runee: JavaSE-1.8 -runrequires: \ osgi.identity;filter:='(osgi.identity=org.apache.felix.scr)',\ diff --git a/biz.aQute.gogo.commands.provider.test/play.bndrun b/biz.aQute.gogo.commands.provider.test/play.bndrun index 7c3bb7bd..0fe5d08b 100644 --- a/biz.aQute.gogo.commands.provider.test/play.bndrun +++ b/biz.aQute.gogo.commands.provider.test/play.bndrun @@ -8,7 +8,7 @@ bnd.identity;id='org.apache.felix.log',\ bnd.identity;id='org.apache.felix.http.jetty',\ bnd.identity;id='biz.aQute.gogo.commands.provider.test' --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runee: JavaSE-1.8 -runbundles: \ biz.aQute.gogo.commands.provider;version=snapshot,\ diff --git a/biz.aQute.gogo.commands.provider/bnd.bnd b/biz.aQute.gogo.commands.provider/bnd.bnd index 8e10fb1b..975c4bdd 100644 --- a/biz.aQute.gogo.commands.provider/bnd.bnd +++ b/biz.aQute.gogo.commands.provider/bnd.bnd @@ -33,7 +33,7 @@ DynamicImport-Package * osgi.identity;filter:='(osgi.identity=biz.aQute.gogo.commands.provider)' -runpath: biz.aQute.osgi.logger.forwarder --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runbundles: \ org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\ org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\ diff --git a/biz.aQute.kibana/bnd.bnd b/biz.aQute.kibana/bnd.bnd index 869a58d1..08bffcc2 100644 --- a/biz.aQute.kibana/bnd.bnd +++ b/biz.aQute.kibana/bnd.bnd @@ -42,7 +42,7 @@ osgi.identity;filter:='(osgi.identity=org.apache.felix.webconsole.plugins.ds)',\ osgi.identity;filter:='(osgi.identity=org.apache.felix.http.jetty)',\ osgi.identity;filter:='(osgi.identity=org.apache.felix.metatype)' --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runee: JavaSE-1.8 -runbundles: \ biz.aQute.gogo.commands.provider;version=snapshot,\ diff --git a/biz.aQute.mqtt.test/basic.bndrun b/biz.aQute.mqtt.test/basic.bndrun index 96f6ad65..b91cd237 100644 --- a/biz.aQute.mqtt.test/basic.bndrun +++ b/biz.aQute.mqtt.test/basic.bndrun @@ -4,7 +4,7 @@ osgi.identity;filter:='(osgi.identity=org.apache.felix.configadmin)' -runpath: slf4j.api, slf4j.simple --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runee: JavaSE-1.8 -runbundles: \ biz.aQute.api.broker;version=snapshot,\ @@ -13,5 +13,6 @@ org.osgi.util.function;version='[1.1.0,1.1.1)',\ org.osgi.util.promise;version='[1.1.1,1.1.2)',\ org.apache.felix.configadmin;version='[1.9.12,1.9.13)',\ - org.apache.felix.scr;version='[2.1.30,2.1.31)' + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + com.h2database;version='[1.4.198,1.4.199)' -resolve: auto \ No newline at end of file diff --git a/biz.aQute.osgi.conditionaltarget/src/test/java/aQute/osgi/conditionaltarget/provider/ConditionalTargetTest.java b/biz.aQute.osgi.conditionaltarget/src/test/java/aQute/osgi/conditionaltarget/provider/ConditionalTargetTest.java index 221f22b5..648f048d 100644 --- a/biz.aQute.osgi.conditionaltarget/src/test/java/aQute/osgi/conditionaltarget/provider/ConditionalTargetTest.java +++ b/biz.aQute.osgi.conditionaltarget/src/test/java/aQute/osgi/conditionaltarget/provider/ConditionalTargetTest.java @@ -35,7 +35,7 @@ @RunWith(LaunchpadRunner.class) public class ConditionalTargetTest { - static LaunchpadBuilder builder = new LaunchpadBuilder().runfw("org.apache.felix.framework;version=6") + static LaunchpadBuilder builder = new LaunchpadBuilder().runfw("org.apache.felix.framework;version=7") .bundles( "org.osgi.util.promise, org.osgi.util.function, org.apache.felix.scr,org.apache.felix.log,org.apache.felix.configadmin, slf4j.api, slf4j.simple, org.assertj.core, org.awaitility, osgi.enroute.hamcrest.wrapper") .debug(); diff --git a/biz.aQute.osgi.conditionaltarget/src/test/java/aQute/osgi/conditionaltarget/provider/SimpleTest.java b/biz.aQute.osgi.conditionaltarget/src/test/java/aQute/osgi/conditionaltarget/provider/SimpleTest.java index ca61e9b6..f0a17306 100644 --- a/biz.aQute.osgi.conditionaltarget/src/test/java/aQute/osgi/conditionaltarget/provider/SimpleTest.java +++ b/biz.aQute.osgi.conditionaltarget/src/test/java/aQute/osgi/conditionaltarget/provider/SimpleTest.java @@ -22,7 +22,8 @@ @SuppressWarnings("rawtypes") public class SimpleTest { - static LaunchpadBuilder builder = new LaunchpadBuilder().snapshot().runfw("org.apache.felix.framework;version=6") + static LaunchpadBuilder builder = new LaunchpadBuilder().snapshot() + .runfw("org.apache.felix.framework;version=") .bundles( "org.osgi.util.promise, org.osgi.util.function, org.apache.felix.scr,org.apache.felix.log,org.apache.felix.configadmin, slf4j.api, slf4j.simple, org.assertj.core, org.awaitility, osgi.enroute.hamcrest.wrapper") .debug(); diff --git a/biz.aQute.osgi.diverse.util/test.bndrun b/biz.aQute.osgi.diverse.util/test.bndrun index ef5ecae7..bfa9d8ce 100644 --- a/biz.aQute.osgi.diverse.util/test.bndrun +++ b/biz.aQute.osgi.diverse.util/test.bndrun @@ -1,6 +1,6 @@ -runpath: slf4j.simple, slf4j.api -resolve: cache --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runee: JavaSE-1.8 -runrequires: \ osgi.identity;filter:='(osgi.identity=biz.aQute.gogo.commands.provider)',\ diff --git a/biz.aQute.osgi.jna.support.test/bnd.bnd b/biz.aQute.osgi.jna.support.test/bnd.bnd index 158739c7..e0b3a882 100644 --- a/biz.aQute.osgi.jna.support.test/bnd.bnd +++ b/biz.aQute.osgi.jna.support.test/bnd.bnd @@ -18,7 +18,7 @@ -runsystemcapabilities: ${native_capability} --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runproperties: \ jna.debug_load=true, \ diff --git a/biz.aQute.osgi.logger.forwarder/try.bndrun b/biz.aQute.osgi.logger.forwarder/try.bndrun index a68cb178..f8d891b8 100644 --- a/biz.aQute.osgi.logger.forwarder/try.bndrun +++ b/biz.aQute.osgi.logger.forwarder/try.bndrun @@ -13,7 +13,7 @@ osgi.identity;filter:='(osgi.identity=org.apache.felix.http.jetty)',\ osgi.identity;filter:='(osgi.identity=org.apache.felix.metatype)',\ osgi.identity;filter:='(osgi.identity=org.apache.felix.log)' --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runbundles: \ org.apache.commons.fileupload;version='[1.3.2,1.3.3)',\ org.apache.commons.io;version='[2.5.0,2.5.1)',\ diff --git a/biz.aQute.osgi.spy.runpath/test.bndrun b/biz.aQute.osgi.spy.runpath/test.bndrun index 80cf1337..e485d079 100644 --- a/biz.aQute.osgi.spy.runpath/test.bndrun +++ b/biz.aQute.osgi.spy.runpath/test.bndrun @@ -2,7 +2,7 @@ -runrequires: \ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)' --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runee: JavaSE-1.8 -runbundles: \ diff --git a/biz.aQute.scheduler.basic.provider/test.bndrun b/biz.aQute.scheduler.basic.provider/test.bndrun index c3ed2cee..ab5a8b25 100644 --- a/biz.aQute.scheduler.basic.provider/test.bndrun +++ b/biz.aQute.scheduler.basic.provider/test.bndrun @@ -1,6 +1,6 @@ -runpath: slf4j.api -runrequires: osgi.identity;filter:='(osgi.identity=biz.aQute.scheduler.basic.provider)' --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runee: JavaSE-1.8 -runbundles: \ biz.aQute.api.scheduler;version=snapshot,\ diff --git a/biz.aQute.shell.sshd.provider/tester.bndrun b/biz.aQute.shell.sshd.provider/tester.bndrun index 76a9c1fd..7f7741d2 100644 --- a/biz.aQute.shell.sshd.provider/tester.bndrun +++ b/biz.aQute.shell.sshd.provider/tester.bndrun @@ -13,7 +13,7 @@ osgi.identity;filter:='(osgi.identity=org.apache.felix.metatype)',\ osgi.identity;filter:='(osgi.identity=biz.aQute.gogo.commands.provider)',\ osgi.identity;filter:='(osgi.identity=org.apache.felix.log)' --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runee: JavaSE-1.8 -runbundles: \ biz.aQute.shell.sshd.provider;version=snapshot,\ diff --git a/biz.aQute.trace/tracer.bndrun b/biz.aQute.trace/tracer.bndrun index 3d86818b..ce4d98ce 100644 --- a/biz.aQute.trace/tracer.bndrun +++ b/biz.aQute.trace/tracer.bndrun @@ -11,8 +11,8 @@ x= aQute.trace.extra= \ org.apache.felix.scr.impl.inject.methods.ActivateMethod:doFindMethod:DS, \ -//-runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' --runfw: org.apache.felix.framework;version='[6.0.2,6.0.2]' +//-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' +-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]' -runsystempackages: sun.misc diff --git a/cnf/central.mvn b/cnf/central.mvn index 4008fb4c..daf374bd 100644 --- a/cnf/central.mvn +++ b/cnf/central.mvn @@ -1,8 +1,8 @@ -biz.aQute.bnd:aQute.libg:5.3.0 -biz.aQute.bnd:biz.aQute.bnd.runtime.snapshot:5.3.0 -biz.aQute.bnd:biz.aQute.bndlib:5.3.0 -biz.aQute.bnd:biz.aQute.repository:5.3.0 -biz.aQute.bnd:biz.aQute.launchpad:5.3.0 +biz.aQute.bnd:aQute.libg:6.4.1 +biz.aQute.bnd:biz.aQute.bnd.runtime.snapshot:6.4.1 +biz.aQute.bnd:biz.aQute.bndlib:6.4.1 +biz.aQute.bnd:biz.aQute.repository:6.4.1 +biz.aQute.bnd:biz.aQute.launchpad:6.4.1 com.h2database:h2:1.4.198 com.vladsch.flexmark:flexmark-osgi:0.62.2 com.vladsch.flexmark:flexmark-pdf-converter:0.62.2 @@ -20,8 +20,8 @@ org.apache.felix:org.apache.felix.converter:1.0.4 org.apache.felix:org.apache.felix.coordinator:1.0.2 org.apache.felix:org.apache.felix.eventadmin:1.5.0 org.apache.felix:org.apache.felix.fileinstall:3.6.4 -org.apache.felix:org.apache.felix.framework.security:2.6.1 -org.apache.felix:org.apache.felix.framework:6.0.2 +org.apache.felix:org.apache.felix.framework.security:2.8.4 +org.apache.felix:org.apache.felix.framework:7.0.5 org.apache.felix:org.apache.felix.gogo.command:1.1.0 org.apache.felix:org.apache.felix.gogo.runtime:1.1.2 org.apache.felix:org.apache.felix.gogo.shell:1.0.0 @@ -90,9 +90,9 @@ org.eclipse.platform:org.eclipse.equinox.supplement:1.7.0 org.elasticsearch.client:elasticsearch-rest-client:7.9.2 org.elasticsearch.client:elasticsearch-rest-high-level-client:7.9.2 org.mockito:mockito-all:1.10.19 -org.osgi:org.osgi.annotation.bundle:1.0.0 +org.osgi:org.osgi.annotation.bundle:2.0.0 org.osgi:org.osgi.dto:1.1.0 -org.osgi:org.osgi.framework:1.8.0 +org.osgi:org.osgi.framework:1.10.0 org.osgi:org.osgi.jmx:1.1.0 org.osgi:org.osgi.namespace.contract:1.0.0 org.osgi:org.osgi.namespace.extender:1.0.1 @@ -128,16 +128,16 @@ org.osgi:org.osgi.service.rest:1.0.0 org.osgi:org.osgi.service.serviceloader:1.0.0 org.osgi:org.osgi.service.url:1.0.0 org.osgi:org.osgi.service.useradmin:1.1.0 -org.osgi:org.osgi.util.converter:1.0.0 -org.osgi:org.osgi.util.function:1.1.0 +org.osgi:org.osgi.util.converter:1.0.9 +org.osgi:org.osgi.util.function:1.2.0 org.osgi:org.osgi.util.measurement:1.0.2 org.osgi:org.osgi.util.position:1.0.1 -org.osgi:org.osgi.util.promise:1.1.1 -org.osgi:org.osgi.util.pushstream:1.0.1 -org.osgi:org.osgi.util.tracker:1.5.2 +org.osgi:org.osgi.util.promise:1.3.0 +org.osgi:org.osgi.util.pushstream:1.1.0 +org.osgi:org.osgi.util.tracker:1.5.4 org.osgi:org.osgi.util.xml:1.0.1 org.osgi:osgi.annotation:7.0.0 -org.osgi:osgi.core:7.0.0 +org.osgi:osgi.core:8.0.0 org.osgi:osgi.enroute.webconsole.xray.provider:2.1.0 org.slf4j:slf4j-api:1.7.30 org.slf4j:slf4j-simple:1.7.30