summaryrefslogtreecommitdiffstats
path: root/parent
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2021-04-13 07:35:17 +0200
committerGitHub <noreply@github.com>2021-04-13 07:35:17 +0200
commit39bc5dfaddbc145ce66828624b77079db12b5284 (patch)
tree349d4c597c6113c8dc22133614fcc52816c5457f /parent
parent8e6193092747e1f5d062b55ded91d513de6f0058 (diff)
Revert "Upgrade athenz to 1.10.11"
Diffstat (limited to 'parent')
-rw-r--r--parent/pom.xml7
1 files changed, 1 insertions, 6 deletions
diff --git a/parent/pom.xml b/parent/pom.xml
index 80fe5640e54..c6686d051b2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -669,11 +669,6 @@
<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>
@@ -764,7 +759,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.10.11</athenz.version>
+ <athenz.version>1.8.49</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