summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--node-admin/pom.xml12
-rw-r--r--node-repository/pom.xml6
-rw-r--r--orchestrator/pom.xml4
-rw-r--r--service-monitor/pom.xml2
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>