summaryrefslogtreecommitdiffstats
path: root/config-model-fat
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2023-01-19 10:27:16 +0100
committerGitHub <noreply@github.com>2023-01-19 10:27:16 +0100
commitffba12c231f17e69dcd3f72edf6308772113fd0a (patch)
tree93baca05d26d16bbf0b52498850fe395af7aec2d /config-model-fat
parent2356791d19acfc44cc4d1f4e0efa13478ca3877b (diff)
parentd94ec99b9395c714de805acae87844046b307800 (diff)
Merge pull request #25620 from vespa-engine/bjorncs/slimmer-fat-model
Bjorncs/slimmer fat model [run-systemtest]
Diffstat (limited to 'config-model-fat')
-rw-r--r--config-model-fat/pom.xml12
1 files changed, 3 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>