diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-04-13 07:40:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-13 07:40:38 +0200 |
| commit | f9cc338cc28a79045da882db7ddcc8e02cb301df (patch) | |
| tree | 9dd7ae1e1cefac40a8fe5bb97607c9ef778698b8 | |
| parent | 833fd86b93680df93a5f1ce52e049b64d9b979cc (diff) | |
| parent | 39bc5dfaddbc145ce66828624b77079db12b5284 (diff) | |
Merge pull request #17393 from vespa-engine/revert-17389-jonmv/upgrade-athenz
Revert "Upgrade athenz to 1.10.11"
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 3 | ||||
| -rw-r--r-- | hosted-tenant-base/pom.xml | 5 | ||||
| -rw-r--r-- | parent/pom.xml | 7 |
3 files changed, 3 insertions, 12 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index aa8e7f1b064..25350957a34 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -20,7 +20,7 @@ Copied here because vz-tenant-base does not have a parent. --> <properties> <aopalliance.version>1.0</aopalliance.version> - <athenz.version>1.10.11</athenz.version> + <athenz.version>1.8.49</athenz.version> <bouncycastle.version>1.65</bouncycastle.version> <felix.version>6.0.3</felix.version> <felix.log.version>1.0.1</felix.log.version> @@ -237,6 +237,7 @@ <include>commons-digester:commons-digester:1.8:jar:test</include> <include>io.airlift:aircompressor:0.17:jar:test</include> <include>io.airlift:airline:0.7:jar:test</include> + <include>io.jsonwebtoken:jjwt:0.9.1:jar:test</include> <include>io.prometheus:simpleclient:0.6.0:jar:test</include> <include>io.prometheus:simpleclient_common:0.6.0:jar:test</include> <include>joda-time:joda-time:2.8.1:jar:test</include> diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 08648f47ce2..094238454c9 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -66,11 +66,6 @@ <type>pom</type> <scope>import</scope> </dependency> - <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-runtime</artifactId> - <version>2.3.2</version> <!-- 2.3.3 has BROKEN manifest --> - </dependency> </dependencies> </dependencyManagement> diff --git a/parent/pom.xml b/parent/pom.xml index 341522826d1..3b5b0891e73 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -687,11 +687,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> @@ -782,7 +777,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 |