Merge pull request #11 from chrisrueger/R7-to-R8

Update bndtools.workspace.min from OSGi R7 to R8

cnf/build.bnd

@@ -3,5 +3,5 @@ Bundle-Version:             1.0.0.${tstamp}
 
 -remoteworkspace        true
 -runfw:                 org.apache.felix.framework
--runee:                 JavaSE-1.8
+-runee:                 JavaSE-17
 

cnf/ext/build.mvn

@@ -1,56 +1,106 @@
-# OSGi R7
+# OSGi R8
 
-biz.aQute.bnd:biz.aQute.bndlib:4.3.1
-biz.aQute.bnd:aQute.libg:4.3.1
-biz.aQute.bnd:biz.aQute.launchpad:4.3.1
-biz.aQute.bnd:biz.aQute.bnd.runtime.gogo:4.3.1
-biz.aQute.bnd:biz.aQute.bnd.runtime.snapshot:4.3.1
+biz.aQute.bnd:biz.aQute.bndlib:7.0.0
+biz.aQute.bnd:aQute.libg:7.0.0
+biz.aQute.bnd:biz.aQute.launchpad:7.0.0
+biz.aQute.bnd:biz.aQute.bnd.runtime.gogo:7.0.0
+biz.aQute.bnd:biz.aQute.bnd.runtime.snapshot:7.0.0
 biz.aQute:biz.aQute.osgi.templates:1.10.0
 
-org.osgi:osgi.annotation:7.0.0
-org.osgi:org.osgi.dto:1.1.0
-org.osgi:org.osgi.framework:1.9.0
+org.osgi:org.osgi.annotation.bundle:2.0.0
+org.osgi:org.osgi.annotation.versioning:1.1.2
+org.osgi:org.osgi.application:1.0.0
+org.osgi:org.osgi.dto:1.1.1
+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
 org.osgi:org.osgi.namespace.implementation:1.0.0
 org.osgi:org.osgi.namespace.service:1.0.0
 org.osgi:org.osgi.namespace.unresolvable:1.0.0
-org.osgi:org.osgi.resource:1.0.0
+org.osgi:org.osgi.resource:1.0.1
 org.osgi:org.osgi.service.application:1.1.0
-org.osgi:org.osgi.service.jdbc:1.0.0
 org.osgi:org.osgi.service.async:1.0.0
 org.osgi:org.osgi.service.blueprint:1.0.2
-org.osgi:org.osgi.service.cdi:1.0.0
+org.osgi:org.osgi.service.cdi:1.0.1
 org.osgi:org.osgi.service.clusterinfo:1.0.0
-org.osgi:org.osgi.service.cm:1.6.0
-org.osgi:org.osgi.service.component:1.4.0
-org.osgi:org.osgi.service.component.annotations:1.4.0
-org.osgi:org.osgi.service.condpermadmin:1.1.1
-org.osgi:org.osgi.service.configurator:1.0.0
+org.osgi:org.osgi.service.cm:1.6.1
+org.osgi:org.osgi.service.component:1.5.1
+org.osgi:org.osgi.service.component.annotations:1.5.1
+org.osgi:org.osgi.service.condition:1.0.0
+org.osgi:org.osgi.service.condpermadmin:1.1.2
+org.osgi:org.osgi.service.configurator:1.0.1
 org.osgi:org.osgi.service.coordinator:1.0.2
