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 /cloud-tenant-base-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 'cloud-tenant-base-dependencies-enforcer')
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 0253683f0e3..729cd91e314 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -21,6 +21,7 @@ <!-- MUST BE KEPT IN SYNC WITH parent/pom.xml --> <athenz.version>1.10.54</athenz.version> + <felix.version>7.0.1</felix.version> <httpclient5.version>5.1.2</httpclient5.version> <httpclient.version>4.5.13</httpclient.version> <httpcore.version>4.4.13</httpcore.version> @@ -33,8 +34,6 @@ Copied here because vz-tenant-base does not have a parent. --> <aopalliance.version>1.0</aopalliance.version> <bouncycastle.version>1.68</bouncycastle.version> - <felix.version>7.0.1</felix.version> - <felix.log.version>1.0.1</felix.log.version> <guava.version>27.1-jre</guava.version> <guice.version>4.2.3</guice.version> <jackson2.version>2.13.3</jackson2.version> @@ -95,9 +94,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> @@ -214,6 +210,7 @@ <include>org.apache.commons:commons-exec:1.3:jar:test</include> <include>org.apache.commons:commons-compress:1.21:jar:test</include> <include>org.apache.commons:commons-math3:3.6.1:jar:test</include> + <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:test</include> <include>org.apache.httpcomponents.client5:httpclient5:${httpclient5.version}:jar:test</include> <include>org.apache.httpcomponents.core5:httpcore5:${httpclient5.version}:jar:test</include> <include>org.apache.httpcomponents.core5:httpcore5-h2:${httpclient5.version}:jar:test</include> |