aboutsummaryrefslogtreecommitdiffstats
path: root/vespa-http-client/pom.xml
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-07-17 14:22:23 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2019-07-19 10:39:32 +0200
commit2ab8e226cc53bafa2653d5724aff2fb086df0527 (patch)
tree40e920f81e59915bf48888581b22b1aebc68bc70 /vespa-http-client/pom.xml
parente0df3bf0d14ed0bf9c8c57760eb7e38e4d4ca4e8 (diff)
Add Vespa TLS support to vespa-http-client
Use setters for directly assigning ssl context and hostname validator to client builder. This ensures that all connection settings applied to the builder are actual used to construct the client. Previously, the connection settings for timeout and total connections were ignored if ssl was configured.
Diffstat (limited to 'vespa-http-client/pom.xml')
-rw-r--r--vespa-http-client/pom.xml27
1 files changed, 27 insertions, 0 deletions
diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml
index 18dd34ee7be..96aa6defbe6 100644
--- a/vespa-http-client/pom.xml
+++ b/vespa-http-client/pom.xml
@@ -65,6 +65,22 @@
<artifactId>airline</artifactId>
<version>0.6</version>
</dependency>
+ <dependency>
+ <!-- Needed for Vespa TLS configuration. Standard jar artifact -->
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>http-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <!-- Needed for Vespa TLS configuration. -->
+ <!-- This artifact is packaged as an OSGi bundle - make sure to manually include or exclude transitive dependencies as necessary -->
+ <!-- Note: includes BouncyCastle to compile scope transitively. -->
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>security-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
<!-- Test dependencies -->
<dependency>
@@ -140,6 +156,17 @@
</goals>
<configuration>
<outputFile>target/${project.artifactId}-jar-with-dependencies.jar</outputFile>
+ <filters>
+ <filter>
+ <!-- Don't include signature files in uber jar (most likely from bouncycastle). -->
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.yahoo.vespa.http.client.runner.Runner</mainClass>