diff options
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 30 | ||||
| -rw-r--r-- | configserver/pom.xml | 6 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 18 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 101 | ||||
| -rw-r--r-- | orchestrator/pom.xml | 18 | ||||
| -rw-r--r-- | parent/pom.xml | 20 |
6 files changed, 19 insertions, 174 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index b5c54ea3980..ac0dcde61c6 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -37,23 +37,18 @@ <felix.log.version>1.0.1</felix.log.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> <org.lz4.version>1.8.0</org.lz4.version> + <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.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> @@ -85,11 +80,6 @@ <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 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> @@ -104,7 +94,6 @@ <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.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> @@ -117,17 +106,6 @@ <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.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> diff --git a/configserver/pom.xml b/configserver/pom.xml index d75f9b774fd..cee178c0405 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -20,6 +20,7 @@ <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>${jackson2.version}</version> <exclusions> <exclusion> <!-- Conflicts with javax.activation:javax.activation-api:1.2.0, which is "exported" via jdisc_core. --> @@ -41,10 +42,12 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> + <version>2.25</version> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> + <version>2.25</version> <exclusions> <exclusion> <groupId>org.glassfish.jersey.media</groupId> @@ -55,10 +58,12 @@ <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-proxy-client</artifactId> + <version>2.25</version> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> + <version>2.25</version> <exclusions> <!-- Prevent embedding deps provided by jdisc --> <exclusion> @@ -74,6 +79,7 @@ <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-multipart</artifactId> + <version>2.25</version> </dependency> <!-- END Jersey deps --> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 634d5b7e395..43f815ca618 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -65,12 +65,6 @@ <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 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> @@ -85,7 +79,6 @@ <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.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> @@ -98,17 +91,6 @@ <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.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> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index d213331da9e..feff08d9c6f 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -63,21 +63,6 @@ <version>${jackson2.version}</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-base</artifactId> - <version>${jackson2.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>${jackson2.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-jaxb-annotations</artifactId> - <version>${jackson2.version}</version> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${guava.version}</version> @@ -115,11 +100,6 @@ <version>${javax.servlet-api.version}</version> </dependency> <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>${javax.validation-api.version}</version> - </dependency> - <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> <version>${javax.ws.rs-api.version}</version> @@ -127,25 +107,27 @@ <!-- jaxb start --> <dependency> - <!-- Needed by felix --> + <!-- Exported from jdisc_core. Imported and directly used by e.g. vespa.factory --> + <!-- TODO Vespa 9: stop exporting/providing and move to parent? --> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>${jaxb.version}</version> </dependency> <dependency> - <!-- Needed by jersey --> + <!-- TODO Vespa 9: stop exporting/providing and move to parent? --> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId> <version>${jaxb.version}</version> </dependency> <dependency> - <!-- Needed by jersey --> + <!-- TODO Vespa 9: stop exporting/providing and move to parent? --> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> <version>${jaxb.version}</version> </dependency> <dependency> - <!-- Needed by jersey --> + <!-- Needed by jaxb-api, and possibly guice --> + <!-- TODO Vespa 9: stop exporting/providing and move to parent? --> <groupId>com.sun.activation</groupId> <artifactId>javax.activation</artifactId> <version>1.2.0</version> @@ -203,61 +185,6 @@ <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>aopalliance-repackaged</artifactId> - <version>${hk2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>javax.inject</artifactId> - <version>${hk2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.hk2</groupId> - <artifactId>hk2-api</artifactId> - <version>${hk2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.hk2</groupId> - <artifactId>hk2-locator</artifactId> - <version>${hk2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.hk2</groupId> - <artifactId>hk2-utils</artifactId> - <version>${hk2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.hk2</groupId> - <artifactId>osgi-resource-locator</artifactId> - <version>${hk2.osgi-resource-locator.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.bundles.repackaged</groupId> - <artifactId>jersey-guava</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-common</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-server</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>${javassist.version}</version> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> <version>${slf4j.version}</version> @@ -368,8 +295,11 @@ <felix.log.version>1.0.1</felix.log.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> @@ -378,19 +308,6 @@ <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> - <!-- These must be kept in sync with version used by current jersey2.version. --> - <!-- MUST be updated each time jersey2 is upgraded! --> - <!-- Check versions in the properties section of the pom for org/glassfish/jersey/project/ --> - <!-- and then verify by doing: ' ls -l vespa/vespa_jersey2/target/dependency' --> - <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.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> - <!-- Not a dependency. Only included to allow the versions-maven-plugin to check for updates of itself --> <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version> </properties> diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index 12d87f6bc07..3d9c45c9ff6 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -17,24 +17,6 @@ <name>${project.artifactId}</name> <dependencies> <dependency> - <!-- Provided by the configserver bundle --> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <!-- Conflicts with javax.activation:javax.activation-api:1.2.0, which is "exported" via jdisc_core. --> - <groupId>jakarta.activation</groupId> - <artifactId>jakarta.activation-api</artifactId> - </exclusion> - <exclusion> - <!-- Conflicts with javax.xml.bind:jaxb-api:2.3, which is "exported" via jdisc_core.--> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>container-dev</artifactId> <version>${project.version}</version> diff --git a/parent/pom.xml b/parent/pom.xml index d079760a1e9..c1650d96ca7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -829,26 +829,6 @@ <version>2.3.2</version> <!-- 2.3.3 has a BROKEN manifest --> </dependency> <dependency> - <groupId>org.glassfish.jersey.ext</groupId> - <artifactId>jersey-entity-filtering</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.ext</groupId> - <artifactId>jersey-proxy-client</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-json-jackson</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-multipart</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> <version>1.3</version> |