diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-09-04 19:49:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-04 19:49:27 +0200 |
commit | 8586e0137c6ec1dc0a9d10b0fcbc5578e122c504 (patch) | |
tree | 0d356ae9de3ec1642e6fce735631d60d19a4c787 /config-model-fat/pom.xml | |
parent | 5b60dfc46e42d7c78f68e74f71b76ae8ad41e14d (diff) | |
parent | bedbd44069d0464bbd23a367e144cb32fad4573a (diff) |
Merge branch 'master' into bjorncs/move-jersey-out
Diffstat (limited to 'config-model-fat/pom.xml')
-rw-r--r-- | config-model-fat/pom.xml | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index adf511faabe..55592897447 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -98,16 +98,10 @@ javax.security.auth.callback, javax.security.auth.x500, javax.security.auth, - javax.xml.datatype, - javax.xml.namespace, - javax.xml.parsers, - javax.xml.transform, - javax.xml.xpath, + javax.xml.*, <!-- expands to all packages in Java module java.xml --> org.bouncycastle.*, <!-- expands to all BC packages by Felix plugin --> - org.w3c.dom.bootstrap, - org.w3c.dom.ls, - org.w3c.dom, - org.xml.sax, + org.w3c.dom.*, <!-- expands to all packages in Java module java.xml --> + org.xml.sax.*, <!-- expands to all packages in Java module java.xml --> <!-- TODO: The fat bundle becomes more brittle for each package added below. Use interfaces in model-api instead. --> com.yahoo.vespa.config, com.yahoo.vespa.config.buildergen, @@ -195,7 +189,7 @@ <i>com.google.errorprone:error_prone_annotations:*:*</i> <i>com.google.guava:failureaccess:*:*</i> <i>com.google.guava:guava:*:*</i> - <i>com.google.inject:guice:jar:no_aop:*:*</i> + <i>com.google.inject:guice:jar:*:*</i> <i>com.google.j2objc:j2objc-annotations:*:*</i> <i>com.google.protobuf:protobuf-java:*:*</i> <i>com.sun.activation:javax.activation:*:*</i> @@ -207,6 +201,7 @@ <i>io.prometheus:simpleclient_tracer_common:*:*</i> <i>io.prometheus:simpleclient_tracer_otel:*:*</i> <i>io.prometheus:simpleclient_tracer_otel_agent:*:*</i> + <i>jakarta.inject:jakarta.inject-api:*:*</i> <i>javax.inject:javax.inject:*:*</i> <i>net.openhft:zero-allocation-hashing:*:*</i> <i>org.antlr:antlr-runtime:*:*</i> @@ -219,7 +214,6 @@ <i>org.slf4j:slf4j-api:*:*</i> <i>org.slf4j:slf4j-jdk14:*:*</i> <i>xerces:xercesImpl:*:*</i> - <i>xml-apis:xml-apis:*:*</i> </allowed> </enforceDependencies> </rules> |