summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2022-11-28 16:21:25 +0100
committerGitHub <noreply@github.com>2022-11-28 16:21:25 +0100
commit57ace05da625364d3361dd18ddc4079e39334a5a (patch)
tree6bbc7adc237555a1c6825783f7efb16b875d709a
parent70223708bff9507e684354d6e7ce72cff710de90 (diff)
parent131cd4fc349edc5437480ef4e95395c1cbde35be (diff)
Merge pull request #25027 from vespa-engine/bjorncs/config-model-fat
Remove Jetty artifacts from config-model-fat
-rw-r--r--config-model-fat/pom.xml18
-rw-r--r--fat-model-dependencies/pom.xml12
2 files changed, 12 insertions, 18 deletions
diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml
index 21e1a10103c..2adcc450669 100644
--- a/config-model-fat/pom.xml
+++ b/config-model-fat/pom.xml
@@ -208,7 +208,6 @@
<i>io.prometheus:simpleclient:*:*</i>
<i>io.prometheus:simpleclient_common:*:*</i>
<i>javax.inject:javax.inject:*:*</i>
- <i>javax.servlet:javax.servlet-api:*:*</i>
<i>net.openhft:zero-allocation-hashing:*:*</i>
<i>org.antlr:antlr-runtime:*:*</i>
<i>org.antlr:antlr4-runtime:*:*</i>
@@ -216,23 +215,6 @@
<i>org.bouncycastle:bcpkix-jdk18on:*:*</i>
<i>org.bouncycastle:bcprov-jdk18on:*:*</i>
<i>org.bouncycastle:bcutil-jdk18on:*:*</i>
- <i>org.eclipse.jetty:jetty-alpn-java-server:*:*</i>
- <i>org.eclipse.jetty:jetty-alpn-server:*:*</i>
- <i>org.eclipse.jetty:jetty-client:*:*</i>
- <i>org.eclipse.jetty:jetty-continuation:*:*</i>
- <i>org.eclipse.jetty:jetty-http:*:*</i>
- <i>org.eclipse.jetty:jetty-io:*:*</i>
- <i>org.eclipse.jetty:jetty-jmx:*:*</i>
- <i>org.eclipse.jetty:jetty-security:*:*</i>
- <i>org.eclipse.jetty:jetty-server:*:*</i>
- <i>org.eclipse.jetty:jetty-servlet:*:*</i>
- <i>org.eclipse.jetty:jetty-servlets:*:*</i>
- <i>org.eclipse.jetty:jetty-util:*:*</i>
- <i>org.eclipse.jetty:jetty-util-ajax:*:*</i>
- <i>org.eclipse.jetty.alpn:alpn-api:*:*</i>
- <i>org.eclipse.jetty.http2:http2-common:*:*</i>
- <i>org.eclipse.jetty.http2:http2-hpack:*:*</i>
- <i>org.eclipse.jetty.http2:http2-server:*:*</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 ff77b5e9601..f69cbc55617 100644
--- a/fat-model-dependencies/pom.xml
+++ b/fat-model-dependencies/pom.xml
@@ -141,6 +141,18 @@
<groupId>com.yahoo.vespa</groupId>
<artifactId>opennlp-linguistics</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.alpn</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>