diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-06-30 16:26:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 16:26:33 +0200 |
| commit | a1405f069e42c28d1fc6c85d87b89b6456fb0c96 (patch) | |
| tree | f3129ca3ce24f2e85fba10a33c3b3330c29d836d /documentapi | |
| parent | f334324cbd080c25ef1e1407750931804a67bd62 (diff) | |
| parent | 9a2a89d7d7fef5b426d82f290109fb67e8bc7fdf (diff) | |
Merge pull request #13743 from vespa-engine/separate-documentapi-artifacts_2
Separate documentapi artifacts 2
Diffstat (limited to 'documentapi')
| -rw-r--r-- | documentapi/pom.xml | 79 |
1 files changed, 26 insertions, 53 deletions
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> |