-org.osgi:org.osgi.service.event:1.4.0
-org.osgi:org.osgi.service.http:1.2.1
-org.osgi:org.osgi.service.http.whiteboard:1.1.0
-org.osgi:org.osgi.service.jdbc:1.0.0
-org.osgi:org.osgi.service.log:1.4.0
-org.osgi:org.osgi.service.metatype:1.4.0
-org.osgi:org.osgi.service.metatype.annotations:1.4.0
-org.osgi:org.osgi.service.packageadmin:1.2.0
+org.osgi:org.osgi.service.dal:1.0.2
+org.osgi:org.osgi.service.dal.functions:1.0.1
+org.osgi:org.osgi.service.deploymentadmin:1.1.0
+org.osgi:org.osgi.service.device:1.1.1
+org.osgi:org.osgi.service.dmt:2.0.2
+org.osgi:org.osgi.service.enocean:1.0.1
+org.osgi:org.osgi.service.event:1.4.1
+org.osgi:org.osgi.service.feature:1.0.0
+org.osgi:org.osgi.service.http:1.2.2
+org.osgi:org.osgi.service.http.whiteboard:1.1.1
+org.osgi:org.osgi.service.io:1.0.0
+org.osgi:org.osgi.service.jakartars:2.0.0
+org.osgi:org.osgi.service.jaxrs:1.0.1
+org.osgi:org.osgi.service.jdbc:1.1.0
+org.osgi:org.osgi.service.jndi:1.0.1
+org.osgi:org.osgi.service.jpa:1.1.1
+org.osgi:org.osgi.service.log:1.5.0
+org.osgi:org.osgi.service.log.stream:1.0.0
+org.osgi:org.osgi.service.metatype:1.4.1
+org.osgi:org.osgi.service.metatype.annotations:1.4.1
+org.osgi:org.osgi.service.monitor:1.0.0
+org.osgi:org.osgi.service.networkadapter:1.0.1
+org.osgi:org.osgi.service.onem2m:1.0.0
+org.osgi:org.osgi.service.packageadmin:1.2.1
+org.osgi:org.osgi.service.permissionadmin:1.2.1
+org.osgi:org.osgi.service.prefs:1.1.2
+org.osgi:org.osgi.service.provisioning:1.2.0
 org.osgi:org.osgi.service.remoteserviceadmin:1.1.0
 org.osgi:org.osgi.service.repository:1.1.0
-org.osgi:org.osgi.service.resolver:1.1.0
+org.osgi:org.osgi.service.resolver:1.1.1
+org.osgi:org.osgi.service.resourcemonitoring:1.0.1
 org.osgi:org.osgi.service.rest:1.0.0
+org.osgi:org.osgi.service.serial:1.0.1
 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.1
+org.osgi:org.osgi.service.servlet:2.0.0
+org.osgi:org.osgi.service.startlevel:1.1.1
+org.osgi:org.osgi.service.subsystem:1.1.0
+org.osgi:org.osgi.service.tr069todmt:1.0.2
+org.osgi:org.osgi.service.transaction.control:1.0.0
+org.osgi:org.osgi.service.typedevent:1.0.0
+org.osgi:org.osgi.service.upnp:1.2.1
+org.osgi:org.osgi.service.url:1.0.1
+org.osgi:org.osgi.service.usbinfo:1.0.1
+org.osgi:org.osgi.service.useradmin:1.1.1
+org.osgi:org.osgi.service.wireadmin:1.0.2
+org.osgi:org.osgi.service.zigbee:1.0.1
+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.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.2
+org.osgi:osgi.annotation:8.1.0
+org.osgi:osgi.core:8.0.0
+org.osgi:osgi.enterprise:7.0.0
+org.osgi:osgi.promise:8.1.0
+org.osgi:slf4j.osgi:2.0.0
 
-org.slf4j:slf4j-api:1.7.30
+org.slf4j:slf4j-api:2.0.9
 
+org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:4.12_1
+org.mockito:mockito-core:2.13.0
 org.mockito:mockito-all:1.10.19
-org.easymock:easymock:4.1
-org.assertj:assertj-core:3.14.0
+org.easymock:easymock:5.2.0
+org.assertj:assertj-core:3.24.2
+org.objenesis:objenesis:2.6
+
 
 org.osgi:osgi.enroute.junit.wrapper:4.12.0
 org.osgi:osgi.enroute.hamcrest.wrapper:1.3.0
+

cnf/ext/defaults.bnd

@@ -4,25 +4,17 @@
         releaseUrl=https://repo.maven.apache.org/maven2/; \
         index=${.}/build.mvn; \
         readOnly=true; \
-        name="Build"
+        name="OSGI R8 - Build"
 
 -plugin.20.runtime: \
     aQute.bnd.repository.maven.provider.MavenBndRepository; \
         snapshotUrl="https://oss.sonatype.org/content/repositories/snapshots/"; \
         releaseUrl="https://repo.maven.apache.org/maven2/"; \
         index=${.}/runtime.mvn; \
         readOnly=true; \
-        name="Runtime"
+        name="OSGI R8 - Runtime Distro"
+
 
