Skip to content

Commit

Permalink
Repos update
Browse files Browse the repository at this point in the history
  • Loading branch information
@pkriens
pkriens committed Jun 29, 2023
1 parent 5177798 commit 79e29ca
Show file tree
Hide file tree
Showing 6 changed files with 105 additions and 175 deletions.
4 changes: 0 additions & 4 deletions cnf/build.bnd
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@

Bundle-Version: 1.0.0.${tstamp}

-remoteworkspace true
-runfw: org.apache.felix.framework
-runee: JavaSE-1.8

112 changes: 71 additions & 41 deletions cnf/ext/build.mvn
View file
Original file line number Diff line number Diff line change
@@ -1,56 +1,86 @@
# OSGi R7

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:biz.aQute.osgi.templates:1.0.0-SNAPSHOT

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:6.0.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.core:6.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.slf4j:slf4j-api:1.7.30

org.mockito:mockito-all:1.10.19
org.easymock:easymock:4.1
org.assertj:assertj-core:3.14.0

org.osgi:osgi.enroute.junit.wrapper:4.12.0
org.osgi:osgi.enroute.hamcrest.wrapper:1.3.0
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.promise:8.1.0
org.slf4j:slf4j-api:1.7.36
jakarta.servlet:jakarta.servlet-api:5.0.0
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0
25 changes: 7 additions & 18 deletions cnf/ext/defaults.bnd
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
-remoteworkspace true

-plugin.10.build: \
aQute.bnd.repository.maven.provider.MavenBndRepository; \
snapshotUrl="https://oss.sonatype.org/content/repositories/snapshots/"; \
Expand All @@ -14,23 +16,10 @@
readOnly=true; \
name="Runtime"

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

debug-bundles: \
osgi.identity;filter:='(osgi.identity=osgi.enroute.webconsole.xray.provider)',\
osgi.implementation;filter:='(osgi.implementation=osgi.metatype)',\
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)'
target-dir target${if;${driver;eclipse};;/${driver}}
src src/main/java, src/main/resources
testsrc src/test/java
bin ${target-dir}/classes
testbin ${target-dir}/test-classes
4 changes: 0 additions & 4 deletions cnf/ext/java.bnd
View file

This file was deleted.

15 changes: 0 additions & 15 deletions cnf/ext/maven-layout.bnd
View file

This file was deleted.

120 changes: 27 additions & 93 deletions cnf/ext/runtime.mvn
View file
Original file line number Diff line number Diff line change
@@ -1,103 +1,37 @@
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.configadmin:1.9.16
org.apache.felix:org.apache.felix.configurator:1.0.10
commons-fileupload:commons-fileupload:1.5
org.apache.aries.async:org.apache.aries.async:1.0.1
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.converter: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.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.2
org.apache.felix:org.apache.felix.gogo.jline:1.1.8
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.http.jetty:5.0.4
org.apache.felix:org.apache.felix.http.servlet-api:2.1.0
org.apache.felix:org.apache.felix.inventory:1.1.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.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.log:1.3.0
org.apache.felix:org.apache.felix.metatype:1.2.4
org.apache.felix:org.apache.felix.scr:2.2.6
org.apache.felix:org.apache.felix.shell.remote:1.2.0
org.jline:jline:3.13.3

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.webconsole.plugins.ds:2.1.0
org.apache.felix:org.apache.felix.webconsole.plugins.ds:2.2.0
org.apache.felix:org.apache.felix.webconsole.plugins.event:1.1.8
org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:1.0.10
org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin:1.0.4
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:4.8.8
org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-io:1.4_3
commons-fileupload:commons-fileupload:1.4

org.glassfish:javax.json:1.1.4
org.jline:jline:3.23.0
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

org.slf4j:slf4j-nop:1.7.30
org.slf4j:slf4j-simple:1.7.30

org.osgi:org.osgi.util.function:1.1.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.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.slf4j:slf4j-nop:2.0.7
org.slf4j:slf4j-simple:2.0.7
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.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.glassfish:javax.json:1.1.4

net.sourceforge.htmlunit:htmlunit-osgi:2.35.0

biz.aQute:osgi.enroute.webconsole.xray.provider:2.2.0

0 comments on commit 79e29ca

Please sign in to comment.