Merge pull request #25620 from vespa-engine/bjorncs/slimmer-fat-model

Bjorncs/slimmer fat model [run-systemtest]

2 files changed, 33 insertions, 9 deletions

diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml
index 0dafb96d575..8bca56a949c 100644
--- a/config-model-fat/pom.xml
+++ b/config-model-fat/pom.xml
@@ -75,6 +75,8 @@
                   * @PublicApi - they are not allowed to change behaviour and must be binary compatible between minor releases
              -->
             <Import-Package>
+              com.google.inject, <!-- must use @Inject exported from container -->
+              com.fasterxml.*, <!-- expands to all Jackson packages by Felix plugin -->
               com.yahoo.component,
               com.yahoo.component.provider,
               com.yahoo.config,
@@ -86,7 +88,6 @@
               com.yahoo.config.provision.zone,
               com.yahoo.io.reader,
               com.yahoo.path,
-              com.google.inject, <!-- must use @Inject exported from container -->
               javax.crypto.interfaces,
               javax.crypto.spec,
               javax.crypto,
@@ -102,6 +103,7 @@
               javax.xml.parsers,
               javax.xml.transform,
               javax.xml.xpath,
+              org.bouncycastle.*, <!-- expands to all BC packages by Felix plugin -->
               org.w3c.dom.bootstrap,
               org.w3c.dom.ls,
               org.w3c.dom,
@@ -192,11 +194,6 @@
                     <i>aopalliance:aopalliance:*:*</i>
                     <i>biz.aQute.bnd:biz.aQute.bnd.util:*:*</i>
                     <i>biz.aQute.bnd:biz.aQute.bndlib:*:*</i>
-                    <i>com.fasterxml.jackson.core:jackson-annotations:*:*</i>
-                    <i>com.fasterxml.jackson.core:jackson-core:*:*</i>
-                    <i>com.fasterxml.jackson.core:jackson-databind:*:*</i>
-                    <i>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:*:*</i>
-                    <i>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:*:*</i>
                     <i>com.google.errorprone:error_prone_annotations:*:*</i>
                     <i>com.google.guava:failureaccess:*:*</i>
                     <i>com.google.guava:guava:*:*</i>
@@ -214,9 +211,6 @@
                     <i>org.antlr:antlr-runtime:*:*</i>
                     <i>org.antlr:antlr4-runtime:*:*</i>
                     <i>org.apache.felix:org.apache.felix.framework:*:*</i>
-                    <i>org.bouncycastle:bcpkix-jdk18on:*:*</i>
-                    <i>org.bouncycastle:bcprov-jdk18on:*:*</i>
-                    <i>org.bouncycastle:bcutil-jdk18on:*:*</i>
                     <i>org.hdrhistogram:HdrHistogram:*:*</i>
                     <i>org.lz4:lz4-java:*:*</i>
                     <i>org.slf4j:jcl-over-slf4j:*:*</i>
diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml
index bbac77d9c0b..b58533b32e9 100644
--- a/fat-model-dependencies/pom.xml
+++ b/fat-model-dependencies/pom.xml
@@ -32,6 +32,14 @@
           <groupId>javax.xml.bind</groupId>
           <artifactId>jaxb-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.datatype</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -43,6 +51,12 @@
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>config-application-package</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
@@ -62,6 +76,10 @@
           <groupId>com.yahoo.vespa</groupId>
           <artifactId>config-lib</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -156,6 +174,14 @@
           <groupId>org.eclipse.jetty.toolchain</groupId>
           <artifactId>*</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -198,6 +224,10 @@
           <groupId>org.apache.commons</groupId>
           <artifactId>commons-math3</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>