diff options
Diffstat (limited to 'cloud-tenant-base-dependencies-enforcer/pom.xml')
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 292 |
1 files changed, 148 insertions, 144 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 8ba9794d75c..05ffa0b5c97 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -43,7 +43,8 @@ <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version> <jaxb.version>2.3.0</jaxb.version> - <jetty.version>11.0.12</jetty.version> + <jetty.version>9.4.49.v20220914</jetty.version> + <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> <org.lz4.version>1.8.0</org.lz4.version> <org.json.version>20220320</org.json.version> <!-- TODO: Remove on Vespa 9 --> <slf4j.version>1.7.32</slf4j.version> <!-- WARNING: when updated, also update c.y.v.tenant:base pom --> @@ -75,158 +76,161 @@ <enforceDependencies implementation="com.yahoo.vespa.maven.plugin.enforcer.EnforceDependencies"> <allowed> <!-- MUST BE KEPT IN SYNC WITH container-dependencies-enforcer pom --> - <include>aopalliance:aopalliance:[${aopalliance.version}]:jar:provided</include> - <include>com.fasterxml.jackson.core:jackson-annotations:[${jackson2.version}]:jar:provided</include> - <include>com.fasterxml.jackson.core:jackson-core:[${jackson2.version}]:jar:provided</include> - <include>com.fasterxml.jackson.core:jackson-databind:[${jackson-databind.version}]:jar:provided</include> - <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[${jackson2.version}]:jar:provided</include> - <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[${jackson2.version}]:jar:provided</include> + <include>aopalliance:aopalliance:${aopalliance.version}:provided</include> + <include>com.fasterxml.jackson.core:jackson-annotations:${jackson2.version}:provided</include> + <include>com.fasterxml.jackson.core:jackson-core:${jackson2.version}:provided</include> + <include>com.fasterxml.jackson.core:jackson-databind:${jackson-databind.version}:provided</include> + <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.version}:provided</include> + <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.version}:provided</include> <!-- Guava with its internal dependencies --> - <include>com.google.guava:guava:[${guava.version}]:jar:provided</include> - <include>com.google.errorprone:error_prone_annotations:[2.2.0]:jar:provided</include> - <include>com.google.guava:failureaccess:[1.0.1]:jar:provided</include> - <include>com.google.j2objc:j2objc-annotations:[1.1]:jar:provided</include> + <include>com.google.guava:guava:${guava.version}:provided</include> + <include>com.google.errorprone:error_prone_annotations:2.2.0:provided</include> + <include>com.google.guava:failureaccess:1.0.1:provided</include> + <include>com.google.j2objc:j2objc-annotations:1.1:provided</include> - <include>com.google.inject:guice:[${guice.version}]:jar:provided:no_aop</include> - <include>com.sun.activation:javax.activation:[1.2.0]:jar:provided</include> - <include>com.sun.xml.bind:jaxb-core:[${jaxb.version}]:jar:provided</include> - <include>com.sun.xml.bind:jaxb-impl:[${jaxb.version}]:jar:provided</include> - <include>commons-logging:commons-logging:[1.2]:jar:provided</include> - <include>javax.inject:javax.inject:[${javax.inject.version}]:jar:provided</include> - <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include> - <include>javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided</include> - <include>javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided</include> - <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include> - <include>org.slf4j:log4j-over-slf4j:[${slf4j.version}]:jar:provided</include> - <include>org.slf4j:slf4j-api:[${slf4j.version}]:jar:provided</include> - <include>org.slf4j:slf4j-jdk14:[${slf4j.version}]:jar:provided</include> - <include>xml-apis:xml-apis:[${xml-apis.version}]:jar:provided</include> + <include>com.google.inject:guice:jar:no_aop:${guice.version}:provided</include> + <include>com.sun.activation:javax.activation:1.2.0:provided</include> + <include>com.sun.xml.bind:jaxb-core:${jaxb.version}:provided</include> + <include>com.sun.xml.bind:jaxb-impl:${jaxb.version}:provided</include> + <include>commons-logging:commons-logging:1.2:provided</include> + <include>javax.inject:javax.inject:${javax.inject.version}:provided</include> + <include>javax.servlet:javax.servlet-api:${javax.servlet-api.version}:provided</include> + <include>javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.version}:provided</include> + <include>javax.xml.bind:jaxb-api:${jaxb.version}:provided</include> + <include>org.slf4j:jcl-over-slf4j:${slf4j.version}:provided</include> + <include>org.slf4j:log4j-over-slf4j:${slf4j.version}:provided</include> + <include>org.slf4j:slf4j-api:${slf4j.version}:provided</include> + <include>org.slf4j:slf4j-jdk14:${slf4j.version}:provided</include> + <include>xml-apis:xml-apis:${xml-apis.version}:provided</include> <!-- Vespa provided dependencies --> - <include>com.yahoo.vespa:annotations:*:jar:provided</include> - <include>com.yahoo.vespa:component:*:jar:provided</include> - <include>com.yahoo.vespa:config-bundle:*:jar:provided</include> - <include>com.yahoo.vespa:config-lib:*:jar:provided</include> - <include>com.yahoo.vespa:config:*:jar:provided</include> - <include>com.yahoo.vespa:configdefinitions:*:jar:provided</include> - <include>com.yahoo.vespa:configgen:*:jar:provided</include> - <include>com.yahoo.vespa:container-core:*:jar:provided</include> - <include>com.yahoo.vespa:container-dev:*:jar:provided</include> - <include>com.yahoo.vespa:container-disc:*:jar:provided</include> - <include>com.yahoo.vespa:container-documentapi:*:jar:provided</include> - <include>com.yahoo.vespa:container-messagebus:*:jar:provided</include> - <include>com.yahoo.vespa:container-search-and-docproc:*:jar:provided</include> - <include>com.yahoo.vespa:container-search:*:jar:provided</include> - <include>com.yahoo.vespa:container:*:jar:provided</include> - <include>com.yahoo.vespa:defaults:*:jar:provided</include> - <include>com.yahoo.vespa:docproc:*:jar:provided</include> - <include>com.yahoo.vespa:document:*:jar:provided</include> - <include>com.yahoo.vespa:documentapi:*:jar:provided</include> - <include>com.yahoo.vespa:fileacquirer:*:jar:provided</include> - <include>com.yahoo.vespa:fsa:*:jar:provided</include> - <include>com.yahoo.vespa:hosted-zone-api:*:jar:provided</include> - <include>com.yahoo.vespa:http-utils:*:jar:provided</include> - <include>com.yahoo.vespa:jdisc_core:*:jar:provided</include> - <include>com.yahoo.vespa:jrt:*:jar:provided</include> - <include>com.yahoo.vespa:linguistics:*:jar:provided</include> - <include>com.yahoo.vespa:messagebus:*:jar:provided</include> - <include>com.yahoo.vespa:model-evaluation:*:jar:provided</include> - <include>com.yahoo.vespa:predicate-search-core:*:jar:provided</include> - <include>com.yahoo.vespa:provided-dependencies:*:jar:provided</include> - <include>com.yahoo.vespa:searchcore:*:jar:provided</include> - <include>com.yahoo.vespa:searchlib:*:jar:provided</include> - <include>com.yahoo.vespa:security-utils:*:jar:provided</include> - <include>com.yahoo.vespa:vdslib:*:jar:provided</include> - <include>com.yahoo.vespa:vespa-3party-bundles:*:pom:provided</include> - <include>com.yahoo.vespa:vespaclient-container-plugin:*:jar:provided</include> - <include>com.yahoo.vespa:vespajlib:*:jar:provided</include> - <include>com.yahoo.vespa:vespalog:*:jar:provided</include> + <include>com.yahoo.vespa:annotations:*:provided</include> + <include>com.yahoo.vespa:component:*:provided</include> + <include>com.yahoo.vespa:config-bundle:*:provided</include> + <include>com.yahoo.vespa:config-lib:*:provided</include> + <include>com.yahoo.vespa:config:*:provided</include> + <include>com.yahoo.vespa:configdefinitions:*:provided</include> + <include>com.yahoo.vespa:configgen:*:provided</include> + <include>com.yahoo.vespa:container-core:*:provided</include> + <include>com.yahoo.vespa:container-dev:*:provided</include> + <include>com.yahoo.vespa:container-disc:*:provided</include> + <include>com.yahoo.vespa:container-documentapi:*:provided</include> + <include>com.yahoo.vespa:container-messagebus:*:provided</include> + <include>com.yahoo.vespa:container-search-and-docproc:*:provided</include> + <include>com.yahoo.vespa:container-search:*:provided</include> + <include>com.yahoo.vespa:container:*:provided</include> + <include>com.yahoo.vespa:defaults:*:provided</include> + <include>com.yahoo.vespa:docproc:*:provided</include> + <include>com.yahoo.vespa:document:*:provided</include> + <include>com.yahoo.vespa:documentapi:*:provided</include> + <include>com.yahoo.vespa:fileacquirer:*:provided</include> + <include>com.yahoo.vespa:fsa:*:provided</include> + <include>com.yahoo.vespa:hosted-zone-api:*:provided</include> + <include>com.yahoo.vespa:http-utils:*:provided</include> + <include>com.yahoo.vespa:jdisc_core:*:provided</include> + <include>com.yahoo.vespa:jrt:*:provided</include> + <include>com.yahoo.vespa:linguistics:*:provided</include> + <include>com.yahoo.vespa:messagebus:*:provided</include> + <include>com.yahoo.vespa:model-evaluation:*:provided</include> + <include>com.yahoo.vespa:predicate-search-core:*:provided</include> + <include>com.yahoo.vespa:provided-dependencies:*:provided</include> + <include>com.yahoo.vespa:searchcore:*:provided</include> + <include>com.yahoo.vespa:searchlib:*:provided</include> + <include>com.yahoo.vespa:security-utils:*:provided</include> + <include>com.yahoo.vespa:vdslib:*:provided</include> + <include>com.yahoo.vespa:vespa-3party-bundles:pom:*:provided</include> + <include>com.yahoo.vespa:vespaclient-container-plugin:*:provided</include> + <include>com.yahoo.vespa:vespajlib:*:provided</include> + <include>com.yahoo.vespa:vespalog:*:provided</include> <!-- Vespa test dependencies --> - <include>com.yahoo.vespa:application:*:jar:test</include> - <include>com.yahoo.vespa:cloud-tenant-cd:*:jar:test</include> - <include>com.yahoo.vespa:config-application-package:*:jar:test</include> - <include>com.yahoo.vespa:config-model-api:*:jar:test</include> - <include>com.yahoo.vespa:config-model:*:jar:test</include> - <include>com.yahoo.vespa:config-provisioning:*:jar:test</include> - <include>com.yahoo.vespa:container-apache-http-client-bundle:*:jar:test</include> - <include>com.yahoo.vespa:container-test:*:jar:test</include> - <include>com.yahoo.vespa:hosted-api:*:jar:test</include> - <include>com.yahoo.vespa:indexinglanguage:*:jar:test</include> - <include>com.yahoo.vespa:logd:*:jar:test</include> - <include>com.yahoo.vespa:metrics-proxy:*:jar:test</include> - <include>com.yahoo.vespa:metrics:*:jar:test</include> - <include>com.yahoo.vespa:model-integration:*:jar:test</include> - <include>com.yahoo.vespa:searchsummary:*:jar:test</include> - <include>com.yahoo.vespa:standalone-container:*:jar:test</include> - <include>com.yahoo.vespa:storage:*:jar:test</include> - <include>com.yahoo.vespa:tenant-cd-api:*:jar:test</include> - <include>com.yahoo.vespa:tenant-cd-commons:*:jar:test</include> - <include>com.yahoo.vespa:vespa-feed-client:*:jar:test</include> - <include>com.yahoo.vespa:vespa-feed-client-api:*:jar:test</include> - <include>com.yahoo.vespa:vespaclient-core:*:jar:test</include> - <include>com.yahoo.vespa:vsm:*:jar:test</include> + <include>com.yahoo.vespa:application:*:test</include> + <include>com.yahoo.vespa:cloud-tenant-cd:*:test</include> + <include>com.yahoo.vespa:config-application-package:*:test</include> + <include>com.yahoo.vespa:config-model-api:*:test</include> + <include>com.yahoo.vespa:config-model:*:test</include> + <include>com.yahoo.vespa:config-provisioning:*:test</include> + <include>com.yahoo.vespa:container-apache-http-client-bundle:*:test</include> + <include>com.yahoo.vespa:container-test:*:test</include> + <include>com.yahoo.vespa:hosted-api:*:test</include> + <include>com.yahoo.vespa:indexinglanguage:*:test</include> + <include>com.yahoo.vespa:logd:*:test</include> + <include>com.yahoo.vespa:metrics-proxy:*:test</include> + <include>com.yahoo.vespa:metrics:*:test</include> + <include>com.yahoo.vespa:model-integration:*:test</include> + <include>com.yahoo.vespa:searchsummary:*:test</include> + <include>com.yahoo.vespa:standalone-container:*:test</include> + <include>com.yahoo.vespa:storage:*:test</include> + <include>com.yahoo.vespa:tenant-cd-api:*:test</include> + <include>com.yahoo.vespa:tenant-cd-commons:*:test</include> + <include>com.yahoo.vespa:vespa-feed-client:*:test</include> + <include>com.yahoo.vespa:vespa-feed-client-api:*:test</include> + <include>com.yahoo.vespa:vespaclient-core:*:test</include> + <include>com.yahoo.vespa:vsm:*:test</include> <!-- 3rd party test dependencies --> - <include>com.google.code.findbugs:jsr305:3.0.2:jar:test</include> - <include>com.google.protobuf:protobuf-java:3.7.0:jar:test</include> - <include>com.ibm.icu:icu4j:57.1:jar:test</include> - <include>com.microsoft.onnxruntime:onnxruntime:[${onnxruntime.version}]:jar:test</include> - <include>com.thaiopensource:jing:20091111:jar:test</include> - <include>commons-codec:commons-codec:[${commons-codec.version}]:jar:test</include> - <include>io.airlift:aircompressor:0.17:jar:test</include> - <include>io.airlift:airline:0.7:jar:test</include> - <include>io.prometheus:simpleclient:0.6.0:jar:test</include> - <include>io.prometheus:simpleclient_common:0.6.0:jar:test</include> - <include>junit:junit:4.13.2:jar:test</include> - <include>net.java.dev.jna:jna:5.11.0:jar:test</include> - <include>org.antlr:antlr-runtime:3.5.2:jar:test</include> - <include>org.antlr:antlr4-runtime:4.9.3:jar:test</include> - <include>org.apache.commons:commons-exec:1.3:jar:test</include> - <include>org.apache.commons:commons-compress:1.21:jar:test</include> - <include>org.apache.commons:commons-math3:3.6.1:jar:test</include> - <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:test</include> - <include>org.apache.felix:org.apache.felix.log:1.0.1:jar:test</include> - <include>org.apache.httpcomponents.client5:httpclient5:${httpclient5.version}:jar:test</include> - <include>org.apache.httpcomponents.core5:httpcore5:${httpclient5.version}:jar:test</include> - <include>org.apache.httpcomponents.core5:httpcore5-h2:${httpclient5.version}:jar:test</include> - <include>org.apache.httpcomponents:httpclient:${httpclient.version}:jar:test</include> - <include>org.apache.httpcomponents:httpcore:${httpcore.version}:jar:test</include> - <include>org.apache.httpcomponents:httpmime:${httpclient.version}:jar:test</include> - <include>org.apache.opennlp:opennlp-tools:1.9.3:jar:test</include> - <include>org.apiguardian:apiguardian-api:1.1.0:jar:test</include> - <include>org.bouncycastle:bcpkix-jdk18on:[${bouncycastle.version}]:jar:test</include> - <include>org.bouncycastle:bcprov-jdk18on:[${bouncycastle.version}]:jar:test</include> - <include>org.bouncycastle:bcutil-jdk18on:[${bouncycastle.version}]:jar:test</include> - <include>org.eclipse.jetty.http2:http2-common:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty.http2:http2-hpack:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty.http2:http2-server:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2:jar:test</include> - <include>org.eclipse.jetty:jetty-alpn-client:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty:jetty-alpn-java-server:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty:jetty-alpn-server:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty:jetty-client:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty:jetty-http:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty:jetty-io:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty:jetty-jmx:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty:jetty-security:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty:jetty-server:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty:jetty-servlet:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:test</include> - <include>org.hamcrest:hamcrest-core:1.3:jar:test</include> - <include>org.hdrhistogram:HdrHistogram:2.1.8:jar:test</include> - <include>org.json:json:${org.json.version}:jar:test</include> - <include>org.junit.jupiter:junit-jupiter-api:[${junit5.version}]:jar:test</include> - <include>org.junit.jupiter:junit-jupiter-engine:[${junit5.version}]:jar:test</include> - <include>org.junit.platform:junit-platform-commons:[${junit5.platform.version}]:jar:test</include> - <include>org.junit.platform:junit-platform-engine:[${junit5.platform.version}]:jar:test</include> - <include>org.junit.vintage:junit-vintage-engine:[${junit5.version}]:jar:test</include> - <include>org.lz4:lz4-java:[${org.lz4.version}]:jar:test</include> - <include>org.opentest4j:opentest4j:1.2.0:jar:test</include> - <include>org.osgi:org.osgi.compendium:4.1.0:jar:test</include> - <include>org.osgi:org.osgi.core:4.1.0:jar:test</include> - <include>xerces:xercesImpl:2.12.1:jar:test</include> + <include>com.google.code.findbugs:jsr305:3.0.2:test</include> + <include>com.google.protobuf:protobuf-java:3.21.7:test</include> + <include>com.ibm.icu:icu4j:70.1:test</include> + <include>com.microsoft.onnxruntime:onnxruntime:${onnxruntime.version}:test</include> + <include>com.thaiopensource:jing:20091111:test</include> + <include>commons-codec:commons-codec:${commons-codec.version}:test</include> + <include>io.airlift:aircompressor:0.21:test</include> + <include>io.airlift:airline:0.9:test</include> + <include>io.prometheus:simpleclient:0.6.0:test</include> + <include>io.prometheus:simpleclient_common:0.6.0:test</include> + <include>junit:junit:4.13.2:test</include> + <include>net.java.dev.jna:jna:5.11.0:test</include> + <include>org.antlr:antlr-runtime:3.5.2:test</include> + <include>org.antlr:antlr4-runtime:4.9.3:test</include> + <include>org.apache.commons:commons-exec:1.3:test</include> + <include>org.apache.commons:commons-compress:1.21:test</include> + <include>org.apache.commons:commons-math3:3.6.1:test</include> + <include>org.apache.felix:org.apache.felix.framework:${felix.version}:test</include> + <include>org.apache.felix:org.apache.felix.log:1.0.1:test</include> + <include>org.apache.httpcomponents.client5:httpclient5:${httpclient5.version}:test</include> + <include>org.apache.httpcomponents.core5:httpcore5:${httpclient5.version}:test</include> + <include>org.apache.httpcomponents.core5:httpcore5-h2:${httpclient5.version}:test</include> + <include>org.apache.httpcomponents:httpclient:${httpclient.version}:test</include> + <include>org.apache.httpcomponents:httpcore:${httpcore.version}:test</include> + <include>org.apache.httpcomponents:httpmime:${httpclient.version}:test</include> + <include>org.apache.opennlp:opennlp-tools:1.9.3:test</include> + <include>org.apiguardian:apiguardian-api:1.1.2:test</include> + <include>org.bouncycastle:bcpkix-jdk18on:${bouncycastle.version}:test</include> + <include>org.bouncycastle:bcprov-jdk18on:${bouncycastle.version}:test</include> + <include>org.bouncycastle:bcutil-jdk18on:${bouncycastle.version}:test</include> + <include>org.eclipse.jetty.alpn:alpn-api:jar:${jetty-alpn.version}:test</include> + <include>org.eclipse.jetty.http2:http2-common:${jetty.version}:test</include> + <include>org.eclipse.jetty.http2:http2-hpack:${jetty.version}:test</include> + <include>org.eclipse.jetty.http2:http2-server:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-alpn-java-server:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-alpn-server:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-client:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-continuation:jar:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-http:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-io:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-jmx:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-security:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-server:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-servlet:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-servlets:jar:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-util-ajax:jar:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-util:${jetty.version}:test</include> + + <include>org.hamcrest:hamcrest-core:1.3:test</include> + <include>org.hdrhistogram:HdrHistogram:2.1.12:test</include> + <include>org.json:json:${org.json.version}:test</include> + <include>org.junit.jupiter:junit-jupiter-api:${junit5.version}:test</include> + <include>org.junit.jupiter:junit-jupiter-engine:${junit5.version}:test</include> + <include>org.junit.platform:junit-platform-commons:${junit5.platform.version}:test</include> + <include>org.junit.platform:junit-platform-engine:${junit5.platform.version}:test</include> + <include>org.junit.vintage:junit-vintage-engine:${junit5.version}:test</include> + <include>org.lz4:lz4-java:${org.lz4.version}:test</include> + <include>org.opentest4j:opentest4j:1.2.0:test</include> + <include>org.osgi:org.osgi.compendium:4.1.0:test</include> + <include>org.osgi:org.osgi.core:4.1.0:test</include> + <include>xerces:xercesImpl:2.12.2:test</include> </allowed> </enforceDependencies> </rules> |