summaryrefslogtreecommitdiffstats
path: root/jdisc_core
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-06-05 00:03:25 +0200
committergjoranv <gv@verizonmedia.com>2022-06-08 11:45:29 +0200
commit7e4e4b0b0f9c4c763a764e97c3872b4e52e2e69d (patch)
tree5deff26e735f8875b00691300857f30778e3fb68 /jdisc_core
parentb5f1fa75c245516f080c47ef986f4960561100fc (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 'jdisc_core')
-rw-r--r--jdisc_core/pom.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml
index 1c5933a02e6..8d09ea1198f 100644
--- a/jdisc_core/pom.xml
+++ b/jdisc_core/pom.xml
@@ -215,7 +215,6 @@
<argument>${exportPackagesFile}</argument>
<argument>__REPLACE_VERSION__${project.build.directory}/dependency/guava.jar</argument>
<argument>${project.build.directory}/dependency/guice-no_aop.jar</argument>
- <argument>${project.build.directory}/dependency/org.apache.felix.log.jar</argument>
<argument>${project.build.directory}/dependency/slf4j-api.jar</argument>
<argument>${project.build.directory}/dependency/slf4j-jdk14.jar</argument>
<argument>${project.build.directory}/dependency/jcl-over-slf4j.jar</argument>