diff options
author | gjoranv <gv@verizonmedia.com> | 2021-02-19 19:12:01 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2021-02-19 19:22:42 +0100 |
commit | e3de588e7689b3fd0703b45dc665ee3f913b42cc (patch) | |
tree | 49163a2ae7be71f257058617c0ae384eeaa181ad | |
parent | 2f4689c26c0bf8a536a2806d0bca9254c5054a94 (diff) |
Use explicit dependencies instead of 'provided-dependencies'
.. while keeping all necessary provided deps to get all imports
needed by the compile scoped deps in each module.
-rw-r--r-- | container-jersey2/pom.xml | 34 | ||||
-rw-r--r-- | container-messagebus/pom.xml | 47 | ||||
-rw-r--r-- | container-search/pom.xml | 16 | ||||
-rw-r--r-- | docproc/pom.xml | 68 |
4 files changed, 134 insertions, 31 deletions
diff --git a/container-jersey2/pom.xml b/container-jersey2/pom.xml index 231e9dd4a0e..e94e2a46bba 100644 --- a/container-jersey2/pom.xml +++ b/container-jersey2/pom.xml @@ -15,49 +15,57 @@ <version>7-SNAPSHOT</version> <packaging>container-plugin</packaging> <dependencies> + + <!-- COMPILE scope --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> </dependency> + + + <!-- PROVIDED scope --> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> + <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>vespa_jersey2</artifactId> + <artifactId>component</artifactId> <version>${project.version}</version> <scope>provided</scope> - <type>pom</type> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>provided-dependencies</artifactId> + <artifactId>container-di</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>component</artifactId> + <artifactId>jdisc_core</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-disc</artifactId> + <artifactId>vespa_jersey2</artifactId> <version>${project.version}</version> <scope>provided</scope> + <type>pom</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> <scope>provided</scope> </dependency> + + <!-- TEST scope --> <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> </dependencies> <build> diff --git a/container-messagebus/pom.xml b/container-messagebus/pom.xml index bdb308832ac..52e3652634b 100644 --- a/container-messagebus/pom.xml +++ b/container-messagebus/pom.xml @@ -15,14 +15,16 @@ <version>7-SNAPSHOT</version> <packaging>jar</packaging> <dependencies> + <!-- PROVIDED scope --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <classifier>no_aop</classifier> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>provided-dependencies</artifactId> + <artifactId>annotations</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -40,22 +42,53 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-core</artifactId> + <artifactId>config-lib</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>messagebus-disc</artifactId> + <artifactId>document</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-documentapi</artifactId> + <artifactId>documentapi</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>container-di</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_core</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_messagebus_service</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>messagebus</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + + <!-- TEST scope --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/container-search/pom.xml b/container-search/pom.xml index 014b7dda14f..ec7dcb713fe 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -32,7 +32,13 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>provided-dependencies</artifactId> + <artifactId>jdisc_core</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_http_service</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -44,7 +50,13 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>config-bundle</artifactId> + <artifactId>config</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>config-lib</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/docproc/pom.xml b/docproc/pom.xml index 3def1a65a44..36e54e689ee 100644 --- a/docproc/pom.xml +++ b/docproc/pom.xml @@ -15,21 +15,28 @@ <packaging>jar</packaging> <version>7-SNAPSHOT</version> <dependencies> + <!-- PROVIDED scope --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <classifier>no_aop</classifier> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>provided-dependencies</artifactId> + <artifactId>component</artifactId> <version>${project.version}</version> - <type>pom</type> <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>component</artifactId> + <artifactId>config</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>config-lib</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -41,22 +48,65 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>config-bundle</artifactId> + <artifactId>container-messagebus</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>document</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>messagebus-disc</artifactId> + <artifactId>documentapi</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-messagebus</artifactId> + <artifactId>jdisc_core</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_messagebus_service</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>messagebus</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>statistics</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> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>yolean</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> + + <!-- TEST scope --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> |