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-dependency-versions | |
| 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-dependency-versions')
| -rw-r--r-- | container-dependency-versions/pom.xml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 771451084c8..a47b91f3231 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -130,21 +130,6 @@ <!-- jaxb end --> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>${felix.version}</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <version>${felix.log.version}</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>${felix.version}</version> - </dependency> - <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> <version>${bouncycastle.version}</version> @@ -261,8 +246,6 @@ <properties> <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> |