From b347245d3274ca3f5d712cd0ceb70f147ca2a963 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Sat, 26 Mar 2022 01:06:10 +0100
Subject: Ensure that jackson-core and jackson-annotations are not embedded.

- Both are provided by Jdisc, and will remain so for Vespa 8
---
 configserver/pom.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'configserver')

diff --git a/configserver/pom.xml b/configserver/pom.xml
index 8e604b930f6..2ca2cbb4741 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -193,6 +193,18 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <!-- Do not remove, as long as this is provided by jdisc and configserver uses jersey-client -->
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <!-- Do not remove, as long as this is provided by jdisc and configserver uses jersey-client -->
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -245,6 +257,17 @@
     <dependency>
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-json-jackson</artifactId>
+      <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>
       <!-- Not needed by configserver, but by controller. Also pulls in mimepull. -->
-- 
cgit v1.2.3


From 22cb37a5950ba8f7e90351ba74d2a81e6a2d5cb1 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Sat, 26 Mar 2022 01:34:47 +0100
Subject: Add explicit dep to jackson-jaxrs-json-provider, used here.

---
 configserver/pom.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'configserver')

diff --git a/configserver/pom.xml b/configserver/pom.xml
index 2ca2cbb4741..c4e643a90cd 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -210,6 +210,22 @@
       <artifactId>jackson-databind</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+      <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>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-- 
cgit v1.2.3


From c71a7ddd941328880964f63cb810343e73b92641 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Wed, 23 Mar 2022 19:27:08 +0100
Subject: Register JacksonJsonProvider explicitly to serviceview handler.

When using the embedded jersey client and jersey-media-json-jackson,
the client does not find the appropriate MessageBodyReader.
---
 .../src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java  | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'configserver')

diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java
index d3c19bb0ba5..30975be61e2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.serviceview;
 
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.google.inject.Inject;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.container.jdisc.ThreadedHttpRequestHandler;
@@ -41,6 +42,7 @@ public class StateRequestHandler extends RestApiRequestHandler<StateRequestHandl
             .newBuilder()
             .property(ClientProperties.CONNECT_TIMEOUT, 10000)
             .property(ClientProperties.READ_TIMEOUT, 10000)
+            .register(JacksonJsonProvider.class)
             .register((ClientRequestFilter) ctx -> ctx.getHeaders().put(HttpHeaders.USER_AGENT, List.of(USER_AGENT)))
             .build();
 
-- 
cgit v1.2.3


From 81758a3041005db5be1eaebe9ed171177b08f39c Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Mon, 28 Mar 2022 23:05:45 +0200
Subject: 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
---
 configserver/pom.xml                                                 | 5 +++++
 .../src/main/java/com/fasterxml/jackson/jaxrs/json/package-info.java | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 configserver/src/main/java/com/fasterxml/jackson/jaxrs/json/package-info.java

(limited to 'configserver')

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;
-- 
cgit v1.2.3