--runblacklist.enroute: \
-    osgi.identity;filter:='(osgi.identity=osgi.enroute.base.api)', \
-    osgi.identity;filter:='(osgi.identity=osgi.cmpn)', \
-    osgi.identity;filter:='(osgi.identity=osgi.core)', \
-    osgi.identity;filter:='(osgi.identity=biz.aQute.junit)', \
-    osgi.identity;filter:='(osgi.identity=biz.aQute.launcher)', \
-    osgi.identity;filter:='(osgi.identity=biz.aQute.remote.launcher)', \
-    osgi.identity;filter:='(osgi.identity=org.osgi.service.*)', \
-    osgi.identity;filter:='(osgi.identity=slf4j.*)', \
 
 
 -runsystemcapabilities.dflt:    ${native_capability}
@@ -33,4 +25,20 @@ debug-bundles: \
     osgi.implementation;filter:='(osgi.implementation=osgi.event)',\
     osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
     osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)', \
-    osgi.identity;filter:='(osgi.identity=org.apache.felix.webconsole.plugins.ds)'
+    osgi.identity;filter:='(osgi.identity=org.apache.felix.webconsole.plugins.ds)'
+
+# the driver-variable (see https://bnd.bndtools.org/macros/driver.html) 
+# helps to build to different folders e.g. depending on if Eclipse builds 
+# or e.g. gradle builds. 
+# that avoids conflicts between gradle and eclipse build
+# target-dir: dir specifies where build places the .jar and classes
+target-dir              generated${if;${driver;eclipse};;/${driver}}
+src                     src/main/java, src/main/resources
+testsrc                 src/test/java
+bin                     ${target-dir}/classes
+testbin                 ${target-dir}/test-classes
+
+# This is the version of JUnit that will be used at build time and run time
+junit: org.apache.servicemix.bundles.junit
+mockito: org.mockito.mockito-core,\
+  org.objenesis

cnf/ext/java.bnd

@@ -1,4 +1,4 @@
-javac.source:           1.8
-javac.target:           1.8
-javac.compliance:       1.8
+javac.source:           17
+javac.target:           17
+javac.compliance:       17
 javac.debug:            on

cnf/ext/runtime.mvn

@@ -1,103 +1,103 @@
-org.apache.felix:org.apache.felix.framework:6.0.3
-org.apache.felix:org.apache.felix.framework.security:2.6.1
+org.apache.felix:org.apache.felix.framework:7.0.5
+org.apache.felix:org.apache.felix.framework.security:2.8.4
 
-org.apache.felix:org.apache.felix.configadmin:1.9.16
-org.apache.felix:org.apache.felix.configurator:1.0.10
+org.apache.felix:org.apache.felix.configadmin:1.9.26
+org.apache.felix:org.apache.felix.configurator:1.0.18
 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.http.servlet-api:1.1.2
-org.apache.felix:org.apache.felix.http.jetty:4.0.14
-org.apache.felix:org.apache.felix.inventory:1.0.6
-org.apache.felix:org.apache.felix.log:1.2.2
+org.apache.felix:org.apache.felix.eventadmin:1.6.4
+org.apache.felix:org.apache.felix.fileinstall:3.7.4
+org.apache.felix:org.apache.felix.http.servlet-api:3.0.0
+org.apache.felix:org.apache.felix.http.jetty:5.1.4
+org.apache.felix:org.apache.felix.inventory:2.0.0
+org.apache.felix:org.apache.felix.log:1.3.0
 org.apache.felix:org.apache.felix.log.extension:1.0.0
-org.eclipse.platform:org.eclipse.equinox.log.stream:1.0.200
-org.apache.felix:org.apache.felix.metatype:1.2.2
-org.apache.felix:org.apache.felix.scr:2.1.16
+org.eclipse.platform:org.eclipse.equinox.log.stream:1.1.100
+org.apache.felix:org.apache.felix.metatype:1.2.4
+org.apache.felix:org.apache.felix.scr:2.2.6
 
 org.osgi:org.knopflerfish.bundle.useradmin:4.1.1
 
-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.1.2
-org.apache.felix:org.apache.felix.gogo.jline:1.1.4
+org.apache.felix:org.apache.felix.gogo.command:1.1.2
+org.apache.felix:org.apache.felix.gogo.runtime:1.1.6
+org.apache.felix:org.apache.felix.gogo.shell:1.1.4
+org.apache.felix:org.apache.felix.gogo.jline:1.1.8
 org.apache.felix:org.apache.felix.shell.remote:1.2.0
