diff options
| -rw-r--r-- | container-documentapi/.gitignore | 4 | ||||
| -rw-r--r-- | container-documentapi/OWNERS | 1 | ||||
| -rw-r--r-- | container-documentapi/README.md | 8 | ||||
| -rw-r--r-- | container-documentapi/pom.xml | 57 | ||||
| -rw-r--r-- | documentapi/pom.xml | 22 | ||||
| -rw-r--r-- | pom.xml | 1 |
6 files changed, 86 insertions, 7 deletions
diff --git a/container-documentapi/.gitignore b/container-documentapi/.gitignore new file mode 100644 index 00000000000..e64cb7b396e --- /dev/null +++ b/container-documentapi/.gitignore @@ -0,0 +1,4 @@ +container-documentapi.iml +target +/pom.xml.build +Makefile diff --git a/container-documentapi/OWNERS b/container-documentapi/OWNERS new file mode 100644 index 00000000000..3b2ba1ede81 --- /dev/null +++ b/container-documentapi/OWNERS @@ -0,0 +1 @@ +gjoranv diff --git a/container-documentapi/README.md b/container-documentapi/README.md new file mode 100644 index 00000000000..a30257d5b49 --- /dev/null +++ b/container-documentapi/README.md @@ -0,0 +1,8 @@ +<!-- Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +# Documentapi + +Dependency artifact for building container bundles. +To build standalone document clients, use `documentapi` instead. + +The actual java code remains in `documentapi`, becuase it uses +common test files with the C++ code in the same module.
\ No newline at end of file diff --git a/container-documentapi/pom.xml b/container-documentapi/pom.xml new file mode 100644 index 00000000000..1251b7f226b --- /dev/null +++ b/container-documentapi/pom.xml @@ -0,0 +1,57 @@ +<?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>container-documentapi</artifactId> + <packaging>container-plugin</packaging> + <version>7-SNAPSHOT</version> + + <dependencies> + + <dependency> + <!-- TODO: this is instead of moving the java code in documentapi to this module, + which is made difficult by using common test files with the C++ code. --> + <groupId>com.yahoo.vespa</groupId> + <artifactId>documentapi</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <!-- Compile scope to pull vdslib into container-core and hence container-disc and container-dev --> + <!-- TODO: move to container-core --> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vdslib</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + </plugins> + </build> +</project> diff --git a/documentapi/pom.xml b/documentapi/pom.xml index 245c20b3a46..4249902eb5b 100644 --- a/documentapi/pom.xml +++ b/documentapi/pom.xml @@ -10,13 +10,13 @@ <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>documentapi</artifactId> - <packaging>container-plugin</packaging> + <packaging>jar</packaging> <version>7-SNAPSHOT</version> <dependencies> <dependency> + <!-- Needed because 'document' uses guava collections --> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -78,11 +78,6 @@ <build> <plugins> <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> @@ -107,6 +102,19 @@ </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> + <artifactId>config-class-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <id>config-gen</id> + <goals> + <goal>config-gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.yahoo.vespa</groupId> <artifactId>abi-check-plugin</artifactId> </plugin> </plugins> @@ -60,6 +60,7 @@ <module>container-dev</module> <module>container-di</module> <module>container-disc</module> + <module>container-documentapi</module> <module>container-integration-test</module> <module>container-jersey2</module> <module>container-messagebus</module> |