diff options
| author | gjoranv <gjoranv@gmail.com> | 2017-10-16 10:59:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 10:59:01 +0200 |
| commit | cc54fb2e6ea49034b3f14389e6c37d733c4679c9 (patch) | |
| tree | c7b34480a648fe1f520ff9cf5bd3fdab54cc4281 /pom.xml | |
| parent | c92066256b15bd51f648b8fd83756acd05bc13bc (diff) | |
| parent | fff597dc521b52d9b8a5971383661340f594e808 (diff) | |
Merge branch 'master' into gjoranv/container-test
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 24 |
1 files changed, 24 insertions, 0 deletions
@@ -37,6 +37,18 @@ <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>http://yahoo.bintray.com/maven</url> + </repository> + </repositories> + <build> <finalName>${project.artifactId}</finalName> <extensions> @@ -898,6 +910,16 @@ <artifactId>icu4j</artifactId> <version>57.1</version> </dependency> + <dependency> + <groupId>com.yahoo.athenz</groupId> + <artifactId>athenz-zms-java-client</artifactId> + <version>${athenz.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.athenz</groupId> + <artifactId>athenz-zts-java-client</artifactId> + <version>${athenz.version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -908,6 +930,8 @@ <aries.spifly.version>1.0.8</aries.spifly.version> <aries.util.version>1.0.0</aries.util.version> <asm-debug-all.version>5.0.3</asm-debug-all.version> + <!-- Athenz dependencies. Make sure these dependencies matches those in Vespa's internal repositories --> + <athenz.version>1.7.28</athenz.version> <bouncycastle.version>1.49</bouncycastle.version> <commons-lang.version>2.6</commons-lang.version> <!-- WARNING: If you change curator version, you also need to update |