diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-09-04 23:06:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-04 23:06:30 +0200 |
commit | b2ebcb0f23d7556d3b528422351b0a6679040556 (patch) | |
tree | 0d356ae9de3ec1642e6fce735631d60d19a4c787 | |
parent | bedbd44069d0464bbd23a367e144cb32fad4573a (diff) | |
parent | 8586e0137c6ec1dc0a9d10b0fcbc5578e122c504 (diff) |
Merge pull request #28388 from vespa-engine/bjorncs/move-jersey-outv8.221.29
Move Jersey out of open-source Vespa
8 files changed, 1 insertions, 119 deletions
diff --git a/configserver/pom.xml b/configserver/pom.xml index c750e4fe0f6..95ab31155ce 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -12,78 +12,6 @@ <packaging>container-plugin</packaging> <version>8-SNAPSHOT</version> <dependencies> - - <!-- BEGIN Jersey deps. - TODO: Vespa > 8, and provision-controller does not import any Jersey related packages: - Remove, and remove all package-info.java files for jersey/jackson packages. --> - - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>${jackson2.vespa.version}</version> - <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>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - <version>${jersey.vespa.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-server</artifactId> - <version>${jersey.vespa.version}</version> - <exclusions> - <exclusion> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-jaxb</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.ext</groupId> - <artifactId>jersey-proxy-client</artifactId> - <version>${jersey.vespa.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-json-jackson</artifactId> - <version>${jersey.vespa.version}</version> - <exclusions> - <!-- Prevent embedding deps provided by jdisc --> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-multipart</artifactId> - <version>${jersey.vespa.version}</version> - </dependency> - - <!-- END Jersey deps --> - <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest</artifactId> @@ -288,11 +216,7 @@ <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> <configuration> - <!-- TODO: Vespa > 8: remove importPackage when the jackson-jaxrs-json-provider bundle is no longer installed in jdisc --> - <!-- added to ensure using the same class as orchestrator, core-dump-reporter, provision-controller and controller-clients --> - <importPackage>com.fasterxml.jackson.jaxrs.json;version="[2.12.6,3)"</importPackage> - <allowEmbeddedArtifacts>com.fasterxml.jackson.core:jackson-annotations, com.fasterxml.jackson.core:jackson-core, - com.yahoo.vespa:airlift-zstd</allowEmbeddedArtifacts> + <allowEmbeddedArtifacts>com.yahoo.vespa:airlift-zstd</allowEmbeddedArtifacts> </configuration> </plugin> <plugin> diff --git a/configserver/src/main/java/org/glassfish/jersey/client/package-info.java b/configserver/src/main/java/org/glassfish/jersey/client/package-info.java deleted file mode 100644 index 151d9dbe952..00000000000 --- a/configserver/src/main/java/org/glassfish/jersey/client/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@ExportPackage(version = @Version(major = 2, minor = 25)) -package org.glassfish.jersey.client; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; diff --git a/configserver/src/main/java/org/glassfish/jersey/client/proxy/package-info.java b/configserver/src/main/java/org/glassfish/jersey/client/proxy/package-info.java deleted file mode 100644 index 9ac5941eb3d..00000000000 --- a/configserver/src/main/java/org/glassfish/jersey/client/proxy/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@ExportPackage(version = @Version(major = 2, minor = 25)) -package org.glassfish.jersey.client.proxy; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; diff --git a/configserver/src/main/java/org/glassfish/jersey/logging/package-info.java b/configserver/src/main/java/org/glassfish/jersey/logging/package-info.java deleted file mode 100644 index 6d9049e3c43..00000000000 --- a/configserver/src/main/java/org/glassfish/jersey/logging/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@ExportPackage(version = @Version(major = 2, minor = 25)) -package org.glassfish.jersey.logging; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; diff --git a/configserver/src/main/java/org/glassfish/jersey/media/multipart/file/package-info.java b/configserver/src/main/java/org/glassfish/jersey/media/multipart/file/package-info.java deleted file mode 100644 index 06248ca88c1..00000000000 --- a/configserver/src/main/java/org/glassfish/jersey/media/multipart/file/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@ExportPackage(version = @Version(major = 2, minor = 25)) -package org.glassfish.jersey.media.multipart.file; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; diff --git a/configserver/src/main/java/org/glassfish/jersey/media/multipart/package-info.java b/configserver/src/main/java/org/glassfish/jersey/media/multipart/package-info.java deleted file mode 100644 index 1faa237a7ea..00000000000 --- a/configserver/src/main/java/org/glassfish/jersey/media/multipart/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@ExportPackage(version = @Version(major = 2, minor = 25)) -package org.glassfish.jersey.media.multipart; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 57ba759aad0..fd93f11b2dd 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -97,7 +97,6 @@ <java-jjwt.vespa.version>0.11.5</java-jjwt.vespa.version> <java-jwt.vespa.version>4.4.0</java-jwt.vespa.version> <jaxb.runtime.vespa.version>4.0.3</jaxb.runtime.vespa.version> - <jersey.vespa.version>2.40</jersey.vespa.version> <jetty.vespa.version>11.0.16</jetty.vespa.version> <jetty-servlet-api.vespa.version>5.0.2</jetty-servlet-api.vespa.version> <jimfs.vespa.version>1.3.0</jimfs.vespa.version> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 23fab43bceb..ff43dbb045b 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -20,9 +20,6 @@ com.fasterxml.jackson.core:jackson-databind:2.15.2 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2 com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.15.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.15.2 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2 com.github.luben:zstd-jni:1.5.5-5 com.github.spotbugs:spotbugs-annotations:3.1.9 com.google.auth:google-auth-library-credentials:1.19.0 @@ -81,10 +78,7 @@ io.prometheus:simpleclient_common:0.16.0 io.prometheus:simpleclient_tracer_common:0.16.0 io.prometheus:simpleclient_tracer_otel:0.16.0 io.prometheus:simpleclient_tracer_otel_agent:0.16.0 -jakarta.annotation:jakarta.annotation-api:1.3.5 jakarta.inject:jakarta.inject-api:2.0.1 -jakarta.validation:jakarta.validation-api:2.0.2 -jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 javax.activation:javax.activation-api:1.2.0 javax.annotation:javax.annotation-api:1.2 javax.inject:javax.inject:1 @@ -172,18 +166,9 @@ org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5 org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5 org.fusesource.jansi:jansi:1.18 -org.glassfish.hk2:osgi-resource-locator:1.0.3 -org.glassfish.hk2.external:jakarta.inject:2.6.1 org.glassfish.jaxb:jaxb-core:4.0.3 org.glassfish.jaxb:jaxb-runtime:4.0.3 org.glassfish.jaxb:txw2:4.0.3 -org.glassfish.jersey.core:jersey-client:2.40 -org.glassfish.jersey.core:jersey-common:2.40 -org.glassfish.jersey.core:jersey-server:2.40 -org.glassfish.jersey.ext:jersey-entity-filtering:2.40 -org.glassfish.jersey.ext:jersey-proxy-client:2.40 -org.glassfish.jersey.media:jersey-media-json-jackson:2.40 -org.glassfish.jersey.media:jersey-media-multipart:2.40 org.hamcrest:hamcrest:2.2 org.hamcrest:hamcrest-core:2.2 org.hdrhistogram:HdrHistogram:2.1.12 @@ -194,7 +179,6 @@ org.junit.jupiter:junit-jupiter-engine:5.8.1 org.junit.platform:junit-platform-commons:1.8.1 org.junit.platform:junit-platform-engine:1.8.1 org.junit.platform:junit-platform-launcher:1.8.1 -org.jvnet.mimepull:mimepull:1.10.0 org.kohsuke:libpam4j:1.11 org.lz4:lz4-java:1.8.0 org.opentest4j:opentest4j:1.3.0 |