diff options
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 18 | ||||
| -rw-r--r-- | container-test/OWNERS | 1 | ||||
| -rw-r--r-- | container-test/README.md | 6 | ||||
| -rw-r--r-- | container-test/pom.xml | 115 | ||||
| -rw-r--r-- | container/README.md | 2 | ||||
| -rw-r--r-- | pom.xml | 11 | ||||
| -rw-r--r-- | vespa-http-client/pom.xml | 3 |
7 files changed, 141 insertions, 15 deletions
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index aaa6601333c..fdf15080f12 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -17,22 +17,22 @@ <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> + <groupId>com.yahoo.vespa</groupId> + <artifactId>container</artifactId> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>application</artifactId> + <artifactId>container-test</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container</artifactId> - <version>${project.version}</version> - <scope>provided</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> </dependency> </dependencies> <profiles> diff --git a/container-test/OWNERS b/container-test/OWNERS new file mode 100644 index 00000000000..3b2ba1ede81 --- /dev/null +++ b/container-test/OWNERS @@ -0,0 +1 @@ +gjoranv diff --git a/container-test/README.md b/container-test/README.md new file mode 100644 index 00000000000..147618f9851 --- /dev/null +++ b/container-test/README.md @@ -0,0 +1,6 @@ +# Container-test + +Convenience dependency for users developing OSGi bundles for JDisc. +Add this maven artifact as a **test** scope dependency in your pom.xml, +and it will transitively pull in all dependencies needed to unit test +JDisc components with the `application` test tool.
\ No newline at end of file diff --git a/container-test/pom.xml b/container-test/pom.xml new file mode 100644 index 00000000000..b372b727574 --- /dev/null +++ b/container-test/pom.xml @@ -0,0 +1,115 @@ +<?xml version="1.0"?> +<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- This module collects all dependencies needed to test container components with application. --> +<!-- It should be considered an external Vespa API. --> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.yahoo.vespa</groupId> + <artifactId>parent</artifactId> + <version>6-SNAPSHOT</version> + </parent> + <artifactId>container-test</artifactId> + <version>6-SNAPSHOT</version> + <packaging>pom</packaging> + <dependencies> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>application</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- All dependencies that should be visible in test classpath, but not compile classpath, + for user projects must be added in compile scope here. These dependencies are explicitly excluded + (or set to non-compile scope) in the container and/or container-dev modules. --> + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>io.airlift</groupId> + <artifactId>airline</artifactId> + <exclusions> + <exclusion> + <!-- Prevent pulling in newer version than what we use --> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr-runtime</artifactId> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-exec</artifactId> + </dependency> + <dependency> + <groupId>org.hdrhistogram</groupId> + <artifactId>HdrHistogram</artifactId> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </dependency> + + <!-- These dependencies are necessary in test classpath when using jdisc_http_filters --> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + <exclusions> + <exclusion> + <!-- To avoid pulling in an older version than what we provide (also affects provided scope). --> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils-core</artifactId> + <version>1.8.0</version> + </dependency> + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + </dependency> + + </dependencies> +</project> diff --git a/container/README.md b/container/README.md index 56172c49787..05eb34531f5 100644 --- a/container/README.md +++ b/container/README.md @@ -1,5 +1,5 @@ # Container Convenience dependency for users developing OSGi bundles for JDisc. -Add this maven module as dependency in your pom.xml, and it will +Add this maven artifact as a **provided** scope dependency in your pom.xml, and it will transitively pull in all dependencies needed to develop JDisc bundles. @@ -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> diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml index e050bd1aa06..15d72b7c1c2 100644 --- a/vespa-http-client/pom.xml +++ b/vespa-http-client/pom.xml @@ -66,17 +66,14 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>${jackson2.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson2.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-xml</artifactId> - <version>${jackson2.version}</version> </dependency> <dependency> <groupId>io.airlift</groupId> |