aboutsummaryrefslogtreecommitdiffstats
path: root/parent
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-04-12 21:31:46 +0200
committerJon Marius Venstad <venstad@gmail.com>2021-04-12 21:33:13 +0200
commitb16e34c73b39b3db7c0b83b4533a6e51395fac26 (patch)
treebe1910ad8b1fd556d6d5db918c78b766298cc62a /parent
parenta6bffc901b462bfc7545781a1e275c3e97057b8f (diff)
Upgrade athenz to 1.10.11
Diffstat (limited to 'parent')
-rw-r--r--parent/pom.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/parent/pom.xml b/parent/pom.xml
index c6686d051b2..80fe5640e54 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -669,6 +669,11 @@
<version>9.2.0</version>
</dependency>
<dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.2</version> <!-- 2.3.3 has a BROKEN manifest -->
+ </dependency>
+ <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
@@ -759,7 +764,7 @@
<apache.httpclient5.version>5.0.3</apache.httpclient5.version>
<asm.version>7.0</asm.version>
<!-- Athenz dependencies. Make sure these dependencies match those in Vespa's internal repositories -->
- <athenz.version>1.8.49</athenz.version>
+ <athenz.version>1.10.11</athenz.version>
<aws.sdk.version>1.11.974</aws.sdk.version>
<!-- WARNING: If you change curator version, you also need to update
zkfacade/src/main/java/org/apache/curator/**/package-info.java