diff options
author | HÃ¥kon Hallingstad <hakon@oath.com> | 2017-10-19 11:27:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-19 11:27:25 +0200 |
commit | 29b376d9e28eab647d212abfe031e5b141891931 (patch) | |
tree | d526638dfdee240a61faa85955ae96e5c7e75175 | |
parent | a7ae294a35e6248d432a5b8af50bd88f6fb2c53a (diff) |
Revert "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, 3 insertions, 21 deletions
diff --git a/node-admin/pom.xml b/node-admin/pom.xml index f7691cda3f7..c38e66f0b19 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -42,18 +42,6 @@ </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 09b0d3df3d9..7639f57bb03 100644 --- a/node-repository/pom.xml +++ b/node-repository/pom.xml @@ -55,12 +55,6 @@ </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 c50f9ddcb29..d70e5006c54 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>provided</scope> + <scope>compile</scope> <!-- TODO: Unbundle, but fix JSON serialization of model objects first. --> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -35,7 +35,7 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>application-model</artifactId> + <artifactId>config-model-api</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index 34d245c596b..80958ca9bee 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>provided</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> |