diff options
Diffstat (limited to 'cloud-tenant-base-dependencies-enforcer/pom.xml')
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 81 |
1 files changed, 24 insertions, 57 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 99bef1e22e6..116ba1ba403 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -8,12 +8,12 @@ <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>cloud-tenant-base</artifactId> - <version>7-SNAPSHOT</version> + <version>8-SNAPSHOT</version> <relativePath>../cloud-tenant-base/pom.xml</relativePath> </parent> <artifactId>cloud-tenant-base-dependencies-enforcer</artifactId> - <version>7-SNAPSHOT</version> + <version>8-SNAPSHOT</version> <packaging>pom</packaging> <properties> @@ -21,6 +21,8 @@ <!-- MUST BE KEPT IN SYNC WITH parent/pom.xml --> <athenz.version>1.10.54</athenz.version> + <bouncycastle.version>1.68</bouncycastle.version> + <felix.version>7.0.1</felix.version> <httpclient5.version>5.1.2</httpclient5.version> <httpclient.version>4.5.13</httpclient.version> <httpcore.version>4.4.13</httpcore.version> @@ -32,14 +34,13 @@ <!-- ALL BELOW MUST BE KEPT IN SYNC WITH container-dependency-versions pom Copied here because vz-tenant-base does not have a parent. --> <aopalliance.version>1.0</aopalliance.version> - <bouncycastle.version>1.68</bouncycastle.version> - <felix.version>7.0.1</felix.version> - <felix.log.version>1.0.1</felix.log.version> - <findbugs.version>1.3.9</findbugs.version> - <guava.version>20.0</guava.version> - <guice.version>3.0</guice.version> + <guava.version>27.1-jre</guava.version> + <guice.version>4.2.3</guice.version> + <jackson2.version>2.13.3</jackson2.version> + <jackson-databind.version>${jackson2.version}</jackson-databind.version> <javax.inject.version>1</javax.inject.version> <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>9.4.46.v20220331</jetty.version> <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> @@ -47,16 +48,6 @@ <org.json.version>20090211</org.json.version> <slf4j.version>1.7.32</slf4j.version> <!-- WARNING: when updated, also update c.y.v.tenant:base pom --> <xml-apis.version>1.4.01</xml-apis.version> - - <hk2.version>2.5.0-b32</hk2.version> - <hk2.osgi-resource-locator.version>1.0.1</hk2.osgi-resource-locator.version> - <jackson2.version>2.13.3</jackson2.version> - <jackson-databind.version>${jackson2.version}</jackson-databind.version> - <javassist.version>3.20.0-GA</javassist.version> - <javax.annotation-api.version>1.2</javax.annotation-api.version> - <javax.validation-api.version>1.1.0.Final</javax.validation-api.version> - <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version> - <jersey2.version>2.25</jersey2.version> </properties> <build> @@ -88,50 +79,21 @@ <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> - <!-- Use version range for jax deps, because jersey and junit affect the versions. --> - <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:[2.5.4, ${jackson2.version}]:jar:provided</include> - <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:[2.5.4, ${jackson2.version}]:jar:provided</include> - <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:[2.5.4, ${jackson2.version}]:jar:provided</include> - - <!-- guava with dependencies --> - <include>com.google.code.findbugs:jsr305:[${findbugs.version}]:jar: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.inject.extensions:guice-assistedinject:[${guice.version}]:jar:provided</include> - <include>com.google.inject.extensions:guice-multibindings:[${guice.version}]:jar: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.annotation:javax.annotation-api:[${javax.annotation-api.version}]: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.validation:validation-api:[${javax.validation-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>net.jcip:jcip-annotations:[1.0]:jar:provided</include> - <include>org.lz4:lz4-java:[${org.lz4.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include> - <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided</include> - <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided</include> - <include>org.eclipse.jetty:jetty-http:[${jetty.version}]:jar:provided</include> - <include>org.eclipse.jetty:jetty-io:[${jetty.version}]:jar:provided</include> - <include>org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:provided</include> - <include>org.glassfish.hk2.external:aopalliance-repackaged:[${hk2.version}]:jar:provided</include> - <include>org.glassfish.hk2.external:javax.inject:[${hk2.version}]:jar:provided</include> - <include>org.glassfish.hk2:hk2-api:[${hk2.version}]:jar:provided</include> - <include>org.glassfish.hk2:hk2-locator:[${hk2.version}]:jar:provided</include> - <include>org.glassfish.hk2:hk2-utils:[${hk2.version}]:jar:provided</include> - <include>org.glassfish.hk2:osgi-resource-locator:[${hk2.osgi-resource-locator.version}]:jar:provided</include> - <include>org.glassfish.jersey.bundles.repackaged:jersey-guava:[${jersey2.version}]:jar:provided</include> - <include>org.glassfish.jersey.core:jersey-client:[${jersey2.version}]:jar:provided</include> - <include>org.glassfish.jersey.core:jersey-common:[${jersey2.version}]:jar:provided</include> - <include>org.glassfish.jersey.core:jersey-server:[${jersey2.version}]:jar:provided</include> - <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include> - <include>org.json:json:[${org.json.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> @@ -174,10 +136,8 @@ <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:statistics:*:jar:provided</include> <include>com.yahoo.vespa:vdslib:*:jar:provided</include> - <include>com.yahoo.vespa:vespa-http-client:*:jar:provided</include> - <include>com.yahoo.vespa:vespa_jersey2:*:pom: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> @@ -208,7 +168,7 @@ <include>com.yahoo.vespa:vespa-athenz:*: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:vespa_jersey2:*:pom:test</include> + <include>com.yahoo.vespa:vespa-3party-bundles:*:pom:test</include> <include>com.yahoo.vespa:vespaclient-core:*:jar:test</include> <include>com.yahoo.vespa:vsm:*:jar:test</include> @@ -247,6 +207,7 @@ <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.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> @@ -255,29 +216,35 @@ <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.codehaus.woodstox:stax2-api:3.1.4:jar:test</include> + <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:test</include> + <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:test</include> <include>org.codehaus.woodstox:stax2-api:3.1.4:jar:test</include> <include>org.eclipse.jetty.alpn:alpn-api:[${jetty-alpn.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:jetty-alpn-server:[${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-continuation:[${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-servlets:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-util-ajax:[${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:20090211: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.kohsuke:libpam4j:1.11: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>software.amazon.ion:ion-java:1.0.2:jar:test</include> <include>xerces:xercesImpl:2.12.1:jar:test</include> |