diff options
| author | Valerij Fredriksen <valerij92@gmail.com> | 2018-09-07 21:32:20 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@oath.com> | 2018-09-10 09:11:20 +0200 |
| commit | f3e45a041d04ce7078d96a60901ba0975ff6890b (patch) | |
| tree | 3f99414b0d063f11f0c883beb1e6c2ddf243141d | |
| parent | 85aa7f93094da2a83d407a742c25e1192a9f7045 (diff) | |
Organize dependencies, no functional changes
| -rw-r--r-- | docker-api/pom.xml | 10 | ||||
| -rw-r--r-- | node-admin/pom.xml | 59 |
2 files changed, 42 insertions, 27 deletions
diff --git a/docker-api/pom.xml b/docker-api/pom.xml index 64410c32f06..74e463ef157 100644 --- a/docker-api/pom.xml +++ b/docker-api/pom.xml @@ -18,16 +18,20 @@ <name>${project.artifactId}</name> <dependencies> + <!-- Provided --> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>container-dev</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> + + <!-- Compile --> <dependency> <groupId>com.github.docker-java</groupId> <artifactId>docker-java</artifactId> <version>3.0.13</version> + <scope>compile</scope> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -92,6 +96,7 @@ <dependency> <groupId>net.jpountz.lz4</groupId> <artifactId>lz4</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -100,6 +105,7 @@ docker-java so the dependency is declared closer to the root of maven and more likely be the version that is finally being used. --> <version>4.4.1</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -108,7 +114,10 @@ docker-java so the dependency is declared closer to the root of maven and more likely be the version that is finally being used. --> <version>4.5</version> + <scope>compile</scope> </dependency> + + <!-- Test --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -121,7 +130,6 @@ </dependency> </dependencies> - <build> <plugins> <plugin> diff --git a/node-admin/pom.xml b/node-admin/pom.xml index 7daeacec463..adc1742fca0 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -18,6 +18,7 @@ <name>${project.artifactId}</name> <dependencies> + <!-- Provided --> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>docker-api</artifactId> @@ -32,49 +33,60 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>node-repository</artifactId> + <artifactId>defaults</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>defaults</artifactId> + <artifactId>container-dev</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-dev</artifactId> + <artifactId>vespa-athenz</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> + + <!-- Compile --> <dependency> - <groupId>net.jpountz.lz4</groupId> - <artifactId>lz4</artifactId> + <groupId>com.yahoo.vespa</groupId> + <artifactId>orchestrator-restapi</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>node-repository</artifactId> + <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> <version>4.4.1</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <version>4.5</version> + <scope>compile</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>orchestrator-restapi</artifactId> - <version>${project.version}</version> + <groupId>net.jpountz.lz4</groupId> + <artifactId>lz4</artifactId> <scope>compile</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vespa-athenz</artifactId> - <version>${project.version}</version> - <scope>provided</scope> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <scope>compile</scope> </dependency> + <!-- Test --> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-junit</artifactId> @@ -82,6 +94,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -89,24 +106,24 @@ <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>application</artifactId> - <scope>test</scope> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>orchestrator</artifactId> + <artifactId>application-model</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>service-monitor</artifactId> + <artifactId>orchestrator</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>application-model</artifactId> + <artifactId>service-monitor</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> @@ -116,16 +133,6 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <scope>compile</scope> - </dependency> </dependencies> <build> <plugins> |