summaryrefslogtreecommitdiffstats
path: root/standalone-container
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 /standalone-container
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 'standalone-container')
-rw-r--r--standalone-container/pom.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml
index 25c4b8f801f..b9b58f37c00 100644
--- a/standalone-container/pom.xml
+++ b/standalone-container/pom.xml
@@ -72,6 +72,11 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>