From 716b18a38a62b08ad9ea4f88d95ff952d504b55d Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 3 May 2023 16:31:09 +0200
Subject: Bump jjwt, aws-sdk-java and ensure all jackson dependencies follow
 use same version

---
 vespa-athenz/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'vespa-athenz/pom.xml')

diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml
index 29a4058e180..788dc4448f6 100644
--- a/vespa-athenz/pom.xml
+++ b/vespa-athenz/pom.xml
@@ -63,6 +63,11 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-cbor</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>vespajlib</artifactId>
@@ -187,6 +192,11 @@
             <artifactId>jjwt-impl</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency> <!-- needed by auth-core -->
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency> <!-- needed by auth-core -->
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-jackson</artifactId>
-- 
cgit v1.2.3


From fa80fabedd4d0bcc60e87685f56bb4fb46fe82bd Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 3 May 2023 17:38:20 +0200
Subject: Revert unintentional change

---
 vespa-athenz/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'vespa-athenz/pom.xml')

diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml
index 788dc4448f6..0d6ef5ccc45 100644
--- a/vespa-athenz/pom.xml
+++ b/vespa-athenz/pom.xml
@@ -63,11 +63,6 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-cbor</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>vespajlib</artifactId>
-- 
cgit v1.2.3