diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-06-05 00:03:25 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:29 +0200 |
| commit | 7e4e4b0b0f9c4c763a764e97c3872b4e52e2e69d (patch) | |
| tree | 5deff26e735f8875b00691300857f30778e3fb68 /container-dependencies-enforcer | |
| parent | b5f1fa75c245516f080c47ef986f4960561100fc (diff) | |
Don't provide any felix artifacts via 'container'
+ Stop exporting felix.log packages (org.osgi.service.log)
+ Completely remove felix.main (the felix launcher including
everything in felix.framework). This was probably never needed
by vespa.
* Add explicit felix.framework dep to vespa-osgi-testrunner and
standalone-container, as it's no longer included in container-dev.
(The packages are still exported by jdisc_core, so imports will be generated.)
* Add felix.framework to 'application', as it's needed for unit tests.
* Exclude animal-sniffer-annotations from felix.framework in parent.
Not needed anywhere by Vespa.
Diffstat (limited to 'container-dependencies-enforcer')
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index e507bffa7dc..56ebc92f88d 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -80,9 +80,6 @@ <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include> <include>javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided</include> <include>javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include> <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided</include> <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided</include> <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include> |