diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2021-04-13 10:03:32 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2021-04-13 10:03:32 +0200 |
| commit | 17b5a326d1e908cd282e1a3a13aa81a6be7ec2a4 (patch) | |
| tree | d9cc3863e60835cb7f6f497731dfeefa126def7a /parent | |
| parent | f9cc338cc28a79045da882db7ddcc8e02cb301df (diff) | |
Revert "Revert "Upgrade athenz to 1.10.11""
This reverts commit 39bc5dfaddbc145ce66828624b77079db12b5284.
Diffstat (limited to 'parent')
| -rw-r--r-- | parent/pom.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 3b5b0891e73..341522826d1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -687,6 +687,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> @@ -777,7 +782,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 |