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-dev | |
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-dev')
-rw-r--r-- | container-dev/pom.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 39276b888b1..fbea41e94a4 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -29,6 +29,14 @@ <version>${project.version}</version> <exclusions> <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + </exclusion> + <exclusion> <groupId>org.jvnet.hudson</groupId> <artifactId>annotation-indexer</artifactId> </exclusion> @@ -53,10 +61,6 @@ <classifier>no_aop</classifier> </dependency> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> |