-org.jline:jline:3.13.3
+org.jline:jline:3.24.1
 
 org.apache.felix:org.apache.felix.threaddump:1.0.0
-org.apache.felix:org.apache.felix.converter:1.0.12
+org.apache.felix:org.apache.felix.converter:1.0.18
 
-org.apache.felix:org.apache.felix.webconsole.plugins.ds:2.1.0
-org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:1.0.10
+org.apache.felix:org.apache.felix.webconsole.plugins.ds:2.3.0
+org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:1.1.0
 org.apache.felix:org.apache.felix.webconsole.plugins.scriptconsole:1.0.2
 org.apache.felix:org.apache.felix.webconsole.plugins.useradmin:1.0.2
-org.apache.felix:org.apache.felix.webconsole.plugins.event:1.1.8
-org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin:1.0.4
-org.apache.felix:org.apache.felix.webconsole:4.3.16
+org.apache.felix:org.apache.felix.webconsole.plugins.event:1.2.0
+org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin:1.1.0
+org.apache.felix:org.apache.felix.webconsole:4.9.6
 
 
 org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-io:1.4_3
-commons-fileupload:commons-fileupload:1.4
+commons-fileupload:commons-fileupload:1.5
 
 org.osgi:org.knopflerfish.bundle.useradmin:4.1.1
 org.eclipse.concierge:org.eclipse.concierge.service.clusterinfo:1.0.0
 
 org.apache.aries.async:org.apache.aries.async:1.0.1
 
-com.h2database:h2:1.4.200
+com.h2database:h2:2.2.224
 
-org.slf4j:slf4j-nop:1.7.30
-org.slf4j:slf4j-simple:1.7.30
+org.slf4j:slf4j-nop:2.0.9
+org.slf4j:slf4j-simple:2.0.9
 
-org.osgi:org.osgi.util.function:1.1.0
+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.xml:1.0.1
-
-org.apache.zookeeper:zookeeper:3.5.6
-org.eclipse.platform:org.eclipse.core.jobs:3.10.600
-org.eclipse.platform:org.eclipse.equinox.common:3.10.600
-org.eclipse.platform:org.eclipse.equinox.concurrent:1.1.400
-org.eclipse.platform:org.eclipse.equinox.supplement:1.9.100
-org.eclipse.ecf:org.eclipse.ecf.identity:3.9.300
-org.eclipse.ecf:org.eclipse.ecf:3.9.4
-org.eclipse.ecf:org.eclipse.ecf.sharedobject:2.6.1
-org.eclipse.ecf:org.eclipse.ecf.discovery:5.0.301
-org.eclipse.ecf:org.eclipse.ecf.remoteservice.asyncproxy:2.1.2
-org.eclipse.ecf:org.eclipse.ecf.remoteservice:8.13.2
-org.eclipse.ecf:org.eclipse.ecf.console:1.3.1
-org.eclipse.ecf:org.eclipse.ecf.osgi.services.remoteserviceadmin.console:1.2.1
-org.eclipse.ecf:org.eclipse.osgi.services.remoteserviceadmin:1.6.200
-org.eclipse.ecf:org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy:1.0.101
-org.eclipse.ecf:org.eclipse.ecf.osgi.services.remoteserviceadmin:4.6.1102
-org.eclipse.ecf:org.eclipse.ecf.osgi.services.distribution:2.1.400
-org.eclipse.ecf:org.eclipse.ecf.provider:4.8.200
-org.eclipse.ecf:org.eclipse.ecf.provider.remoteservice:4.4.101
-org.eclipse.ecf:ch.ethz.iks.r_osgi.remote:1.2.201
-org.eclipse.ecf:org.eclipse.ecf.provider.r_osgi:3.6.201
+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.2
+
+org.apache.zookeeper:zookeeper:3.9.1
+org.eclipse.platform:org.eclipse.core.jobs:3.15.0
+org.eclipse.platform:org.eclipse.equinox.common:3.18.100
+org.eclipse.platform:org.eclipse.equinox.concurrent:1.2.100
+org.eclipse.platform:org.eclipse.equinox.supplement:1.10.700
+org.eclipse.ecf:org.eclipse.ecf.identity:3.10.0
+org.eclipse.ecf:org.eclipse.ecf:3.11.0
+org.eclipse.ecf:org.eclipse.ecf.sharedobject:2.6.200
+org.eclipse.ecf:org.eclipse.ecf.discovery:5.1.2
+org.eclipse.ecf:org.eclipse.ecf.remoteservice.asyncproxy:2.1.200
+org.eclipse.ecf:org.eclipse.ecf.remoteservice:8.14.0
+org.eclipse.ecf:org.eclipse.ecf.console:1.3.101
+org.eclipse.ecf:org.eclipse.ecf.osgi.services.remoteserviceadmin.console:1.3.1
+org.eclipse.ecf:org.eclipse.osgi.services.remoteserviceadmin:1.6.301
+org.eclipse.ecf:org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy:1.0.102
+org.eclipse.ecf:org.eclipse.ecf.osgi.services.remoteserviceadmin:4.9.3
+org.eclipse.ecf:org.eclipse.ecf.osgi.services.distribution:2.1.600
+org.eclipse.ecf:org.eclipse.ecf.provider:4.9.1
+org.eclipse.ecf:org.eclipse.ecf.provider.remoteservice:4.6.1
+org.eclipse.ecf:ch.ethz.iks.r_osgi.remote:1.2.500
+org.eclipse.ecf:org.eclipse.ecf.provider.r_osgi:3.7.0
 org.eclipse.ecf:org.objectweb.asm:5.0.1.v201404251740
 org.eclipse.ecf:org.apache.commons.codec:1.9.0.v20170208-1614
 org.eclipse.ecf:org.apache.commons.logging:1.1.1.v201101211721
 org.eclipse.ecf:org.apache.log4j:1.2.15.v201012070815
 org.eclipse.ecf:org.apache.httpcomponents.httpclient:4.5.2.v20170210-0925
 org.eclipse.ecf:org.apache.httpcomponents.httpcore:4.4.6.v20170210-0925
 org.eclipse.ecf:org.json:1.0.0.v201011060100
