40 files changed, 89 insertions, 72 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index 62985192ad3..d3319480ab3 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -176,7 +176,6 @@
                 model-evaluation-jar-with-dependencies.jar,
                 vespaclient-container-plugin-jar-with-dependencies.jar,
                 vespa-athenz-jar-with-dependencies.jar,
-                security-utils-jar-with-dependencies.jar,
                 simplemetrics-jar-with-dependencies.jar,
                 defaults-jar-with-dependencies.jar,
                 component-jar-with-dependencies.jar,
diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml
index 20d34b2489e..879036db355 100644
--- a/jdisc_http_service/pom.xml
+++ b/jdisc_http_service/pom.xml
@@ -77,7 +77,7 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>security-utils</artifactId>
+      <artifactId>vespajlib</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/jrt/pom.xml b/jrt/pom.xml
index 6852c6deee6..84578f9e04d 100644
--- a/jrt/pom.xml
+++ b/jrt/pom.xml
@@ -19,6 +19,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>annotations</artifactId>
       <version>${project.version}</version>
@@ -29,12 +34,6 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>security-utils</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
   <build>
     <sourceDirectory>src</sourceDirectory>
diff --git a/jrt_test/src/binref/runjava.in b/jrt_test/src/binref/runjava.in
index 7c4c299b488..49a213c9719 100755
--- a/jrt_test/src/binref/runjava.in
+++ b/jrt_test/src/binref/runjava.in
@@ -3,7 +3,6 @@
 unset VESPA_LOG_TARGET
 CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar
 CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar
-CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/security-utils/target/security-utils.jar
 CLASSPATH=$CLASSPATH:@CMAKE_CURRENT_SOURCE_DIR@/../java/classes
 CLASSPATH=$CLASSPATH:.
 if [ $# -lt 1 ]; then
diff --git a/jrt_test/src/java/build.xml b/jrt_test/src/java/build.xml
new file mode 100644
index 00000000000..b6b141300a1
--- /dev/null
+++ b/jrt_test/src/java/build.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<project basedir="." default="all" name="jrt-test">
+    <!-- Written to assume that classpath is rooted in the current directory. -->
+    <!-- So this should be OK if you make this script in the root of a filesystem. -->
+    <!-- If not, just change src.dir to be the root of your sources' package tree -->
+    <!-- and use e.g. View over a Filesystem to mount that subdirectory with all capabilities. -->
+    <!-- The idea is that both Ant and NetBeans have to know what the package root is -->
+    <!-- for the classes in your application. -->
+
+    <!-- Don't worry if you don't know the Ant syntax completely or need help on some tasks! -->
+    <!-- The standard Ant documentation can be downloaded from AutoUpdate and -->
+    <!-- and then you can access the Ant manual in the online help. -->
+
+    <property file="build.inc" />
+
+    <target name="init">
+        <property location="classes" name="classes.dir"/>
+        <property location="." name="src.dir"/>
+        <property location="doc/api" name="javadoc.dir"/>
+        <property name="project.name" value="${ant.project.name}"/>
+        <property location="${project.name}.jar" name="jar"/>
+    </target>
+
+    <target depends="init" name="compile">
+        <!-- Both srcdir and destdir should be package roots. -->
+        <mkdir dir="${classes.dir}"/>
+        <javac debug="true" deprecation="true" destdir="${classes.dir}" srcdir="${src.dir}">
+	    <classpath>
+	    <pathelement location="${JRT_DIR}/lib/jars/jrt.jar"/>
+	    </classpath>
+            <!-- To add something to the classpath: -->
+            <!-- <classpath><pathelement location="${mylib}"/></classpath> -->
+            <!-- To exclude some files: -->
+            <!-- <exclude name="com/foo/SomeFile.java"/><exclude name="com/foo/somepackage/"/> -->
+        </javac>
+    </target>
+
+    <target depends="init,compile" name="jar">
+        <!-- To make a standalone app, insert into <jar>: -->
+        <!-- <manifest><attribute name="Main-Class" value="com.foo.Main"/></manifest> -->
+        <jar basedir="${classes.dir}" compress="true" jarfile="${jar}"/>
+    </target>
+
+    <target depends="init,jar" description="Build everything." name="all"/>
+
+    <target depends="init" description="Javadoc for my API." name="javadoc">
+        <mkdir dir="${javadoc.dir}"/>
+        <javadoc destdir="${javadoc.dir}" packagenames="*">
+            <sourcepath>
+                <pathelement location="${src.dir}"/>
+            </sourcepath>
+        </javadoc>
+    </target>
+
+    <target depends="init" description="Clean all build products." name="clean">
+        <delete dir="${classes.dir}"/>
+        <delete dir="${javadoc.dir}"/>
+        <delete file="${jar}"/>
+    </target>
+
+</project>
diff --git a/pom.xml b/pom.xml
index f749adbdabf..caa875a1918 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,6 @@
         <module>searchcore</module>
         <module>searchlib</module>
         <module>searchsummary</module>
-        <module>security-utils</module>
         <module>serviceview</module>
         <module>service-monitor</module>
         <module>simplemetrics</module>
diff --git a/security-utils/OWNERS b/security-utils/OWNERS
deleted file mode 100644
index 569bf1cc3a1..00000000000
--- a/security-utils/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-bjorncs
diff --git a/security-utils/pom.xml b/security-utils/pom.xml
deleted file mode 100644
index 7006a0f5f86..00000000000
--- a/security-utils/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.yahoo.vespa</groupId>
-    <artifactId>parent</artifactId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>security-utils</artifactId>
-  <packaging>container-plugin</packaging>
-  <version>6-SNAPSHOT</version>
-  <dependencies>
-    <!-- provided -->
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>annotations</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- compile scope -->
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <scope>compile</scope>
-    </dependency>
-
-    <!-- test scope -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>bundle-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml
index 68a959b2e30..741b4b58cc9 100644
--- a/vespajlib/pom.xml
+++ b/vespajlib/pom.xml
@@ -36,6 +36,7 @@
       <artifactId>jna</artifactId>
     </dependency>
 
+
     <!-- provided scope -->
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -54,6 +55,26 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- test scope -->
     <dependency>
@@ -77,11 +98,6 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <scope>test</scope>
-    </dependency>
 
   </dependencies>
   <build>
diff --git a/security-utils/src/main/java/com/yahoo/security/BasicConstraintsExtension.java b/vespajlib/src/main/java/com/yahoo/security/BasicConstraintsExtension.java
index d3c08ba27d0..d3c08ba27d0 100644
--- a/security-utils/src/main/java/com/yahoo/security/BasicConstraintsExtension.java
+++ b/vespajlib/src/main/java/com/yahoo/security/BasicConstraintsExtension.java
diff --git a/security-utils/src/main/java/com/yahoo/security/BouncyCastleProviderHolder.java b/vespajlib/src/main/java/com/yahoo/security/BouncyCastleProviderHolder.java
index 48a23a1fe7e..48a23a1fe7e 100644
--- a/security-utils/src/main/java/com/yahoo/security/BouncyCastleProviderHolder.java
+++ b/vespajlib/src/main/java/com/yahoo/security/BouncyCastleProviderHolder.java
diff --git a/security-utils/src/main/java/com/yahoo/security/Extension.java b/vespajlib/src/main/java/com/yahoo/security/Extension.java
index 46b781c9c86..46b781c9c86 100644
--- a/security-utils/src/main/java/com/yahoo/security/Extension.java
+++ b/vespajlib/src/main/java/com/yahoo/security/Extension.java
diff --git a/security-utils/src/main/java/com/yahoo/security/KeyAlgorithm.java b/vespajlib/src/main/java/com/yahoo/security/KeyAlgorithm.java
index 3218f81f0d6..3218f81f0d6 100644
--- a/security-utils/src/main/java/com/yahoo/security/KeyAlgorithm.java
+++ b/vespajlib/src/main/java/com/yahoo/security/KeyAlgorithm.java
diff --git a/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java b/vespajlib/src/main/java/com/yahoo/security/KeyStoreBuilder.java
index 2160fbf6455..2160fbf6455 100644
--- a/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java
+++ b/vespajlib/src/main/java/com/yahoo/security/KeyStoreBuilder.java
diff --git a/security-utils/src/main/java/com/yahoo/security/KeyStoreType.java b/vespajlib/src/main/java/com/yahoo/security/KeyStoreType.java
index 7fb8df35286..7fb8df35286 100644
--- a/security-utils/src/main/java/com/yahoo/security/KeyStoreType.java
+++ b/vespajlib/src/main/java/com/yahoo/security/KeyStoreType.java
diff --git a/security-utils/src/main/java/com/yahoo/security/KeyStoreUtils.java b/vespajlib/src/main/java/com/yahoo/security/KeyStoreUtils.java
index f0c4d99bf69..f0c4d99bf69 100644
--- a/security-utils/src/main/java/com/yahoo/security/KeyStoreUtils.java
+++ b/vespajlib/src/main/java/com/yahoo/security/KeyStoreUtils.java
diff --git a/security-utils/src/main/java/com/yahoo/security/KeyUtils.java b/vespajlib/src/main/java/com/yahoo/security/KeyUtils.java
index 11fb0f432e4..11fb0f432e4 100644
--- a/security-utils/src/main/java/com/yahoo/security/KeyUtils.java
+++ b/vespajlib/src/main/java/com/yahoo/security/KeyUtils.java
diff --git a/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java b/vespajlib/src/main/java/com/yahoo/security/Pkcs10Csr.java
index e08ee117fcd..e08ee117fcd 100644
--- a/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java
+++ b/vespajlib/src/main/java/com/yahoo/security/Pkcs10Csr.java
diff --git a/security-utils/src/main/java/com/yahoo/security/Pkcs10CsrBuilder.java b/vespajlib/src/main/java/com/yahoo/security/Pkcs10CsrBuilder.java
index 0fe6117ef2f..0fe6117ef2f 100644
--- a/security-utils/src/main/java/com/yahoo/security/Pkcs10CsrBuilder.java
+++ b/vespajlib/src/main/java/com/yahoo/security/Pkcs10CsrBuilder.java
diff --git a/security-utils/src/main/java/com/yahoo/security/Pkcs10CsrUtils.java b/vespajlib/src/main/java/com/yahoo/security/Pkcs10CsrUtils.java
index 6f12450528d..6f12450528d 100644
--- a/security-utils/src/main/java/com/yahoo/security/Pkcs10CsrUtils.java
+++ b/vespajlib/src/main/java/com/yahoo/security/Pkcs10CsrUtils.java
diff --git a/security-utils/src/main/java/com/yahoo/security/SignatureAlgorithm.java b/vespajlib/src/main/java/com/yahoo/security/SignatureAlgorithm.java
index fbff18f5c12..fbff18f5c12 100644
--- a/security-utils/src/main/java/com/yahoo/security/SignatureAlgorithm.java
+++ b/vespajlib/src/main/java/com/yahoo/security/SignatureAlgorithm.java
diff --git a/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java b/vespajlib/src/main/java/com/yahoo/security/SslContextBuilder.java
index 75ab2417edf..75ab2417edf 100644
--- a/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java
+++ b/vespajlib/src/main/java/com/yahoo/security/SslContextBuilder.java
diff --git a/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java b/vespajlib/src/main/java/com/yahoo/security/SubjectAlternativeName.java
index 29395c75e70..29395c75e70 100644
--- a/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java
+++ b/vespajlib/src/main/java/com/yahoo/security/SubjectAlternativeName.java
diff --git a/security-utils/src/main/java/com/yahoo/security/X509CertificateBuilder.java b/vespajlib/src/main/java/com/yahoo/security/X509CertificateBuilder.java
index 54d7d39253e..54d7d39253e 100644
--- a/security-utils/src/main/java/com/yahoo/security/X509CertificateBuilder.java
+++ b/vespajlib/src/main/java/com/yahoo/security/X509CertificateBuilder.java
diff --git a/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java b/vespajlib/src/main/java/com/yahoo/security/X509CertificateUtils.java
index 33bd750bac5..33bd750bac5 100644
--- a/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java
+++ b/vespajlib/src/main/java/com/yahoo/security/X509CertificateUtils.java
diff --git a/security-utils/src/main/java/com/yahoo/security/package-info.java b/vespajlib/src/main/java/com/yahoo/security/package-info.java
index 10a4c9c0e0d..10a4c9c0e0d 100644
--- a/security-utils/src/main/java/com/yahoo/security/package-info.java
+++ b/vespajlib/src/main/java/com/yahoo/security/package-info.java
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptions.java b/vespajlib/src/main/java/com/yahoo/security/tls/TransportSecurityOptions.java
index f0d1edd6889..f0d1edd6889 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptions.java
+++ b/vespajlib/src/main/java/com/yahoo/security/tls/TransportSecurityOptions.java
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java b/vespajlib/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
index 5595d33a9b5..5595d33a9b5 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
+++ b/vespajlib/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/package-info.java b/vespajlib/src/main/java/com/yahoo/security/tls/package-info.java
index b5668182f14..b5668182f14 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/package-info.java
+++ b/vespajlib/src/main/java/com/yahoo/security/tls/package-info.java
diff --git a/security-utils/src/test/java/com/yahoo/security/KeyStoreBuilderTest.java b/vespajlib/src/test/java/com/yahoo/security/KeyStoreBuilderTest.java
index 06ea5d963a3..06ea5d963a3 100644
--- a/security-utils/src/test/java/com/yahoo/security/KeyStoreBuilderTest.java
+++ b/vespajlib/src/test/java/com/yahoo/security/KeyStoreBuilderTest.java
diff --git a/security-utils/src/test/java/com/yahoo/security/KeyUtilsTest.java b/vespajlib/src/test/java/com/yahoo/security/KeyUtilsTest.java
index 5e786654d7c..5e786654d7c 100644
--- a/security-utils/src/test/java/com/yahoo/security/KeyUtilsTest.java
+++ b/vespajlib/src/test/java/com/yahoo/security/KeyUtilsTest.java
diff --git a/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrBuilderTest.java b/vespajlib/src/test/java/com/yahoo/security/Pkcs10CsrBuilderTest.java
index d51203a5cb2..d51203a5cb2 100644
--- a/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrBuilderTest.java
+++ b/vespajlib/src/test/java/com/yahoo/security/Pkcs10CsrBuilderTest.java
diff --git a/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrTest.java b/vespajlib/src/test/java/com/yahoo/security/Pkcs10CsrTest.java
index cc1f6cc6a14..cc1f6cc6a14 100644
--- a/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrTest.java
+++ b/vespajlib/src/test/java/com/yahoo/security/Pkcs10CsrTest.java
diff --git a/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrUtilsTest.java b/vespajlib/src/test/java/com/yahoo/security/Pkcs10CsrUtilsTest.java
index 04d35a537bb..04d35a537bb 100644
--- a/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrUtilsTest.java
+++ b/vespajlib/src/test/java/com/yahoo/security/Pkcs10CsrUtilsTest.java
diff --git a/security-utils/src/test/java/com/yahoo/security/SslContextBuilderTest.java b/vespajlib/src/test/java/com/yahoo/security/SslContextBuilderTest.java
index cc269a4ef43..cc269a4ef43 100644
--- a/security-utils/src/test/java/com/yahoo/security/SslContextBuilderTest.java
+++ b/vespajlib/src/test/java/com/yahoo/security/SslContextBuilderTest.java
diff --git a/security-utils/src/test/java/com/yahoo/security/TestUtils.java b/vespajlib/src/test/java/com/yahoo/security/TestUtils.java
index fcfcfb2b761..fcfcfb2b761 100644
--- a/security-utils/src/test/java/com/yahoo/security/TestUtils.java
+++ b/vespajlib/src/test/java/com/yahoo/security/TestUtils.java
diff --git a/security-utils/src/test/java/com/yahoo/security/X509CertificateBuilderTest.java b/vespajlib/src/test/java/com/yahoo/security/X509CertificateBuilderTest.java
index 7e6d343b570..7e6d343b570 100644
--- a/security-utils/src/test/java/com/yahoo/security/X509CertificateBuilderTest.java
+++ b/vespajlib/src/test/java/com/yahoo/security/X509CertificateBuilderTest.java
diff --git a/security-utils/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java b/vespajlib/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java
index 76a93028efe..76a93028efe 100644
--- a/security-utils/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java
+++ b/vespajlib/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java
diff --git a/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsTest.java b/vespajlib/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsTest.java
index f311651cab0..f311651cab0 100644
--- a/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsTest.java
+++ b/vespajlib/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsTest.java
diff --git a/security-utils/src/test/resources/transport-security-options.json b/vespajlib/src/test/resources/transport-security-options.json
index 0506c130722..0506c130722 100644
--- a/security-utils/src/test/resources/transport-security-options.json
+++ b/vespajlib/src/test/resources/transport-security-options.json