diff options
author | Arnstein Ressem <aressem@verizonmedia.com> | 2021-07-20 15:30:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-20 15:30:28 +0200 |
commit | 6a1fc15cbb6ed6ff8c63fc8d1043bf97a3d48ea6 (patch) | |
tree | 53a5e753ec09da4aadaa3ee4be0fa99eaedceca1 | |
parent | d7eae574bb87ecf8c350819d3bec46baa5ee6e2b (diff) | |
parent | dca0a41ddb378d46515ecedb5b0ab5a1f66ffddf (diff) |
Merge pull request #18639 from vespa-engine/revert-18631-remove-jersey-server-bundles
Revert "Remove the jersey-server bundle and dependent bundles [run-systemtest]"
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 6 | ||||
-rw-r--r-- | container-dependencies-enforcer/pom.xml | 6 | ||||
-rw-r--r-- | container-disc/pom.xml | 6 | ||||
-rw-r--r-- | vespa_jersey2/pom.xml | 50 |
4 files changed, 42 insertions, 26 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index f8649f20199..481211390e0 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -120,9 +120,15 @@ <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.containers:jersey-container-servlet-core:[${jersey2.version}]:jar:provided</include> + <include>org.glassfish.jersey.containers:jersey-container-servlet:[${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.glassfish.jersey.ext:jersey-entity-filtering:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.ext:jersey-proxy-client:[${jersey2.version}]:jar:provided</include> + <include>org.glassfish.jersey.media:jersey-media-jaxb:[${jersey2.version}]:jar:provided</include> + <include>org.glassfish.jersey.media:jersey-media-json-jackson:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.media:jersey-media-multipart:[${jersey2.version}]:jar:provided</include> <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include> <include>org.json:json:[${org.json.version}]:jar:provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 0a2ac8d8519..d692adac3c3 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -113,9 +113,15 @@ <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.containers:jersey-container-servlet-core:[${jersey2.version}]:jar:provided</include> + <include>org.glassfish.jersey.containers:jersey-container-servlet:[${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.glassfish.jersey.ext:jersey-entity-filtering:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.ext:jersey-proxy-client:[${jersey2.version}]:jar:provided</include> + <include>org.glassfish.jersey.media:jersey-media-jaxb:[${jersey2.version}]:jar:provided</include> + <include>org.glassfish.jersey.media:jersey-media-json-jackson:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.media:jersey-media-multipart:[${jersey2.version}]:jar:provided</include> <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include> <include>org.json:json:[${org.json.version}]:jar:provided</include> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 49460295850..b255b6af02a 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -229,9 +229,15 @@ javax.ws.rs-api-${javax.ws.rs-api.version}.jar, jersey-client-${jersey2.version}.jar, jersey-common-${jersey2.version}.jar, + jersey-container-servlet-${jersey2.version}.jar, + jersey-container-servlet-core-${jersey2.version}.jar, + jersey-entity-filtering-${jersey2.version}.jar, <!-- new feature from 2.16, provided for convenience --> jersey-guava-${jersey2.version}.jar, + jersey-media-jaxb-${jersey2.version}.jar, + jersey-media-json-jackson-${jersey2.version}.jar, jersey-media-multipart-${jersey2.version}.jar, mimepull-${mimepull.version}.jar, <!-- needed by media-multipart --> + jersey-server-${jersey2.version}.jar, jersey-proxy-client-${jersey2.version}.jar, osgi-resource-locator-1.0.1.jar, validation-api-1.1.0.Final.jar diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index 0aa2b0ad46e..c39b92cd371 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -20,31 +20,16 @@ <artifactId>javax.ws.rs-api</artifactId> </dependency> <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-multipart</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.ext</groupId> - <artifactId>jersey-proxy-client</artifactId> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet-core</artifactId> </dependency> <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet</artifactId> </dependency> <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-jdk8</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-jsr310</artifactId> - </dependency> - - <dependency> - <!-- Previously pulled in by jersey-media-json-jackson. Contains 'jackson.jaxrs' package imported - by routing-generator, controller-clients, provision-controller and core-dump-reporter, July 2021 --> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> <exclusions> <exclusion> <!-- Conflicts with javax.activation:javax.activation-api:1.2.0, which is "exported" via jdisc_core. --> @@ -58,12 +43,25 @@ </exclusion> </exclusions> </dependency> - <dependency> - <!-- Previously pulled in by jersey-container-servlet-core. - Contains packages imported by hosted applications, July 2021. --> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-multipart</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.ext</groupId> + <artifactId>jersey-proxy-client</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jdk8</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jsr310</artifactId> </dependency> </dependencies> |