diff options
| -rw-r--r-- | container-documentapi/pom.xml | 10 | ||||
| -rw-r--r-- | documentapi-dependencies/.gitignore | 3 | ||||
| -rw-r--r-- | documentapi-dependencies/OWNERS | 1 | ||||
| -rw-r--r-- | documentapi-dependencies/README.md | 6 | ||||
| -rw-r--r-- | documentapi-dependencies/pom.xml | 75 | ||||
| -rw-r--r-- | documentapi/pom.xml | 59 | ||||
| -rw-r--r-- | pom.xml | 3 |
7 files changed, 108 insertions, 49 deletions
diff --git a/container-documentapi/pom.xml b/container-documentapi/pom.xml index 5a22b20f9d6..004ef75a4b6 100644 --- a/container-documentapi/pom.xml +++ b/container-documentapi/pom.xml @@ -16,7 +16,7 @@ <dependencies> <dependency> - <!-- TODO: this is instead of moving the java code in documentapi to this module, + <!-- NOTE: this is instead of moving the java code in documentapi to this module (and turning the deps around), which is made difficult by using common test files with the C++ code. --> <groupId>com.yahoo.vespa</groupId> <artifactId>documentapi</artifactId> @@ -29,6 +29,14 @@ </exclusions> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>documentapi-dependencies</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>provided</scope> + </dependency> + </dependencies> <build> diff --git a/documentapi-dependencies/.gitignore b/documentapi-dependencies/.gitignore new file mode 100644 index 00000000000..35f8acd14ce --- /dev/null +++ b/documentapi-dependencies/.gitignore @@ -0,0 +1,3 @@ +documentapi-dependencies.iml +target +/pom.xml.build diff --git a/documentapi-dependencies/OWNERS b/documentapi-dependencies/OWNERS new file mode 100644 index 00000000000..3b2ba1ede81 --- /dev/null +++ b/documentapi-dependencies/OWNERS @@ -0,0 +1 @@ +gjoranv diff --git a/documentapi-dependencies/README.md b/documentapi-dependencies/README.md new file mode 100644 index 00000000000..35654dc24b2 --- /dev/null +++ b/documentapi-dependencies/README.md @@ -0,0 +1,6 @@ +<!-- Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +# Documentapi-dependencies + +Pom artifact that lists dependencies that are common between `documentapi` and +`container-documentapi`. These dependencies are provided by the Jdisc container, +but are needed in scope 'compile' for building standalone document clients. diff --git a/documentapi-dependencies/pom.xml b/documentapi-dependencies/pom.xml new file mode 100644 index 00000000000..6a48c7e9c71 --- /dev/null +++ b/documentapi-dependencies/pom.xml @@ -0,0 +1,75 @@ +<?xml version="1.0"?> +<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<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>7-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <artifactId>documentapi-dependencies</artifactId> + <packaging>pom</packaging> + <version>7-SNAPSHOT</version> + + <dependencies> + + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>component</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>config</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>config-lib</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>configdefinitions</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>document</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jrt</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>messagebus</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vdslib</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vespajlib</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>yolean</artifactId> + <version>${project.version}</version> + </dependency> + + </dependencies> +</project> diff --git a/documentapi/pom.xml b/documentapi/pom.xml index 4249902eb5b..5fb82e06d1b 100644 --- a/documentapi/pom.xml +++ b/documentapi/pom.xml @@ -13,67 +13,32 @@ <packaging>jar</packaging> <version>7-SNAPSHOT</version> <dependencies> + + <!-- WARNING: dependencies (apart from test scoped) must be added to documentapi-dependencies, not here! --> + <dependency> - <!-- Needed because 'document' uses guava collections --> + <groupId>com.yahoo.vespa</groupId> + <artifactId>documentapi-dependencies</artifactId> + <version>${project.version}</version> + <type>pom</type> + </dependency> + + <dependency> + <!-- Needed because 'document' uses guava collections, and has guava only in provided scope --> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>component</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>messagebus</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vdslib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vespajlib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>config</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>document</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>configdefinitions</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>annotations</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <build> <plugins> @@ -75,8 +75,9 @@ <module>docker-api</module> <module>docproc</module> <module>docprocs</module> - <module>documentapi</module> <module>document</module> + <module>documentapi</module> + <module>documentapi-dependencies</module> <module>documentgen-test</module> <module>fat-model-dependencies</module> <module>fileacquirer</module> |