From 7e4e4b0b0f9c4c763a764e97c3872b4e52e2e69d Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Sun, 5 Jun 2022 00:03:25 +0200
Subject: 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.
---
 parent/pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'parent')

diff --git a/parent/pom.xml b/parent/pom.xml
index c23b19a64bf..05b3df87e51 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -666,6 +666,22 @@
                 <artifactId>commons-csv</artifactId>
                 <version>1.8</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.framework</artifactId>
+                <version>${felix.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>animal-sniffer-annotations</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.log</artifactId>
+                <version>${felix.log.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
@@ -972,6 +988,8 @@
         <commons.codec.version>1.15</commons.codec.version>
         <commons.math3.version>3.6.1</commons.math3.version>
         <eclipse-collections.version>11.0.0</eclipse-collections.version>
+        <felix.version>7.0.1</felix.version>
+        <felix.log.version>1.0.1</felix.log.version>
         <findbugs.version>3.0.2</findbugs.version> <!-- Should be kept in sync with guava -->
         <gson.version>2.8.9</gson.version>
         <hdrhistogram.version>2.1.12</hdrhistogram.version>
-- 
cgit v1.2.3