-org.eclipse.ecf:org.eclipse.ecf.remoteservice.rest:2.7.201
-org.eclipse.ecf:org.eclipse.ecf.remoteservice.eventadmin:1.3.1
-org.eclipse.ecf:org.eclipse.ecf.remoteservice.servlet:1.0.101
-org.eclipse.ecf:org.eclipse.ecf.server:2.1.201
-org.eclipse.ecf:org.eclipse.ecf.server.generic:8.0.101
-org.eclipse.ecf:org.eclipse.ecf.provider.zookeeper:1.2.201
+org.eclipse.ecf:org.eclipse.ecf.remoteservice.rest:2.8.0
+org.eclipse.ecf:org.eclipse.ecf.remoteservice.eventadmin:1.3.101
+org.eclipse.ecf:org.eclipse.ecf.remoteservice.servlet:1.0.201
+org.eclipse.ecf:org.eclipse.ecf.server:2.1.301
+org.eclipse.ecf:org.eclipse.ecf.server.generic:8.1.102
+org.eclipse.ecf:org.eclipse.ecf.provider.zookeeper:1.2.500
 org.eclipse.ecf:org.apache.hadoop.zookeeper:3.3.3.v201105210832
-org.eclipse.ecf:org.eclipse.ecf.provider.jmdns:4.3.200
-org.eclipse.ecf:org.eclipse.ecf.provider.jslp:3.2.202
-org.eclipse.ecf:ch.ethz.iks.slp:1.3.1
+org.eclipse.ecf:org.eclipse.ecf.provider.jmdns:4.3.302
+org.eclipse.ecf:org.eclipse.ecf.provider.jslp:3.2.302
+org.eclipse.ecf:ch.ethz.iks.slp:1.4.1
 
 org.glassfish:javax.json:1.1.4
 
-net.sourceforge.htmlunit:htmlunit-osgi:2.35.0
+# not found anymore net.sourceforge.htmlunit:htmlunit-osgi:2.35.0
 
-biz.aQute:osgi.enroute.webconsole.xray.provider:2.2.0
+biz.aQute:osgi.enroute.webconsole.xray.provider:2.2.0