diff options
32 files changed, 27 insertions, 194 deletions
diff --git a/application/pom.xml b/application/pom.xml index c6d0fbc4bec..f9f3e8394af 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -129,6 +129,12 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <scope>test</scope> + </dependency> + <!-- These dependencies are necessary in test classpath when using jdisc_http_filters --> <dependency> diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index 433a1cf629b..3274599f70f 100644 --- a/athenz-identity-provider-service/pom.xml +++ b/athenz-identity-provider-service/pom.xml @@ -55,6 +55,8 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + + <!-- COMPILE --> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index a868a48862c..f6d89c127d1 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -104,8 +104,6 @@ <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include> <include>org.apache.felix:org.apache.felix.log:[1.0.1]:jar:provided</include> <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include> - <include>org.apache.httpcomponents:httpclient:[${apache.httpclient.version}]:jar:provided</include> - <include>org.apache.httpcomponents:httpcore:[${apache.httpcore.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> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 8398365712a..53abaa8768d 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -239,16 +239,6 @@ <version>${felix.version}</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${apache.httpclient.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>${apache.httpcore.version}</version> - </dependency> - <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> <version>${bouncycastle.version}</version> @@ -461,8 +451,6 @@ </dependencyManagement> <properties> - <apache.httpclient.version>4.4.1</apache.httpclient.version> - <apache.httpcore.version>4.4.1</apache.httpcore.version> <bouncycastle.version>1.58</bouncycastle.version> <felix.version>6.0.1</felix.version> <findbugs.version>1.3.9</findbugs.version> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 833b299ce71..cf2fda3637f 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -101,6 +101,7 @@ <artifactId>commons-lang</artifactId> </exclusion> <exclusion> + <!-- TODO Vespa 7: Verify if necessary --> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </exclusion> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 23de9bc3643..e4939fe81f3 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -139,9 +139,9 @@ <!-- end WARNING --> <!-- Athenz --> <dependency> + <!-- TODO Vespa 7: verify if necessary. Possibly due to code now moved to vespa-athenz --> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <scope>compile</scope> </dependency> </dependencies> <build> diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 7e9937d4470..c66c5f9e1fe 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -211,14 +211,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> </dependencies> <build> <plugins> diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/binary/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/binary/package-info.java deleted file mode 100644 index 80f76e6b263..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/binary/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 1, minor = 4, micro = 0)) -package org.apache.commons.codec.binary; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/digest/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/digest/package-info.java deleted file mode 100644 index 117120c1641..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/digest/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 1, minor = 4, micro = 0)) -package org.apache.commons.codec.digest; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/language/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/language/package-info.java deleted file mode 100644 index de288618ad9..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/language/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 1, minor = 4, micro = 0)) -package org.apache.commons.codec.language; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/net/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/net/package-info.java deleted file mode 100644 index 49510c6feac..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/net/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 1, minor = 4, micro = 0)) -package org.apache.commons.codec.net; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/package-info.java deleted file mode 100644 index c698ba0233a..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 1, minor = 4, micro = 0)) -package org.apache.commons.codec; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/http/auth/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/auth/package-info.java deleted file mode 100644 index dbf6d408a2f..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/auth/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/* - * Exported due to usage in HTTPSearcher API - */ -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6)) -package org.apache.http.auth; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; diff --git a/container-search-and-docproc/src/main/java/org/apache/http/client/config/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/client/config/package-info.java deleted file mode 100644 index bc480dd1838..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/client/config/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6)) -package org.apache.http.client.config; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/http/client/entity/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/client/entity/package-info.java deleted file mode 100644 index c3bb1fbbf3e..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/client/entity/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6)) -package org.apache.http.client.entity; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/http/client/methods/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/client/methods/package-info.java deleted file mode 100644 index c938418fa71..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/client/methods/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6)) -package org.apache.http.client.methods; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/http/client/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/client/package-info.java deleted file mode 100644 index 85e68ea27b6..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/client/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6)) -package org.apache.http.client; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/http/conn/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/conn/package-info.java deleted file mode 100644 index c8e606d25ee..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/conn/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6)) -package org.apache.http.conn; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/http/conn/params/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/conn/params/package-info.java deleted file mode 100644 index 9469bfc7333..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/conn/params/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6)) -package org.apache.http.conn.params; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/http/conn/scheme/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/conn/scheme/package-info.java deleted file mode 100644 index bd54cb060a9..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/conn/scheme/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6)) -package org.apache.http.conn.scheme; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/http/conn/ssl/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/conn/ssl/package-info.java deleted file mode 100644 index 2dd9254cdb0..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/conn/ssl/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6)) -package org.apache.http.conn.ssl; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; diff --git a/container-search-and-docproc/src/main/java/org/apache/http/entity/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/entity/package-info.java deleted file mode 100644 index a843aa9ceb2..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/entity/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 3)) -package org.apache.http.entity; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/http/impl/client/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/impl/client/package-info.java deleted file mode 100644 index 89973cb6cc5..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/impl/client/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/* - * Exported due to usage in HTTPSearcher API - */ -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6)) -package org.apache.http.impl.client; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; diff --git a/container-search-and-docproc/src/main/java/org/apache/http/impl/conn/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/impl/conn/package-info.java deleted file mode 100644 index 4d167d5e627..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/impl/conn/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/* - * Exported due to usage in HTTPSearcher API - */ -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6)) -package org.apache.http.impl.conn; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; diff --git a/container-search-and-docproc/src/main/java/org/apache/http/message/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/message/package-info.java deleted file mode 100644 index 7430e71d0c7..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/message/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 3)) -package org.apache.http.message; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/http/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/package-info.java deleted file mode 100644 index 9dcfc75e5a4..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/* - * Exported due to usage in HTTPSearcher API - */ -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 3)) -package org.apache.http; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; diff --git a/container-search-and-docproc/src/main/java/org/apache/http/params/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/params/package-info.java deleted file mode 100644 index 9bfd6e48404..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/params/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 3)) -package org.apache.http.params; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/http/protocol/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/protocol/package-info.java deleted file mode 100644 index 7bb784f7197..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/protocol/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 3)) -package org.apache.http.protocol; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search-and-docproc/src/main/java/org/apache/http/util/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/util/package-info.java deleted file mode 100644 index 89f73ab1a12..00000000000 --- a/container-search-and-docproc/src/main/java/org/apache/http/util/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 4, minor = 3, micro = 3)) -package org.apache.http.util; - -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; - diff --git a/container-search/pom.xml b/container-search/pom.xml index 3040b8e93ef..35b1477f478 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -21,6 +21,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-library</artifactId> <scope>test</scope> @@ -107,14 +112,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </dependency> diff --git a/parent/pom.xml b/parent/pom.xml index 3860f4a2c50..398d136c155 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -526,6 +526,16 @@ </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${apache.httpclient.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>${apache.httpcore.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> <version>4.3.6</version> </dependency> @@ -718,6 +728,8 @@ <properties> <antlr.version>3.5.2</antlr.version> <antlr4.version>4.5</antlr4.version> + <apache.httpclient.version>4.4.1</apache.httpclient.version> + <apache.httpcore.version>4.4.1</apache.httpcore.version> <asm.version>7.0</asm.version> <jna.version>4.5.2</jna.version> <tensorflow.version>1.12.0</tensorflow.version> diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index 59af12b161c..27b68fbf360 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -109,12 +109,10 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <scope>compile</scope> </dependency> </dependencies> |