diff options
Diffstat (limited to 'configserver')
6 files changed, 1 insertions, 102 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; |