diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-03-28 23:05:45 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-03-28 23:14:08 +0200 |
| commit | 81758a3041005db5be1eaebe9ed171177b08f39c (patch) | |
| tree | 702b167402b07b25e70f8dc6f83e99fc51556e6d /configserver | |
| parent | 6b142d105fff21bdd9b5f5a116d9a7f9d9aa697f (diff) | |
Export and import com.fasterxml.jackson.jaxrs.json to ...
1. ensure using the same classloader as the dependent bundles
(orchestrator, core-dump-reporter, provision-controller and
controller-clients)
2. allow removing the jackson-jaxrs-json-provider bundle from jdisc
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/pom.xml | 5 | ||||
| -rw-r--r-- | configserver/src/main/java/com/fasterxml/jackson/jaxrs/json/package-info.java | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/configserver/pom.xml b/configserver/pom.xml index c4e643a90cd..110099421d1 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -299,6 +299,11 @@ <groupId>com.yahoo.vespa</groupId> <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> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/configserver/src/main/java/com/fasterxml/jackson/jaxrs/json/package-info.java b/configserver/src/main/java/com/fasterxml/jackson/jaxrs/json/package-info.java new file mode 100644 index 00000000000..4ea1e169f0f --- /dev/null +++ b/configserver/src/main/java/com/fasterxml/jackson/jaxrs/json/package-info.java @@ -0,0 +1,5 @@ +@ExportPackage(version = @Version(major = 2, minor = 12, micro = 6)) +package com.fasterxml.jackson.jaxrs.json; + +import com.yahoo.osgi.annotation.ExportPackage; +import com.yahoo.osgi.annotation.Version; |