diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2017-10-19 08:50:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 08:50:54 +0200 |
| commit | 51363d1e5c95676640e5255b11ea0abebb4dd6d0 (patch) | |
| tree | 3e369e9efcc70e9607568c88793befa44f57fb78 | |
| parent | 1aee9a416a24538c7e2900d5f556fc6e814441bd (diff) | |
| parent | 2e721f45a29dabeb8eea7f0096a74d9c091eba07 (diff) | |
Merge pull request #3615 from vespa-engine/hakon/provide-service-monitor-and-application-model
Provide service-monitor and application-model
| -rw-r--r-- | node-admin/pom.xml | 12 | ||||
| -rw-r--r-- | node-repository/pom.xml | 6 | ||||
| -rw-r--r-- | orchestrator/pom.xml | 4 | ||||
| -rw-r--r-- | service-monitor/pom.xml | 2 |
4 files changed, 21 insertions, 3 deletions
diff --git a/node-admin/pom.xml b/node-admin/pom.xml index c38e66f0b19..f7691cda3f7 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -42,6 +42,18 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>service-monitor</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>application-model</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>container-dev</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/node-repository/pom.xml b/node-repository/pom.xml index 7639f57bb03..09b0d3df3d9 100644 --- a/node-repository/pom.xml +++ b/node-repository/pom.xml @@ -55,6 +55,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>application-model</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>zkfacade</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index d70e5006c54..c50f9ddcb29 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -25,7 +25,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>service-monitor</artifactId> <version>${project.version}</version> - <scope>compile</scope> <!-- TODO: Unbundle, but fix JSON serialization of model objects first. --> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -35,7 +35,7 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>config-model-api</artifactId> + <artifactId>application-model</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index 80958ca9bee..34d245c596b 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -57,7 +57,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>application-model</artifactId> <version>${project.version}</version> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> |