diff options
| -rw-r--r-- | config-model/pom.xml | 7 | ||||
| -rw-r--r-- | configserver-flags/pom.xml | 13 | ||||
| -rw-r--r-- | configserver/pom.xml | 7 | ||||
| -rw-r--r-- | container-search/pom.xml | 7 | ||||
| -rw-r--r-- | flags/pom.xml | 7 | ||||
| -rw-r--r-- | metrics-proxy/pom.xml | 7 | ||||
| -rw-r--r-- | routing-generator/pom.xml | 13 | ||||
| -rw-r--r-- | vespa-osgi-testrunner/pom.xml | 10 | ||||
| -rw-r--r-- | vespaclient-java/pom.xml | 7 |
9 files changed, 17 insertions, 61 deletions
diff --git a/config-model/pom.xml b/config-model/pom.xml index 13af9d38263..b08ff7f7f2e 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -294,13 +294,6 @@ </exclusions> </dependency> <dependency> - <!-- TODO Remove when Jetty is embedded inside container-core --> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <scope>test</scope> - <version>${jetty.version}</version> - </dependency> - <dependency> <groupId>org.lz4</groupId> <artifactId>lz4-java</artifactId> </dependency> diff --git a/configserver-flags/pom.xml b/configserver-flags/pom.xml index a2a90483e75..43263885371 100644 --- a/configserver-flags/pom.xml +++ b/configserver-flags/pom.xml @@ -26,6 +26,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>container-core</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> @@ -68,13 +74,6 @@ <!-- test --> <dependency> - <!-- TODO Remove when Jetty is embedded inside container-core --> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <scope>test</scope> - <version>${jetty.version}</version> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>defaults</artifactId> <version>${project.version}</version> diff --git a/configserver/pom.xml b/configserver/pom.xml index 86289a46d19..d66dad8bb9d 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -283,13 +283,6 @@ <groupId>org.lz4</groupId> <artifactId>lz4-java</artifactId> </dependency> - <dependency> - <!-- TODO Remove when Jetty is embedded inside container-core --> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>${jetty.version}</version> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/container-search/pom.xml b/container-search/pom.xml index e29445f5564..ccec1330d68 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -152,13 +152,6 @@ <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> - <dependency> - <!-- TODO Remove when Jetty is embedded inside container-core --> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <scope>test</scope> - <version>${jetty.version}</version> - </dependency> </dependencies> <build> <plugins> diff --git a/flags/pom.xml b/flags/pom.xml index 6eaecc35c47..cf230c1b7a9 100644 --- a/flags/pom.xml +++ b/flags/pom.xml @@ -93,13 +93,6 @@ <artifactId>junit-vintage-engine</artifactId> <scope>test</scope> </dependency> - <dependency> - <!-- TODO Remove when Jetty is embedded inside container-core --> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <scope>test</scope> - <version>${jetty.version}</version> - </dependency> </dependencies> <build> <plugins> diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml index bbb1c14dfe7..fc63d453738 100644 --- a/metrics-proxy/pom.xml +++ b/metrics-proxy/pom.xml @@ -142,13 +142,6 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <!-- TODO Remove when Jetty is embedded inside container-core --> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <scope>test</scope> - <version>${jetty.version}</version> - </dependency> </dependencies> <build> <plugins> diff --git a/routing-generator/pom.xml b/routing-generator/pom.xml index ee5e511c045..032d58acb51 100644 --- a/routing-generator/pom.xml +++ b/routing-generator/pom.xml @@ -34,13 +34,6 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> - <!-- TODO Remove when Jetty is embedded inside container-core --> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <scope>test</scope> - <version>${jetty.version}</version> - </dependency> <!-- provided --> <dependency> @@ -69,6 +62,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>container-core</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>container-dev</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/vespa-osgi-testrunner/pom.xml b/vespa-osgi-testrunner/pom.xml index c79a8ca7de7..ebb1240a198 100644 --- a/vespa-osgi-testrunner/pom.xml +++ b/vespa-osgi-testrunner/pom.xml @@ -22,12 +22,12 @@ <scope>provided</scope> </dependency> <dependency> - <!-- TODO Remove when Jetty is embedded inside container-core --> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <scope>test</scope> - <version>${jetty.version}</version> + <groupId>com.yahoo.vespa</groupId> + <artifactId>container-core</artifactId> + <version>${project.version}</version> + <scope>provided</scope> </dependency> + <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>hosted-api</artifactId> diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index 8323890ca2b..d0e04d1e692 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -39,13 +39,6 @@ <version>${project.version}</version> </dependency> <dependency> - <!-- TODO Remove when Jetty is embedded inside container-core --> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>${jetty.version}</version> - <scope>compile</scope> - </dependency> - <dependency> <!-- TODO: remove dependency on container-dev, and instead depend directly on what this module needs! --> <groupId>com.yahoo.vespa</groupId> <artifactId>container-dev</artifactId> |