diff options
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 8 | ||||
-rw-r--r-- | config-model/pom.xml | 7 | ||||
-rw-r--r-- | configserver-flags/pom.xml | 7 | ||||
-rw-r--r-- | configserver/pom.xml | 7 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java | 1 | ||||
-rw-r--r-- | container-dependencies-enforcer/pom.xml | 3 | ||||
-rw-r--r-- | container-dependency-versions/pom.xml | 15 | ||||
-rw-r--r-- | container-search/pom.xml | 7 | ||||
-rw-r--r-- | flags/pom.xml | 7 | ||||
-rw-r--r-- | metrics-proxy/pom.xml | 2 | ||||
-rwxr-xr-x | provided-dependencies/pom.xml | 8 | ||||
-rw-r--r-- | routing-generator/pom.xml | 7 | ||||
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java | 6 | ||||
-rw-r--r-- | vespa-hadoop/pom.xml | 11 | ||||
-rw-r--r-- | vespa-osgi-testrunner/pom.xml | 7 | ||||
-rw-r--r-- | vespaclient-java/pom.xml | 13 |
16 files changed, 83 insertions, 33 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index ac0dcde61c6..bc6331374ed 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -103,9 +103,6 @@ <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include> <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided</include> <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided</include> - <include>org.eclipse.jetty:jetty-http:[${jetty.version}]:jar:provided</include> - <include>org.eclipse.jetty:jetty-io:[${jetty.version}]:jar:provided</include> - <include>org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:provided</include> <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include> <include>org.slf4j:log4j-over-slf4j:[${slf4j.version}]:jar:provided</include> <include>org.slf4j:slf4j-api:[${slf4j.version}]:jar:provided</include> @@ -233,16 +230,19 @@ <include>org.eclipse.jetty.http2:http2-common:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty.http2:http2-hpack:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty.http2:http2-server:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty:jetty-alpn-server:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-alpn-java-server:[${jetty.version}]:jar:test</include> + <include>org.eclipse.jetty:jetty-alpn-server:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-client:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-continuation:[${jetty.version}]:jar:test</include> + <include>org.eclipse.jetty:jetty-http:[${jetty.version}]:jar:test</include> + <include>org.eclipse.jetty:jetty-io:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-jmx:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-security:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-server:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-servlet:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-servlets:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-util-ajax:[${jetty.version}]:jar:test</include> + <include>org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:test</include> <include>org.hamcrest:hamcrest-core:1.3:jar:test</include> <include>org.hdrhistogram:HdrHistogram:2.1.8:jar:test</include> <include>org.json:json:20090211:jar:test</include> diff --git a/config-model/pom.xml b/config-model/pom.xml index 335841aaa23..e5cca83e931 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -293,6 +293,13 @@ </exclusion> </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> </dependencies> <build> diff --git a/configserver-flags/pom.xml b/configserver-flags/pom.xml index 5d32daae833..51eee97455f 100644 --- a/configserver-flags/pom.xml +++ b/configserver-flags/pom.xml @@ -68,6 +68,13 @@ <!-- 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 cee178c0405..755e2b662df 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -279,6 +279,13 @@ <artifactId>http-utils</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <!-- TODO Remove dependency on Jetty once no longer required for multi-part response parsing --> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> </dependencies> <build> diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java index db3c8d0d165..6ffd26478c3 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java @@ -80,6 +80,7 @@ public class ApplicationApiHandler extends SessionHandler { .orElse(false); if (multipartRequest) { try { + // TODO Remove direct dependency on Jetty for parsing multi-part response (add helper in container-core) MultiPartFormInputStream multiPartFormInputStream = new MultiPartFormInputStream(request.getData(), request.getHeader(CONTENT_TYPE), /* config */null, /* contextTmpDir */null); Map<String, Part> parts = multiPartFormInputStream.getParts().stream() .collect(Collectors.toMap(Part::getName, p -> p)); diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 43f815ca618..b5485a9f206 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -88,9 +88,6 @@ <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include> <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided</include> <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided</include> - <include>org.eclipse.jetty:jetty-http:[${jetty.version}]:jar:provided</include> - <include>org.eclipse.jetty:jetty-io:[${jetty.version}]:jar:provided</include> - <include>org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:provided</include> <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include> <include>org.slf4j:log4j-over-slf4j:[${slf4j.version}]:jar:provided</include> <include>org.slf4j:slf4j-api:[${slf4j.version}]:jar:provided</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index feff08d9c6f..b69fe1e59c0 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -170,21 +170,6 @@ <version>${bouncycastle.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> <version>${slf4j.version}</version> diff --git a/container-search/pom.xml b/container-search/pom.xml index d410eb1c2c6..096a49df3a1 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -156,6 +156,13 @@ <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 10e0249ce80..e853f869228 100644 --- a/flags/pom.xml +++ b/flags/pom.xml @@ -93,6 +93,13 @@ <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 76f7e92ad43..b68b329b603 100644 --- a/metrics-proxy/pom.xml +++ b/metrics-proxy/pom.xml @@ -143,9 +143,11 @@ <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> diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index a322be55560..f9f6780c72c 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -31,14 +31,6 @@ <artifactId>bcpkix-jdk15on</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>config-lib</artifactId> <version>${project.version}</version> diff --git a/routing-generator/pom.xml b/routing-generator/pom.xml index 3a197b94012..09a5b206a08 100644 --- a/routing-generator/pom.xml +++ b/routing-generator/pom.xml @@ -34,6 +34,13 @@ <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> diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java index 8a587592c71..5b884e3dfb3 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java @@ -16,7 +16,6 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.DefaultHttpRequestRetryHandler; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; -import org.eclipse.jetty.http.HttpStatus; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; @@ -80,7 +79,8 @@ public class DefaultIdentityDocumentClient implements IdentityDocumentClient { .build(); try (CloseableHttpResponse response = client.execute(request)) { String responseContent = EntityUtils.toString(response.getEntity()); - if (HttpStatus.isSuccess(response.getStatusLine().getStatusCode())) { + int statusCode = response.getStatusLine().getStatusCode(); + if (statusCode >= 200 && statusCode <= 299) { SignedIdentityDocumentEntity entity = objectMapper.readValue(responseContent, SignedIdentityDocumentEntity.class); return EntityBindingsMapper.toSignedIdentityDocument(entity); } else { @@ -88,7 +88,7 @@ public class DefaultIdentityDocumentClient implements IdentityDocumentClient { String.format( "Failed to retrieve identity document for host %s: %d - %s", host, - response.getStatusLine().getStatusCode(), + statusCode, responseContent)); } } diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml index 5da226f10e6..0c724c95839 100644 --- a/vespa-hadoop/pom.xml +++ b/vespa-hadoop/pom.xml @@ -21,6 +21,17 @@ <pig.version>0.14.0</pig.version> </properties> + <dependencyManagement> + <dependencies> + <!-- Force newer version of jetty-util (to match Jetty version of jdisc) --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <!-- Hadoop dependencies --> <dependency> diff --git a/vespa-osgi-testrunner/pom.xml b/vespa-osgi-testrunner/pom.xml index 4fa651a6930..98cb158b71e 100644 --- a/vespa-osgi-testrunner/pom.xml +++ b/vespa-osgi-testrunner/pom.xml @@ -22,6 +22,13 @@ <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> + </dependency> + <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>hosted-api</artifactId> <version>${project.version}</version> diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index 3a0c52fc462..2d80d441438 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -33,6 +33,19 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>container-core</artifactId> + <scope>compile</scope> + <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> |