diff options
| author | gjoranv <gjoranv@gmail.com> | 2017-10-16 11:09:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 11:09:06 +0200 |
| commit | 30229f81ab0e6af9842a8feffe8f0b5be974952f (patch) | |
| tree | c7b34480a648fe1f520ff9cf5bd3fdab54cc4281 /pom.xml | |
| parent | fff597dc521b52d9b8a5971383661340f594e808 (diff) | |
| parent | cc54fb2e6ea49034b3f14389e6c37d733c4679c9 (diff) | |
Merge pull request #3750 from vespa-engine/gjoranv/container-test
Gjoranv/container test
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -489,6 +489,11 @@ <version>${jackson2.version}</version> </dependency> <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + <version>${jackson2.version}</version> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jdk8</artifactId> <version>${jackson2.version}</version> @@ -531,7 +536,7 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> + <version>${commons-lang.version}</version> </dependency> <dependency> <groupId>commons-net</groupId> @@ -925,9 +930,10 @@ <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> - <bouncycastle.version>1.49</bouncycastle.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 zkfacade/src/main/java/org/apache/curator/**/package-info.java using something like @@ -983,6 +989,7 @@ <module>container-messagebus</module> <module>container-search-and-docproc</module> <module>container-search</module> + <module>container-test</module> <module>container-test-jars</module> <module>controller-api</module> <module>controller-server</module> |