Merge pull request #13743 from vespa-engine/separate-documentapi-artifacts_2

Separate documentapi artifacts 2

16 files changed, 201 insertions, 69 deletions

diff --git a/config-model/pom.xml b/config-model/pom.xml
index 897236f78e7..95e79fd09fb 100644
--- a/config-model/pom.xml
+++ b/config-model/pom.xml
@@ -137,7 +137,7 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>documentapi</artifactId>
+      <artifactId>container-documentapi</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/container-core/pom.xml b/container-core/pom.xml
index 64e5ebb00d3..0fbb590a1de 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -150,21 +150,18 @@
         </exclusion>
       </exclusions>
     </dependency>
+
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>documentapi</artifactId>
+      <artifactId>container-documentapi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>vdslib</artifactId>
       <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.yahoo.vespa</groupId>
-          <artifactId>config</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>vespajlib</artifactId>
diff --git a/container-documentapi/.gitignore b/container-documentapi/.gitignore
new file mode 100644
index 00000000000..d054e91130e
--- /dev/null
+++ b/container-documentapi/.gitignore
@@ -0,0 +1,3 @@
+container-documentapi.iml
+target
+/pom.xml.build
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..004ef75a4b6
--- /dev/null
+++ b/container-documentapi/pom.xml
@@ -0,0 +1,51 @@
+<?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>
+      <!-- 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>
+      <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </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>
+    <plugins>
+      <plugin>
+        <groupId>com.yahoo.vespa</groupId>
+        <artifactId>bundle-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/container-messagebus/pom.xml b/container-messagebus/pom.xml
index fc7546d32c0..bdb308832ac 100644
--- a/container-messagebus/pom.xml
+++ b/container-messagebus/pom.xml
@@ -34,6 +34,12 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
+      <artifactId>config</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
       <artifactId>container-core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
@@ -46,7 +52,7 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>documentapi</artifactId>
+      <artifactId>container-documentapi</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml
index cc66bd66922..04bf858ba3c 100644
--- a/container-search-and-docproc/pom.xml
+++ b/container-search-and-docproc/pom.xml
@@ -148,7 +148,7 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>documentapi</artifactId>
+      <artifactId>container-documentapi</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
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 245c20b3a46..5fb82e06d1b 100644
--- a/documentapi/pom.xml
+++ b/documentapi/pom.xml
@@ -10,79 +10,39 @@
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>documentapi</artifactId>
-  <packaging>container-plugin</packaging>
+  <packaging>jar</packaging>
   <version>7-SNAPSHOT</version>
   <dependencies>
+
+    <!-- WARNING: dependencies (apart from test scoped) must be added to documentapi-dependencies, not here!  -->
+
     <dependency>
+      <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>
-      <scope>provided</scope>
     </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>
       <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 +67,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>
diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml
index 381035a75b0..6bf676dcba1 100644
--- a/fat-model-dependencies/pom.xml
+++ b/fat-model-dependencies/pom.xml
@@ -96,7 +96,7 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>documentapi</artifactId>
+      <artifactId>container-documentapi</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index af8ec130ecb..bf9a958b274 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -74,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>
diff --git a/simplemetrics/pom.xml b/simplemetrics/pom.xml
index f65aeaabef1..6ca02febefd 100644
--- a/simplemetrics/pom.xml
+++ b/simplemetrics/pom.xml
@@ -25,6 +25,12 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
+      <artifactId>component</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
       <artifactId>vespajlib</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>