diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-05-08 19:24:08 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-05-08 19:25:02 +0200 |
| commit | 79b1ac396104b7314afb23733ecc9e80fc8769f9 (patch) | |
| tree | eafe2383a9d1c353188e4e643c5178514fe62e3f | |
| parent | d79c95b8b64e052a00f5eb069df14788ca655d26 (diff) | |
Use 'annotations' from jdisc_core, do not embed in container-disc.
| -rw-r--r-- | container-core/pom.xml | 11 | ||||
| -rw-r--r-- | container-disc/pom.xml | 8 |
2 files changed, 13 insertions, 6 deletions
diff --git a/container-core/pom.xml b/container-core/pom.xml index d0d0226e58a..be22e5cae5c 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -19,11 +19,6 @@ <!-- COMPILE scope --> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>annotations</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>container-documentapi</artifactId> <version>${project.version}</version> </dependency> @@ -171,6 +166,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>component</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index af901d4d62b..f84e1868724 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -46,7 +46,13 @@ <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> - <dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>config-lib</artifactId> <version>${project.version}</version> |