diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-04-13 14:52:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-13 14:52:12 +0200 |
| commit | 23ec3ccc6a124fb1d10916279f9a79688a1e91d9 (patch) | |
| tree | 4961d7f01ebe9472fc3454c06f606bb0af7fc62f /parent | |
| parent | 5905ac318a39b0258f392924ed0959e55e35e586 (diff) | |
Revert "Jonmv/reapply upgrade athenz"
Diffstat (limited to 'parent')
| -rw-r--r-- | parent/pom.xml | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 097f72a1943..3b5b0891e73 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -28,12 +28,30 @@ <url>https://github.com/vespa-engine</url> </developer> </developers> + <distributionManagement> + <repository> + <id>bintray-vespa-repo</id> + <url>https://api.bintray.com/maven/yahoo/maven/vespa;publish=1</url> + </repository> + </distributionManagement> <scm> <connection>scm:git:git@github.com:vespa-engine/vespa.git</connection> <developerConnection>scm:git:git@github.com:vespa-engine/vespa.git</developerConnection> <url>git@github.com:vespa-engine/vespa.git</url> </scm> + <repositories> + <!-- Required for Athenz libraries --> + <repository> + <snapshots> + <enabled>false</enabled> + </snapshots> + <id>bintray-yahoo-maven</id> + <name>bintray</name> + <url>https://yahoo.bintray.com/maven</url> + </repository> + </repositories> + <build> <finalName>${project.artifactId}</finalName> <extensions> @@ -472,21 +490,6 @@ <version>${athenz.version}</version> </dependency> <dependency> - <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt-api</artifactId> - <version>${jjwt.version}</version> - </dependency> - <dependency> - <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt-impl</artifactId> - <version>${jjwt.version}</version> - </dependency> - <dependency> - <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt-jackson</artifactId> - <version>${jjwt.version}</version> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> <version>${commons.math3.version}</version> @@ -684,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> @@ -779,8 +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> - <jjwt.version>0.11.2</jjwt.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 |