Merge pull request #17140 from vespa-engine/gjoranv/merge-http-into-core_rebased

Gjoranv/merge http into core (rebased) 

207 files changed, 1657 insertions, 1959 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eae4cb338eb..1b4a87aa39c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,6 @@ add_subdirectory(configserver)
 add_subdirectory(configserver-flags)
 add_subdirectory(configutil)
 add_subdirectory(container-core)
-add_subdirectory(container-core-config)
 add_subdirectory(container-di)
 add_subdirectory(container-disc)
 add_subdirectory(container-jersey2)
@@ -92,7 +91,6 @@ add_subdirectory(hosted-zone-api)
 add_subdirectory(jdisc-cloud-aws)
 add_subdirectory(jdisc_core)
 add_subdirectory(jdisc-security-filters)
-add_subdirectory(jdisc_http_service)
 add_subdirectory(jdisc_jetty)
 add_subdirectory(jrt_test)
 add_subdirectory(juniper)
diff --git a/Code-map.md b/Code-map.md
index 3c54be35b9d..0ed326a2005 100644
--- a/Code-map.md
+++ b/Code-map.md
@@ -40,16 +40,13 @@ The stateless container is implemented in Java.
 jDisc core modules:
 
 - [jdisc_core](https://github.com/vespa-engine/vespa/tree/master/jdisc_core) - the core jDisc functionality
-- [jdisc_http_service](https://github.com/vespa-engine/vespa/tree/master/jdisc_http_service) - HTTP connector for jDisc, implemented using Jetty.
 
 jDisc container modules, layered on jDisc core:
 
 - [container-disc](https://github.com/vespa-engine/vespa/tree/master/container-disc) - integration between the jDisc container and jDisc core layers.
-- [container-core](https://github.com/vespa-engine/vespa/tree/master/container-core) - core jDisc container functionality: Metrics, OSGi integration for component bundles, etc.
+- [container-core](https://github.com/vespa-engine/vespa/tree/master/container-core) - core jDisc container functionality: Metrics, OSGi integration for component bundles, HTTP connector, etc.
 - [component](https://github.com/vespa-engine/vespa/tree/master/component) - the component model. Components (in Java) will implement or subclass a type for this module.
-- [chain](https://github.com/vespa-engine/vespa/tree/master/chain) - generic support for chaining components in a Chain of Responsibility structure, which is a pattern used repeatedly in higher level modules.
 - [container-di](https://github.com/vespa-engine/vespa/tree/master/container-di) - component dependency injection framework for the container, compatible with Guice annotations but an separate implementation which handles injection of config and injection of component collections.
-- [processing](https://github.com/vespa-engine/vespa/tree/master/processing) - generic, chainable request-response processing framework (Processors).
 
 Search container, layered on jDisc container:
 
diff --git a/application/pom.xml b/application/pom.xml
index 96250acb5a9..1e14610af69 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -60,7 +60,7 @@
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
-    <!-- Because these are provided in jdisc_http_service and just preinstalled: -->
+    <!-- Because these are provided in container-core and just preinstalled: -->
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>jdisc_jetty</artifactId>
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index d889fd79fdc..d2188e37123 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -149,7 +149,6 @@
                                         <include>com.yahoo.vespa:configdefinitions:*:jar:provided</include>
                                         <include>com.yahoo.vespa:configgen:*:jar:provided</include>
                                         <include>com.yahoo.vespa:container-core:*:jar:provided</include>
-                                        <include>com.yahoo.vespa:container-core-config:*:jar:provided</include>
                                         <include>com.yahoo.vespa:container-dev:*:jar:provided</include>
                                         <include>com.yahoo.vespa:container-di:*:jar:provided</include>
                                         <include>com.yahoo.vespa:container-disc:*:jar:provided</include>
@@ -168,7 +167,6 @@
                                         <include>com.yahoo.vespa:hosted-zone-api:*:jar:provided</include>
                                         <include>com.yahoo.vespa:http-utils:*:jar:provided</include>
                                         <include>com.yahoo.vespa:jdisc_core:*:jar:provided</include>
-                                        <include>com.yahoo.vespa:jdisc_http_service:*:jar:provided</include>
                                         <include>com.yahoo.vespa:jdisc_messagebus_service:*:jar:provided</include>
                                         <include>com.yahoo.vespa:jrt:*:jar:provided</include>
                                         <include>com.yahoo.vespa:linguistics:*:jar:provided</include>
diff --git a/config-model/pom.xml b/config-model/pom.xml
index 8d587c2ec8c..daedc7b4a96 100644
--- a/config-model/pom.xml
+++ b/config-model/pom.xml
@@ -290,12 +290,6 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_http_service</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
       <artifactId>jdisc-security-filters</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index 5e95403313c..d075e661149 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -88,7 +88,7 @@ public abstract class Container extends AbstractService implements
         this.parent = parent;
         this.retired = retired;
         this.index = index;
-        this.defaultHttpServer = new JettyHttpServer(new ComponentId("DefaultHttpServer"), containerClusterOrNull(parent), isHostedVespa);
+        this.defaultHttpServer = new JettyHttpServer("DefaultHttpServer", containerClusterOrNull(parent), isHostedVespa);
         if (getHttp() == null) {
             addChild(defaultHttpServer);
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index db4cda8b72e..8868c55becb 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -173,7 +173,7 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         componentGroup = new ComponentGroup<>(this, "component");
 
         addComponent(new StatisticsComponent());
-        addSimpleComponent(AccessLog.class.getName(), null, "jdisc_http_service");
+        addSimpleComponent(AccessLog.class);
         addComponent(new DefaultThreadpoolProvider(this));
         addSimpleComponent(com.yahoo.concurrent.classlock.ClassLocking.class);
         addSimpleComponent(SecurityFilterInvoker.class);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConnectionLogComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConnectionLogComponent.java
index 8eff7bf7201..83e06aab703 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConnectionLogComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConnectionLogComponent.java
@@ -20,7 +20,7 @@ public class ConnectionLogComponent extends SimpleComponent implements Connectio
     }
 
     public ConnectionLogComponent(ContainerCluster<?> cluster, Class<? extends ConnectionLog> cls, String logDirectoryName, String clusterName) {
-        super(new ComponentModel(cls.getName(), null, "jdisc_http_service", null));
+        super(cls.getName());
         this.logDirectoryName = logDirectoryName;
         this.clusterName = clusterName;
         this.queueSize = queueSize(cluster).orElse(-1);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java
index 67b3ec0f6a7..989f911fc5e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java
@@ -27,11 +27,9 @@ public class ConnectorFactory extends SimpleComponent implements ConnectorConfig
     private volatile ComponentId defaultResponseFilterChain;
 
     protected ConnectorFactory(Builder builder) {
-        super(new ComponentModel(
-                new BundleInstantiationSpecification(
-                        new ComponentId(builder.name),
-                        fromString("com.yahoo.jdisc.http.server.jetty.ConnectorFactory"),
-                        fromString("jdisc_http_service"))));
+        super(new ComponentModel(builder.name,
+                                 com.yahoo.jdisc.http.server.jetty.ConnectorFactory.class.getName(),
+                                 null));
         this.name = builder.name;
         this.listenPort = builder.listenPort;
         this.sslProviderComponent = builder.sslProvider != null ? builder.sslProvider : new DefaultSslProvider(name);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java
index 674d2ce3325..ce79a124e81 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java
@@ -26,15 +26,11 @@ public class JettyHttpServer extends SimpleComponent implements ServerConfig.Pro
     private volatile boolean isHostedVespa;
     private final List<ConnectorFactory> connectorFactories = new ArrayList<>();
 
-    public JettyHttpServer(ComponentId id, ContainerCluster<?> cluster, boolean isHostedVespa) {
-        super(new ComponentModel(
-                new BundleInstantiationSpecification(id,
-                                                     fromString("com.yahoo.jdisc.http.server.jetty.JettyHttpServer"),
-                                                     fromString("jdisc_http_service"))
-        ));
+    public JettyHttpServer(String componentId, ContainerCluster<?> cluster, boolean isHostedVespa) {
+        super(new ComponentModel(componentId, com.yahoo.jdisc.http.server.jetty.JettyHttpServer.class.getName(), null));
         this.isHostedVespa = isHostedVespa;
         this.cluster = cluster;
-        final FilterBindingsProviderComponent filterBindingsProviderComponent = new FilterBindingsProviderComponent(id);
+        final FilterBindingsProviderComponent filterBindingsProviderComponent = new FilterBindingsProviderComponent(componentId);
         addChild(filterBindingsProviderComponent);
         inject(filterBindingsProviderComponent);
     }
@@ -89,17 +85,17 @@ public class JettyHttpServer extends SimpleComponent implements ServerConfig.Pro
         }
     }
 
-    static ComponentModel providerComponentModel(final ComponentId parentId, String className) {
+    static ComponentModel providerComponentModel(String parentId, String className) {
         final ComponentSpecification classNameSpec = new ComponentSpecification(
                 className);
         return new ComponentModel(new BundleInstantiationSpecification(
-                classNameSpec.nestInNamespace(parentId),
+                classNameSpec.nestInNamespace(new ComponentId(parentId)),
                 classNameSpec,
                 null));
     }
 
     public static final class FilterBindingsProviderComponent extends SimpleComponent {
-        public FilterBindingsProviderComponent(final ComponentId parentId) {
+        public FilterBindingsProviderComponent(String parentId) {
             super(providerComponentModel(parentId, "com.yahoo.container.jdisc.FilterBindingsProvider"));
         }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/ConfiguredDirectSslProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/ConfiguredDirectSslProvider.java
index 8f5970453a5..690e4376120 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/ConfiguredDirectSslProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/ConfiguredDirectSslProvider.java
@@ -17,7 +17,6 @@ import static com.yahoo.jdisc.http.ConnectorConfig.Ssl.ClientAuth;
 public class ConfiguredDirectSslProvider extends SslProvider {
     public static final String COMPONENT_ID_PREFIX = "configured-ssl-provider@";
     public static final String COMPONENT_CLASS = ConfiguredSslContextFactoryProvider.class.getName();
-    public static final String COMPONENT_BUNDLE = "jdisc_http_service";
 
     private final String privateKey;
     private final String certificate;
@@ -26,7 +25,7 @@ public class ConfiguredDirectSslProvider extends SslProvider {
     private final ClientAuth.Enum clientAuthentication;
 
     public ConfiguredDirectSslProvider(String servername, String privateKey, String certificate, String caCertificatePath, String caCertificate, ClientAuth.Enum clientAuthentication) {
-        super(COMPONENT_ID_PREFIX, servername, COMPONENT_CLASS, COMPONENT_BUNDLE);
+        super(COMPONENT_ID_PREFIX, servername, COMPONENT_CLASS, null);
         this.privateKey = privateKey;
         this.certificate = certificate;
         this.caCertificatePath = caCertificatePath;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/ConfiguredFilebasedSslProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/ConfiguredFilebasedSslProvider.java
index a19626db8bc..656c7d8e778 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/ConfiguredFilebasedSslProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/ConfiguredFilebasedSslProvider.java
@@ -16,7 +16,6 @@ import java.util.Optional;
 public class ConfiguredFilebasedSslProvider extends SslProvider {
     public static final String COMPONENT_ID_PREFIX = "configured-ssl-provider@";
     public static final String COMPONENT_CLASS = ConfiguredSslContextFactoryProvider.class.getName();
-    public static final String COMPONENT_BUNDLE = "jdisc_http_service";
 
     private final String privateKeyPath;
     private final String certificatePath;
@@ -32,7 +31,7 @@ public class ConfiguredFilebasedSslProvider extends SslProvider {
                                           String clientAuthentication,
                                           List<String> cipherSuites,
                                           List<String> protocolVersions) {
-        super(COMPONENT_ID_PREFIX, servername, COMPONENT_CLASS, COMPONENT_BUNDLE);
+        super(COMPONENT_ID_PREFIX, servername, COMPONENT_CLASS, null);
         this.privateKeyPath = privateKeyPath;
         this.certificatePath = certificatePath;
         this.caCertificatePath = caCertificatePath;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DefaultSslProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DefaultSslProvider.java
index 215c1813e95..6504d8ac653 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DefaultSslProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DefaultSslProvider.java
@@ -11,10 +11,9 @@ public class DefaultSslProvider extends SslProvider {
 
     public static final String COMPONENT_ID_PREFIX = "default-ssl-provider@";
     public static final String COMPONENT_CLASS = DefaultSslContextFactoryProvider.class.getName();
-    public static final String COMPONENT_BUNDLE = "jdisc_http_service";
 
     public DefaultSslProvider(String serverName) {
-        super(COMPONENT_ID_PREFIX, serverName, COMPONENT_CLASS, COMPONENT_BUNDLE);
+        super(COMPONENT_ID_PREFIX, serverName, COMPONENT_CLASS, null);
     }
 
     @Override public void amendConnectorConfig(ConnectorConfig.Builder builder) {}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyHttpServerBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyHttpServerBuilder.java
index f3e82d515df..f0be8ebc29e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyHttpServerBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyHttpServerBuilder.java
@@ -24,8 +24,7 @@ public class JettyHttpServerBuilder extends VespaDomBuilder.DomConfigProducerBui
 
     @Override
     protected JettyHttpServer doBuild(DeployState deployState, AbstractConfigProducer<?> ancestor, Element http) {
-        JettyHttpServer jettyHttpServer = new JettyHttpServer(
-                new ComponentId("jdisc-jetty"), cluster, deployState.isHosted());
+        JettyHttpServer jettyHttpServer = new JettyHttpServer("jdisc-jetty", cluster, deployState.isHosted());
         for (Element serverSpec: XML.getChildren(http, "server")) {
             ConnectorFactory connectorFactory = new JettyConnectorBuilder().build(deployState, ancestor, serverSpec);
             jettyHttpServer.addConnector(connectorFactory);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index f2e8757c115..19141bd1f4d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -464,7 +464,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         }
         JettyHttpServer httpServer = cluster.getHttp().getHttpServer().orElse(null);
         if (httpServer == null) {
-            httpServer = new JettyHttpServer(new ComponentId("DefaultHttpServer"), cluster, cluster.isHostedVespa());
+            httpServer = new JettyHttpServer("DefaultHttpServer", cluster, cluster.isHostedVespa());
             cluster.getHttp().setHttpServer(httpServer);
         }
         int defaultPort = Defaults.getDefaults().vespaWebServicePort();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
index 0f9bd506310..b3b347aaa7f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
@@ -194,7 +194,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
         assertThat(withCiphersAndProtocols.ssl().enabledCipherSuites(), is(equalTo(List.of("TLS_AES_128_GCM_SHA256", "TLS_AES_256_GCM_SHA384"))));
         assertThat(withCiphersAndProtocols.ssl().enabledProtocols(), is(equalTo(List.of("TLSv1.3"))));
 
-        ContainerCluster cluster = (ContainerCluster) root.getChildren().get("default");
+        ContainerCluster<?> cluster = (ContainerCluster<?>) root.getChildren().get("default");
         List<ConnectorFactory> connectorFactories = cluster.getChildrenByTypeRecursive(ConnectorFactory.class);
         connectorFactories.forEach(connectorFactory -> assertChildComponentExists(connectorFactory, ConfiguredFilebasedSslProvider.COMPONENT_CLASS));
     }
@@ -217,7 +217,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
 
         assertTrue(sslProvider.ssl().enabled());
 
-        ContainerCluster cluster = (ContainerCluster) root.getChildren().get("default");
+        ContainerCluster<?> cluster = (ContainerCluster<?>) root.getChildren().get("default");
         List<ConnectorFactory> connectorFactories = cluster.getChildrenByTypeRecursive(ConnectorFactory.class);
         ConnectorFactory connectorFactory = connectorFactories.get(0);
         assertChildComponentExists(connectorFactory, "com.yahoo.CustomSslProvider");
@@ -300,7 +300,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     }
 
     private void assertJettyServerInConfig() {
-        ContainerCluster cluster = (ContainerCluster) root.getChildren().get("default");
+        ContainerCluster<?> cluster = (ContainerCluster<?>) root.getChildren().get("default");
         List<JettyHttpServer> jettyServers = cluster.getChildrenByTypeRecursive(JettyHttpServer.class);
 
         assertThat(jettyServers.size(), is(1));
@@ -308,7 +308,8 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
         JettyHttpServer server = jettyServers.get(0);
         assertThat(server.model.bundleInstantiationSpec.classId.toString(),
                 is(com.yahoo.jdisc.http.server.jetty.JettyHttpServer.class.getName()));
-        assertThat(server.model.bundleInstantiationSpec.bundle.toString(), is("jdisc_http_service"));
+        assertThat(server.model.bundleInstantiationSpec.bundle.toString(),
+                   is(com.yahoo.jdisc.http.server.jetty.JettyHttpServer.class.getName()));
         assertThat(server.getConnectorFactories().size(), is(1));
 
         assertThat(
diff --git a/container-core-config/CMakeLists.txt b/container-core-config/CMakeLists.txt
deleted file mode 100644
index 307bb103e9f..00000000000
--- a/container-core-config/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions()
diff --git a/container-core-config/OWNERS b/container-core-config/OWNERS
deleted file mode 100644
index fb71c67318d..00000000000
--- a/container-core-config/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-bjorncs
\ No newline at end of file
diff --git a/container-core-config/README.md b/container-core-config/README.md
deleted file mode 100644
index ac37c242a5f..00000000000
--- a/container-core-config/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-# container-core-config
-
-Contains config definitions with package `com.yahoo.container.core` that are used by other modules.
-
-This artifact is embedded inside container-core jar, but built as bundle to allow other modules to depend on container-core config definitions without depending on container-core.
-The generated config classes cannot be moved to container-core as it would introduce a cycles in Maven dependency graph.
-This works at correctly runtime as OSGi allows cycling dependencies between bundles.
diff --git a/container-core-config/pom.xml b/container-core-config/pom.xml
deleted file mode 100644
index fb4aea4071e..00000000000
--- a/container-core-config/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright Verizon Media. 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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.yahoo.vespa</groupId>
-    <artifactId>parent</artifactId>
-    <version>7-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>container-core-config</artifactId>
-  <version>7-SNAPSHOT</version>
-  <packaging>container-plugin</packaging> <!-- See README.md for why it's not packaged as 'jar' -->
-  <dependencies>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>annotations</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>config-lib</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>bundle-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-    </plugins>
-    <outputDirectory>${buildOutputDirectory}</outputDirectory>
-  </build>
-  <properties>
-    <buildOutputDirectory>${project.build.directory}/classes/</buildOutputDirectory>
-  </properties>
-</project>
\ No newline at end of file
diff --git a/container-core-config/src/main/java/com/yahoo/container/core/package-info.java b/container-core-config/src/main/java/com/yahoo/container/core/package-info.java
deleted file mode 100644
index c9c683bd68a..00000000000
--- a/container-core-config/src/main/java/com/yahoo/container/core/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package com.yahoo.container.core;
-
-import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file
diff --git a/container-core/CMakeLists.txt b/container-core/CMakeLists.txt
index 74f02518b59..433e3c799b5 100644
--- a/container-core/CMakeLists.txt
+++ b/container-core/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_config_definitions()
+install_java_artifact_dependencies(container-core)
 
 vespa_install_script(src/main/sh/vespa-load-balancer-status libexec/vespa)
diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index d549ba1098d..da8ed609dfc 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -860,6 +860,1486 @@
     ],
     "fields": []
   },
+  "com.yahoo.jdisc.http.CertificateStore": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public java.lang.String getCertificate(java.lang.String)",
+      "public java.lang.String getCertificate(java.lang.String, long)",
+      "public abstract java.lang.String getCertificate(java.lang.String, long, long)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigInstance$Builder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder listenPort(int)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder name(java.lang.String)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder headerCacheSize(int)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder outputBufferSize(int)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder requestHeaderSize(int)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder responseHeaderSize(int)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder acceptQueueSize(int)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder reuseAddress(boolean)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder idleTimeout(double)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder stopTimeout(double)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder tcpKeepAliveEnabled(boolean)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder tcpNoDelay(boolean)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder throttling(com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder implicitTlsEnabled(boolean)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder ssl(com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder tlsClientAuthEnforcer(com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder healthCheckProxy(com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder proxyProtocol(com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol$Builder)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder secureRedirect(com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect$Builder)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder maxRequestsPerConnection(int)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Builder maxConnectionLife(double)",
+      "public final boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)",
+      "public final java.lang.String getDefMd5()",
+      "public final java.lang.String getDefName()",
+      "public final java.lang.String getDefNamespace()",
+      "public final boolean getApplyOnRestart()",
+      "public final void setApplyOnRestart(boolean)",
+      "public com.yahoo.jdisc.http.ConnectorConfig build()"
+    ],
+    "fields": [
+      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder throttling",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder ssl",
+      "public com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder tlsClientAuthEnforcer",
+      "public com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder healthCheckProxy",
+      "public com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol$Builder proxyProtocol",
+      "public com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect$Builder secureRedirect"
+    ]
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder enable(boolean)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder port(int)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder clientTimeout(double)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder)",
+      "public boolean enable()",
+      "public int port()",
+      "public double clientTimeout()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$Producer": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigInstance$Producer"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void getConfig(com.yahoo.jdisc.http.ConnectorConfig$Builder)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol$Builder enabled(boolean)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol$Builder mixedMode(boolean)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol$Builder)",
+      "public boolean enabled()",
+      "public boolean mixedMode()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect$Builder enabled(boolean)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect$Builder port(int)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect$Builder)",
+      "public boolean enabled()",
+      "public int port()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder enabled(boolean)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder privateKeyFile(java.lang.String)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder privateKey(java.lang.String)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder certificateFile(java.lang.String)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder certificate(java.lang.String)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder caCertificateFile(java.lang.String)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder caCertificate(java.lang.String)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder clientAuth(com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder enabledCipherSuites(java.lang.String)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder enabledCipherSuites(java.util.Collection)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder enabledProtocols(java.lang.String)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder enabledProtocols(java.util.Collection)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl build()"
+    ],
+    "fields": [
+      "public java.util.List enabledCipherSuites",
+      "public java.util.List enabledProtocols"
+    ]
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum[] values()",
+      "public static com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum valueOf(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum DISABLED",
+      "public static final enum com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum WANT_AUTH",
+      "public static final enum com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum NEED_AUTH"
+    ]
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth": {
+    "superClass": "com.yahoo.config.EnumNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum)"
+    ],
+    "fields": [
+      "public static final com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum DISABLED",
+      "public static final com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum WANT_AUTH",
+      "public static final com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum NEED_AUTH"
+    ]
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$Ssl": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder)",
+      "public boolean enabled()",
+      "public java.lang.String privateKeyFile()",
+      "public java.lang.String privateKey()",
+      "public java.lang.String certificateFile()",
+      "public java.lang.String certificate()",
+      "public java.lang.String caCertificateFile()",
+      "public java.lang.String caCertificate()",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum clientAuth()",
+      "public java.util.List enabledCipherSuites()",
+      "public java.lang.String enabledCipherSuites(int)",
+      "public java.util.List enabledProtocols()",
+      "public java.lang.String enabledProtocols(int)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Throttling)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder enabled(boolean)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder maxConnections(int)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder maxHeapUtilization(double)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder maxAcceptRate(int)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder idleTimeout(double)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$Throttling": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder)",
+      "public boolean enabled()",
+      "public int maxConnections()",
+      "public double maxHeapUtilization()",
+      "public int maxAcceptRate()",
+      "public double idleTimeout()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder enable(boolean)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder pathWhitelist(java.lang.String)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder pathWhitelist(java.util.Collection)",
+      "public com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer build()"
+    ],
+    "fields": [
+      "public java.util.List pathWhitelist"
+    ]
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder)",
+      "public boolean enable()",
+      "public java.util.List pathWhitelist()",
+      "public java.lang.String pathWhitelist(int)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ConnectorConfig": {
+    "superClass": "com.yahoo.config.ConfigInstance",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public static java.lang.String getDefMd5()",
+      "public static java.lang.String getDefName()",
+      "public static java.lang.String getDefNamespace()",
+      "public static java.lang.String getDefVersion()",
+      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Builder)",
+      "public int listenPort()",
+      "public java.lang.String name()",
+      "public int headerCacheSize()",
+      "public int outputBufferSize()",
+      "public int requestHeaderSize()",
+      "public int responseHeaderSize()",
+      "public int acceptQueueSize()",
+      "public boolean reuseAddress()",
+      "public double idleTimeout()",
+      "public double stopTimeout()",
+      "public boolean tcpKeepAliveEnabled()",
+      "public boolean tcpNoDelay()",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling throttling()",
+      "public boolean implicitTlsEnabled()",
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl ssl()",
+      "public com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer tlsClientAuthEnforcer()",
+      "public com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy healthCheckProxy()",
+      "public com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol proxyProtocol()",
+      "public com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect secureRedirect()",
+      "public int maxRequestsPerConnection()",
+      "public double maxConnectionLife()"
+    ],
+    "fields": [
+      "public static final java.lang.String CONFIG_DEF_MD5",
+      "public static final java.lang.String CONFIG_DEF_NAME",
+      "public static final java.lang.String CONFIG_DEF_NAMESPACE",
+      "public static final java.lang.String CONFIG_DEF_VERSION",
+      "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
+    ]
+  },
+  "com.yahoo.jdisc.http.Cookie$SameSite": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.jdisc.http.Cookie$SameSite[] values()",
+      "public static com.yahoo.jdisc.http.Cookie$SameSite valueOf(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.jdisc.http.Cookie$SameSite NONE",
+      "public static final enum com.yahoo.jdisc.http.Cookie$SameSite STRICT",
+      "public static final enum com.yahoo.jdisc.http.Cookie$SameSite LAX"
+    ]
+  },
+  "com.yahoo.jdisc.http.Cookie": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.Cookie)",
+      "public void <init>(java.lang.String, java.lang.String)",
+      "public java.lang.String getName()",
+      "public com.yahoo.jdisc.http.Cookie setName(java.lang.String)",
+      "public java.lang.String getValue()",
+      "public com.yahoo.jdisc.http.Cookie setValue(java.lang.String)",
+      "public java.lang.String getDomain()",
+      "public com.yahoo.jdisc.http.Cookie setDomain(java.lang.String)",
+      "public java.lang.String getPath()",
+      "public com.yahoo.jdisc.http.Cookie setPath(java.lang.String)",
+      "public com.yahoo.jdisc.http.Cookie$SameSite getSameSite()",
+      "public com.yahoo.jdisc.http.Cookie setSameSite(com.yahoo.jdisc.http.Cookie$SameSite)",
+      "public int getMaxAge(java.util.concurrent.TimeUnit)",
+      "public com.yahoo.jdisc.http.Cookie setMaxAge(int, java.util.concurrent.TimeUnit)",
+      "public boolean isSecure()",
+      "public com.yahoo.jdisc.http.Cookie setSecure(boolean)",
+      "public boolean isHttpOnly()",
+      "public com.yahoo.jdisc.http.Cookie setHttpOnly(boolean)",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
+      "public java.lang.String toString()",
+      "public static java.lang.String toCookieHeader(java.lang.Iterable)",
+      "public static java.util.List fromCookieHeader(java.lang.String)",
+      "public static java.util.List toSetCookieHeaders(java.lang.Iterable)",
+      "public static java.util.List toSetCookieHeaderAll(java.lang.Iterable)",
+      "public static com.yahoo.jdisc.http.Cookie fromSetCookieHeader(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.HttpHeaders$Names": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [],
+    "fields": [
+      "public static final java.lang.String ACCEPT",
+      "public static final java.lang.String ACCEPT_CHARSET",
+      "public static final java.lang.String ACCEPT_ENCODING",
+      "public static final java.lang.String ACCEPT_LANGUAGE",
+      "public static final java.lang.String ACCEPT_RANGES",
+      "public static final java.lang.String ACCEPT_PATCH",
+      "public static final java.lang.String AGE",
+      "public static final java.lang.String ALLOW",
+      "public static final java.lang.String AUTHORIZATION",
+      "public static final java.lang.String CACHE_CONTROL",
+      "public static final java.lang.String CONNECTION",
+      "public static final java.lang.String CONTENT_BASE",
+      "public static final java.lang.String CONTENT_ENCODING",
+      "public static final java.lang.String CONTENT_LANGUAGE",
+      "public static final java.lang.String CONTENT_LENGTH",
+      "public static final java.lang.String CONTENT_LOCATION",
+      "public static final java.lang.String CONTENT_TRANSFER_ENCODING",
+      "public static final java.lang.String CONTENT_MD5",
+      "public static final java.lang.String CONTENT_RANGE",
+      "public static final java.lang.String CONTENT_TYPE",
+      "public static final java.lang.String COOKIE",
+      "public static final java.lang.String DATE",
+      "public static final java.lang.String ETAG",
+      "public static final java.lang.String EXPECT",
+      "public static final java.lang.String EXPIRES",
+      "public static final java.lang.String FROM",
+      "public static final java.lang.String HOST",
+      "public static final java.lang.String IF_MATCH",
+      "public static final java.lang.String IF_MODIFIED_SINCE",
+      "public static final java.lang.String IF_NONE_MATCH",
+      "public static final java.lang.String IF_RANGE",
+      "public static final java.lang.String IF_UNMODIFIED_SINCE",
+      "public static final java.lang.String LAST_MODIFIED",
+      "public static final java.lang.String LOCATION",
+      "public static final java.lang.String MAX_FORWARDS",
+      "public static final java.lang.String ORIGIN",
+      "public static final java.lang.String PRAGMA",
+      "public static final java.lang.String PROXY_AUTHENTICATE",
+      "public static final java.lang.String PROXY_AUTHORIZATION",
+      "public static final java.lang.String RANGE",
+      "public static final java.lang.String REFERER",
+      "public static final java.lang.String RETRY_AFTER",
+      "public static final java.lang.String SEC_WEBSOCKET_KEY1",
+      "public static final java.lang.String SEC_WEBSOCKET_KEY2",
+      "public static final java.lang.String SEC_WEBSOCKET_LOCATION",
+      "public static final java.lang.String SEC_WEBSOCKET_ORIGIN",
+      "public static final java.lang.String SEC_WEBSOCKET_PROTOCOL",
+      "public static final java.lang.String SEC_WEBSOCKET_VERSION",
+      "public static final java.lang.String SEC_WEBSOCKET_KEY",
+      "public static final java.lang.String SEC_WEBSOCKET_ACCEPT",
+      "public static final java.lang.String SERVER",
+      "public static final java.lang.String SET_COOKIE",
+      "public static final java.lang.String SET_COOKIE2",
+      "public static final java.lang.String TE",
+      "public static final java.lang.String TRAILER",
+      "public static final java.lang.String TRANSFER_ENCODING",
+      "public static final java.lang.String UPGRADE",
+      "public static final java.lang.String USER_AGENT",
+      "public static final java.lang.String VARY",
+      "public static final java.lang.String VIA",
+      "public static final java.lang.String WARNING",
+      "public static final java.lang.String WEBSOCKET_LOCATION",
+      "public static final java.lang.String WEBSOCKET_ORIGIN",
+      "public static final java.lang.String WEBSOCKET_PROTOCOL",
+      "public static final java.lang.String WWW_AUTHENTICATE",
+      "public static final java.lang.String X_DISABLE_CHUNKING",
+      "public static final java.lang.String X_YAHOO_SERVING_HOST"
+    ]
+  },
+  "com.yahoo.jdisc.http.HttpHeaders$Values": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [],
+    "fields": [
+      "public static final java.lang.String APPLICATION_X_WWW_FORM_URLENCODED",
+      "public static final java.lang.String BASE64",
+      "public static final java.lang.String BINARY",
+      "public static final java.lang.String BYTES",
+      "public static final java.lang.String CHARSET",
+      "public static final java.lang.String CHUNKED",
+      "public static final java.lang.String CLOSE",
+      "public static final java.lang.String COMPRESS",
+      "public static final java.lang.String CONTINUE",
+      "public static final java.lang.String DEFLATE",
+      "public static final java.lang.String GZIP",
+      "public static final java.lang.String IDENTITY",
+      "public static final java.lang.String KEEP_ALIVE",
+      "public static final java.lang.String MAX_AGE",
+      "public static final java.lang.String MAX_STALE",
+      "public static final java.lang.String MIN_FRESH",
+      "public static final java.lang.String MUST_REVALIDATE",
+      "public static final java.lang.String NO_CACHE",
+      "public static final java.lang.String NO_STORE",
+      "public static final java.lang.String NO_TRANSFORM",
+      "public static final java.lang.String NONE",
+      "public static final java.lang.String ONLY_IF_CACHED",
+      "public static final java.lang.String PRIVATE",
+      "public static final java.lang.String PROXY_REVALIDATE",
+      "public static final java.lang.String PUBLIC",
+      "public static final java.lang.String QUOTED_PRINTABLE",
+      "public static final java.lang.String S_MAXAGE",
+      "public static final java.lang.String TRAILERS",
+      "public static final java.lang.String UPGRADE",
+      "public static final java.lang.String WEBSOCKET"
+    ]
+  },
+  "com.yahoo.jdisc.http.HttpHeaders": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.HttpRequest$Method": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.jdisc.http.HttpRequest$Method[] values()",
+      "public static com.yahoo.jdisc.http.HttpRequest$Method valueOf(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method OPTIONS",
+      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method GET",
+      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method HEAD",
+      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method POST",
+      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method PUT",
+      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method PATCH",
+      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method DELETE",
+      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method TRACE",
+      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method CONNECT"
+    ]
+  },
+  "com.yahoo.jdisc.http.HttpRequest$Version": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.jdisc.http.HttpRequest$Version[] values()",
+      "public static com.yahoo.jdisc.http.HttpRequest$Version valueOf(java.lang.String)",
+      "public java.lang.String toString()",
+      "public static com.yahoo.jdisc.http.HttpRequest$Version fromString(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.jdisc.http.HttpRequest$Version HTTP_1_0",
+      "public static final enum com.yahoo.jdisc.http.HttpRequest$Version HTTP_1_1"
+    ]
+  },
+  "com.yahoo.jdisc.http.HttpRequest": {
+    "superClass": "com.yahoo.jdisc.Request",
+    "interfaces": [
+      "com.yahoo.jdisc.http.servlet.ServletOrJdiscHttpRequest"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "protected void <init>(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version, java.net.SocketAddress, java.lang.Long)",
+      "public com.yahoo.jdisc.http.HttpRequest$Method getMethod()",
+      "public void setMethod(com.yahoo.jdisc.http.HttpRequest$Method)",
+      "public com.yahoo.jdisc.http.HttpRequest$Version getVersion()",
+      "public java.lang.String getRemoteHostAddress()",
+      "public java.lang.String getRemoteHostName()",
+      "public int getRemotePort()",
+      "public void setVersion(com.yahoo.jdisc.http.HttpRequest$Version)",
+      "public java.net.SocketAddress getRemoteAddress()",
+      "public void setRemoteAddress(java.net.SocketAddress)",
+      "public java.net.URI getProxyServer()",
+      "public void setProxyServer(java.net.URI)",
+      "public long getConnectedAt(java.util.concurrent.TimeUnit)",
+      "public java.lang.Long getConnectionTimeout(java.util.concurrent.TimeUnit)",
+      "public void setConnectionTimeout(long, java.util.concurrent.TimeUnit)",
+      "public java.util.Map parameters()",
+      "public void copyHeaders(com.yahoo.jdisc.HeaderFields)",
+      "public java.util.List decodeCookieHeader()",
+      "public void encodeCookieHeader(java.util.List)",
+      "public com.yahoo.jdisc.HeaderFields trailers()",
+      "public boolean isChunked()",
+      "public boolean hasChunkedResponse()",
+      "public boolean isKeepAlive()",
+      "public java.security.Principal getUserPrincipal()",
+      "public void setUserPrincipal(java.security.Principal)",
+      "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI)",
+      "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method)",
+      "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version)",
+      "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version, java.net.SocketAddress)",
+      "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version, java.net.SocketAddress, long)",
+      "public static com.yahoo.jdisc.http.HttpRequest newClientRequest(com.yahoo.jdisc.Request, java.net.URI)",
+      "public static com.yahoo.jdisc.http.HttpRequest newClientRequest(com.yahoo.jdisc.Request, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method)",
+      "public static com.yahoo.jdisc.http.HttpRequest newClientRequest(com.yahoo.jdisc.Request, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.HttpResponse$Status": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.jdisc.Response$Status"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [],
+    "fields": [
+      "public static final int REQUEST_ENTITY_TOO_LARGE",
+      "public static final int REQUEST_RANGE_NOT_SATISFIABLE"
+    ]
+  },
+  "com.yahoo.jdisc.http.HttpResponse": {
+    "superClass": "com.yahoo.jdisc.Response",
+    "interfaces": [
+      "com.yahoo.jdisc.http.servlet.ServletOrJdiscHttpResponse"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "protected void <init>(com.yahoo.jdisc.Request, int, java.lang.String, java.lang.Throwable)",
+      "public boolean isChunkedEncodingEnabled()",
+      "public void setChunkedEncodingEnabled(boolean)",
+      "public void setMessage(java.lang.String)",
+      "public java.lang.String getMessage()",
+      "public void copyHeaders(com.yahoo.jdisc.HeaderFields)",
+      "public java.util.List decodeSetCookieHeader()",
+      "public void encodeSetCookieHeader(java.util.List)",
+      "public com.yahoo.jdisc.HeaderFields trailers()",
+      "public static boolean isServerError(com.yahoo.jdisc.Response)",
+      "public static com.yahoo.jdisc.http.HttpResponse newInstance(int)",
+      "public static com.yahoo.jdisc.http.HttpResponse newInstance(int, java.lang.String)",
+      "public static com.yahoo.jdisc.http.HttpResponse newError(com.yahoo.jdisc.Request, int, java.lang.Throwable)",
+      "public static com.yahoo.jdisc.http.HttpResponse newInternalServerError(com.yahoo.jdisc.Request, java.lang.Throwable)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.SecretStore": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract java.lang.String getSecret(java.lang.String)",
+      "public java.lang.String getSecret(java.lang.String, int)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$AccessLog)",
+      "public com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder remoteAddressHeaders(java.lang.String)",
+      "public com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder remoteAddressHeaders(java.util.Collection)",
+      "public com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder remotePortHeaders(java.lang.String)",
+      "public com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder remotePortHeaders(java.util.Collection)",
+      "public com.yahoo.jdisc.http.ServerConfig$AccessLog build()"
+    ],
+    "fields": [
+      "public java.util.List remoteAddressHeaders",
+      "public java.util.List remotePortHeaders"
+    ]
+  },
+  "com.yahoo.jdisc.http.ServerConfig$AccessLog": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder)",
+      "public java.util.List remoteAddressHeaders()",
+      "public java.lang.String remoteAddressHeaders(int)",
+      "public java.util.List remotePortHeaders()",
+      "public java.lang.String remotePortHeaders(int)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServerConfig$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigInstance$Builder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder developerMode(boolean)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder responseCompressionLevel(int)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder httpKeepAliveEnabled(boolean)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder maxKeepAliveRequests(int)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder removeRawPostBodyForWwwUrlEncodedPost(boolean)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder filter(com.yahoo.jdisc.http.ServerConfig$Filter$Builder)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder filter(java.util.List)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder defaultFilters(com.yahoo.jdisc.http.ServerConfig$DefaultFilters$Builder)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder defaultFilters(java.util.List)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder strictFiltering(boolean)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder maxWorkerThreads(int)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder minWorkerThreads(int)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder stopTimeout(double)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder jmx(com.yahoo.jdisc.http.ServerConfig$Jmx$Builder)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder metric(com.yahoo.jdisc.http.ServerConfig$Metric$Builder)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder accessLog(com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder)",
+      "public com.yahoo.jdisc.http.ServerConfig$Builder connectionLog(com.yahoo.jdisc.http.ServerConfig$ConnectionLog$Builder)",
+      "public final boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)",
+      "public final java.lang.String getDefMd5()",
+      "public final java.lang.String getDefName()",
+      "public final java.lang.String getDefNamespace()",
+      "public final boolean getApplyOnRestart()",
+      "public final void setApplyOnRestart(boolean)",
+      "public com.yahoo.jdisc.http.ServerConfig build()"
+    ],
+    "fields": [
+      "public java.util.List filter",
+      "public java.util.List defaultFilters",
+      "public com.yahoo.jdisc.http.ServerConfig$Jmx$Builder jmx",
+      "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder metric",
+      "public com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder accessLog",
+      "public com.yahoo.jdisc.http.ServerConfig$ConnectionLog$Builder connectionLog"
+    ]
+  },
+  "com.yahoo.jdisc.http.ServerConfig$ConnectionLog$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$ConnectionLog)",
+      "public com.yahoo.jdisc.http.ServerConfig$ConnectionLog$Builder enabled(boolean)",
+      "public com.yahoo.jdisc.http.ServerConfig$ConnectionLog build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServerConfig$ConnectionLog": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$ConnectionLog$Builder)",
+      "public boolean enabled()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServerConfig$DefaultFilters$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$DefaultFilters)",
+      "public com.yahoo.jdisc.http.ServerConfig$DefaultFilters$Builder filterId(java.lang.String)",
+      "public com.yahoo.jdisc.http.ServerConfig$DefaultFilters$Builder localPort(int)",
+      "public com.yahoo.jdisc.http.ServerConfig$DefaultFilters build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServerConfig$DefaultFilters": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$DefaultFilters$Builder)",
+      "public java.lang.String filterId()",
+      "public int localPort()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServerConfig$Filter$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Filter)",
+      "public com.yahoo.jdisc.http.ServerConfig$Filter$Builder id(java.lang.String)",
+      "public com.yahoo.jdisc.http.ServerConfig$Filter$Builder binding(java.lang.String)",
+      "public com.yahoo.jdisc.http.ServerConfig$Filter build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServerConfig$Filter": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Filter$Builder)",
+      "public java.lang.String id()",
+      "public java.lang.String binding()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServerConfig$Jmx$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Jmx)",
+      "public com.yahoo.jdisc.http.ServerConfig$Jmx$Builder enabled(boolean)",
+      "public com.yahoo.jdisc.http.ServerConfig$Jmx$Builder listenPort(int)",
+      "public com.yahoo.jdisc.http.ServerConfig$Jmx build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServerConfig$Jmx": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Jmx$Builder)",
+      "public boolean enabled()",
+      "public int listenPort()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServerConfig$Metric$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Metric)",
+      "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder monitoringHandlerPaths(java.lang.String)",
+      "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder monitoringHandlerPaths(java.util.Collection)",
+      "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder searchHandlerPaths(java.lang.String)",
+      "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder searchHandlerPaths(java.util.Collection)",
+      "public com.yahoo.jdisc.http.ServerConfig$Metric build()"
+    ],
+    "fields": [
+      "public java.util.List monitoringHandlerPaths",
+      "public java.util.List searchHandlerPaths"
+    ]
+  },
+  "com.yahoo.jdisc.http.ServerConfig$Metric": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Metric$Builder)",
+      "public java.util.List monitoringHandlerPaths()",
+      "public java.lang.String monitoringHandlerPaths(int)",
+      "public java.util.List searchHandlerPaths()",
+      "public java.lang.String searchHandlerPaths(int)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServerConfig$Producer": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigInstance$Producer"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void getConfig(com.yahoo.jdisc.http.ServerConfig$Builder)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServerConfig": {
+    "superClass": "com.yahoo.config.ConfigInstance",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public static java.lang.String getDefMd5()",
+      "public static java.lang.String getDefName()",
+      "public static java.lang.String getDefNamespace()",
+      "public static java.lang.String getDefVersion()",
+      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Builder)",
+      "public boolean developerMode()",
+      "public int responseCompressionLevel()",
+      "public boolean httpKeepAliveEnabled()",
+      "public int maxKeepAliveRequests()",
+      "public boolean removeRawPostBodyForWwwUrlEncodedPost()",
+      "public java.util.List filter()",
+      "public com.yahoo.jdisc.http.ServerConfig$Filter filter(int)",
+      "public java.util.List defaultFilters()",
+      "public com.yahoo.jdisc.http.ServerConfig$DefaultFilters defaultFilters(int)",
+      "public boolean strictFiltering()",
+      "public int maxWorkerThreads()",
+      "public int minWorkerThreads()",
+      "public double stopTimeout()",
+      "public com.yahoo.jdisc.http.ServerConfig$Jmx jmx()",
+      "public com.yahoo.jdisc.http.ServerConfig$Metric metric()",
+      "public com.yahoo.jdisc.http.ServerConfig$AccessLog accessLog()",
+      "public com.yahoo.jdisc.http.ServerConfig$ConnectionLog connectionLog()"
+    ],
+    "fields": [
+      "public static final java.lang.String CONFIG_DEF_MD5",
+      "public static final java.lang.String CONFIG_DEF_NAME",
+      "public static final java.lang.String CONFIG_DEF_NAMESPACE",
+      "public static final java.lang.String CONFIG_DEF_VERSION",
+      "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
+    ]
+  },
+  "com.yahoo.jdisc.http.ServletPathsConfig$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigInstance$Builder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ServletPathsConfig)",
+      "public com.yahoo.jdisc.http.ServletPathsConfig$Builder servlets(java.lang.String, com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder)",
+      "public com.yahoo.jdisc.http.ServletPathsConfig$Builder servlets(java.util.Map)",
+      "public final boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)",
+      "public final java.lang.String getDefMd5()",
+      "public final java.lang.String getDefName()",
+      "public final java.lang.String getDefNamespace()",
+      "public final boolean getApplyOnRestart()",
+      "public final void setApplyOnRestart(boolean)",
+      "public com.yahoo.jdisc.http.ServletPathsConfig build()"
+    ],
+    "fields": [
+      "public java.util.Map servlets"
+    ]
+  },
+  "com.yahoo.jdisc.http.ServletPathsConfig$Producer": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigInstance$Producer"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void getConfig(com.yahoo.jdisc.http.ServletPathsConfig$Builder)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.config.ConfigBuilder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(com.yahoo.jdisc.http.ServletPathsConfig$Servlets)",
+      "public com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder path(java.lang.String)",
+      "public com.yahoo.jdisc.http.ServletPathsConfig$Servlets build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServletPathsConfig$Servlets": {
+    "superClass": "com.yahoo.config.InnerNode",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder)",
+      "public java.lang.String path()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ServletPathsConfig": {
+    "superClass": "com.yahoo.config.ConfigInstance",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public static java.lang.String getDefMd5()",
+      "public static java.lang.String getDefName()",
+      "public static java.lang.String getDefNamespace()",
+      "public static java.lang.String getDefVersion()",
+      "public void <init>(com.yahoo.jdisc.http.ServletPathsConfig$Builder)",
+      "public java.util.Map servlets()",
+      "public com.yahoo.jdisc.http.ServletPathsConfig$Servlets servlets(java.lang.String)"
+    ],
+    "fields": [
+      "public static final java.lang.String CONFIG_DEF_MD5",
+      "public static final java.lang.String CONFIG_DEF_NAME",
+      "public static final java.lang.String CONFIG_DEF_NAMESPACE",
+      "public static final java.lang.String CONFIG_DEF_VERSION",
+      "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
+    ]
+  },
+  "com.yahoo.jdisc.http.filter.DiscFilterRequest$ThreadLocalSimpleDateFormat": {
+    "superClass": "java.lang.ThreadLocal",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String, java.util.Locale)",
+      "public java.util.Date parse(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.DiscFilterRequest": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.servlet.ServletOrJdiscHttpRequest)",
+      "public abstract java.lang.String getMethod()",
+      "public com.yahoo.jdisc.http.HttpRequest$Version getVersion()",
+      "public java.net.URI getUri()",
+      "public abstract void setUri(java.net.URI)",
+      "public com.yahoo.jdisc.http.HttpRequest getParentRequest()",
+      "public java.lang.String getRemoteAddr()",
+      "public void setRemoteAddr(java.lang.String)",
+      "public java.lang.String getLocalAddr()",
+      "public java.util.Enumeration getAttributeNames()",
+      "public java.lang.Object getAttribute(java.lang.String)",
+      "public void setAttribute(java.lang.String, java.lang.Object)",
+      "public boolean containsAttribute(java.lang.String)",
+      "public void removeAttribute(java.lang.String)",
+      "public abstract java.lang.String getParameter(java.lang.String)",
+      "public abstract java.util.Enumeration getParameterNames()",
+      "public java.util.List getParameterNamesAsList()",
+      "public java.util.Enumeration getParameterValues(java.lang.String)",
+      "public java.util.List getParameterValuesAsList(java.lang.String)",
+      "public java.util.Map getParameterMap()",
+      "public java.lang.String getRemoteHost()",
+      "public int getLocalPort()",
+      "public int getRemotePort()",
+      "public java.util.Map getUntreatedParams()",
+      "public com.yahoo.jdisc.HeaderFields getUntreatedHeaders()",
+      "public java.util.List getUntreatedCookies()",
+      "public abstract void addHeader(java.lang.String, java.lang.String)",
+      "public long getDateHeader(java.lang.String)",
+      "public abstract java.lang.String getHeader(java.lang.String)",
+      "public abstract java.util.Enumeration getHeaderNames()",
+      "public abstract java.util.List getHeaderNamesAsList()",
+      "public abstract java.util.Enumeration getHeaders(java.lang.String)",
+      "public abstract java.util.List getHeadersAsList(java.lang.String)",
+      "public abstract void removeHeaders(java.lang.String)",
+      "public abstract void setHeaders(java.lang.String, java.lang.String)",
+      "public abstract void setHeaders(java.lang.String, java.util.List)",
+      "public int getIntHeader(java.lang.String)",
+      "public java.util.List getCookies()",
+      "public void setCookies(java.util.List)",
+      "public long getConnectedAt(java.util.concurrent.TimeUnit)",
+      "public java.lang.String getProtocol()",
+      "public java.lang.String getQueryString()",
+      "public java.lang.String getRemoteUser()",
+      "public java.lang.String getRequestURI()",
+      "public java.lang.String getRequestedSessionId()",
+      "public java.lang.String getScheme()",
+      "public void setScheme(java.lang.String, boolean)",
+      "public java.lang.String getServerName()",
+      "public int getServerPort()",
+      "public abstract java.security.Principal getUserPrincipal()",
+      "public boolean isSecure()",
+      "public boolean isUserInRole(java.lang.String)",
+      "public void setOverrideIsUserInRole(boolean)",
+      "public void setRemoteHost(java.lang.String)",
+      "public void setRemoteUser(java.lang.String)",
+      "public abstract void setUserPrincipal(java.security.Principal)",
+      "public abstract java.util.List getClientCertificateChain()",
+      "public void setUserRoles(java.lang.String[])",
+      "public java.lang.String getContentType()",
+      "public java.lang.String getCharacterEncoding()",
+      "public void setCharacterEncoding(java.lang.String)",
+      "public void addCookie(com.yahoo.jdisc.http.filter.JDiscCookieWrapper)",
+      "public abstract void clearCookies()",
+      "public com.yahoo.jdisc.http.filter.JDiscCookieWrapper[] getWrappedCookies()",
+      "public static boolean isMultipart(com.yahoo.jdisc.http.filter.DiscFilterRequest)"
+    ],
+    "fields": [
+      "protected static final java.lang.String HTTPS_PREFIX",
+      "protected static final int DEFAULT_HTTP_PORT",
+      "protected static final int DEFAULT_HTTPS_PORT",
+      "protected final java.util.Map untreatedParams",
+      "protected static com.yahoo.jdisc.http.filter.DiscFilterRequest$ThreadLocalSimpleDateFormat[] formats"
+    ]
+  },
+  "com.yahoo.jdisc.http.filter.DiscFilterResponse": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.servlet.ServletOrJdiscHttpResponse)",
+      "public java.util.Enumeration getAttributeNames()",
+      "public java.lang.Object getAttribute(java.lang.String)",
+      "public void setAttribute(java.lang.String, java.lang.Object)",
+      "public void removeAttribute(java.lang.String)",
+      "public com.yahoo.jdisc.HeaderFields getUntreatedHeaders()",
+      "public java.util.List getUntreatedCookies()",
+      "public abstract void setHeader(java.lang.String, java.lang.String)",
+      "public abstract void removeHeaders(java.lang.String)",
+      "public abstract void setHeaders(java.lang.String, java.lang.String)",
+      "public abstract void setHeaders(java.lang.String, java.util.List)",
+      "public abstract void addHeader(java.lang.String, java.lang.String)",
+      "public abstract java.lang.String getHeader(java.lang.String)",
+      "public java.util.List getCookies()",
+      "public abstract void setCookies(java.util.List)",
+      "public int getStatus()",
+      "public abstract void setStatus(int)",
+      "public com.yahoo.jdisc.http.HttpResponse getParentResponse()",
+      "public void addCookie(com.yahoo.jdisc.http.filter.JDiscCookieWrapper)",
+      "public void sendError(int)",
+      "public void setCookie(java.lang.String, java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.FilterConfig": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract java.lang.String getFilterName()",
+      "public abstract java.lang.String getFilterClass()",
+      "public abstract java.lang.String getInitParameter(java.lang.String)",
+      "public abstract boolean getBooleanInitParameter(java.lang.String, boolean)",
+      "public abstract java.util.Collection getInitParameterNames()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.JDiscCookieWrapper": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "protected void <init>(com.yahoo.jdisc.http.Cookie)",
+      "public static com.yahoo.jdisc.http.filter.JDiscCookieWrapper wrap(com.yahoo.jdisc.http.Cookie)",
+      "public java.lang.String getDomain()",
+      "public int getMaxAge()",
+      "public java.lang.String getName()",
+      "public java.lang.String getPath()",
+      "public boolean getSecure()",
+      "public java.lang.String getValue()",
+      "public void setDomain(java.lang.String)",
+      "public void setMaxAge(int)",
+      "public void setPath(java.lang.String)",
+      "public void setSecure(boolean)",
+      "public void setValue(java.lang.String)",
+      "public com.yahoo.jdisc.http.Cookie getCookie()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.JdiscFilterRequest": {
+    "superClass": "com.yahoo.jdisc.http.filter.DiscFilterRequest",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.HttpRequest)",
+      "public com.yahoo.jdisc.http.HttpRequest getParentRequest()",
+      "public void setUri(java.net.URI)",
+      "public java.lang.String getMethod()",
+      "public java.lang.String getParameter(java.lang.String)",
+      "public java.util.Enumeration getParameterNames()",
+      "public void addHeader(java.lang.String, java.lang.String)",
+      "public java.lang.String getHeader(java.lang.String)",
+      "public java.util.Enumeration getHeaderNames()",
+      "public java.util.List getHeaderNamesAsList()",
+      "public java.util.Enumeration getHeaders(java.lang.String)",
+      "public java.util.List getHeadersAsList(java.lang.String)",
+      "public void removeHeaders(java.lang.String)",
+      "public void setHeaders(java.lang.String, java.lang.String)",
+      "public void setHeaders(java.lang.String, java.util.List)",
+      "public java.security.Principal getUserPrincipal()",
+      "public void setUserPrincipal(java.security.Principal)",
+      "public java.util.List getClientCertificateChain()",
+      "public void clearCookies()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.JdiscFilterResponse": {
+    "superClass": "com.yahoo.jdisc.http.filter.DiscFilterResponse",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.jdisc.http.HttpResponse)",
+      "public void setStatus(int)",
+      "public void setHeader(java.lang.String, java.lang.String)",
+      "public void removeHeaders(java.lang.String)",
+      "public void setHeaders(java.lang.String, java.lang.String)",
+      "public void setHeaders(java.lang.String, java.util.List)",
+      "public void addHeader(java.lang.String, java.lang.String)",
+      "public java.lang.String getHeader(java.lang.String)",
+      "public void setCookies(java.util.List)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.RequestFilter": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.jdisc.SharedResource",
+      "com.yahoo.jdisc.http.filter.RequestFilterBase"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void filter(com.yahoo.jdisc.http.HttpRequest, com.yahoo.jdisc.handler.ResponseHandler)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.RequestFilterBase": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.RequestView": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract java.lang.Object getAttribute(java.lang.String)",
+      "public abstract java.util.List getHeaders(java.lang.String)",
+      "public abstract java.util.Optional getFirstHeader(java.lang.String)",
+      "public abstract java.util.Optional getMethod()",
+      "public abstract java.net.URI getUri()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.ResponseFilter": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.jdisc.SharedResource",
+      "com.yahoo.jdisc.http.filter.ResponseFilterBase"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void filter(com.yahoo.jdisc.Response, com.yahoo.jdisc.Request)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.ResponseFilterBase": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.SecurityFilterInvoker": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.jdisc.http.server.jetty.FilterInvoker"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public javax.servlet.http.HttpServletRequest invokeRequestFilterChain(com.yahoo.jdisc.http.filter.RequestFilter, java.net.URI, javax.servlet.http.HttpServletRequest, com.yahoo.jdisc.handler.ResponseHandler)",
+      "public void invokeResponseFilterChain(com.yahoo.jdisc.http.filter.ResponseFilter, java.net.URI, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.SecurityRequestFilter": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.jdisc.http.filter.RequestFilterBase"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void filter(com.yahoo.jdisc.http.filter.DiscFilterRequest, com.yahoo.jdisc.handler.ResponseHandler)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.SecurityRequestFilterChain": {
+    "superClass": "com.yahoo.jdisc.AbstractResource",
+    "interfaces": [
+      "com.yahoo.jdisc.http.filter.RequestFilter"
+    ],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void filter(com.yahoo.jdisc.http.HttpRequest, com.yahoo.jdisc.handler.ResponseHandler)",
+      "public void filter(com.yahoo.jdisc.http.filter.DiscFilterRequest, com.yahoo.jdisc.handler.ResponseHandler)",
+      "public static varargs com.yahoo.jdisc.http.filter.RequestFilter newInstance(com.yahoo.jdisc.http.filter.SecurityRequestFilter[])",
+      "public static com.yahoo.jdisc.http.filter.RequestFilter newInstance(java.util.List)",
+      "public java.util.List getFilters()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.SecurityResponseFilter": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.jdisc.http.filter.ResponseFilterBase"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void filter(com.yahoo.jdisc.http.filter.DiscFilterResponse, com.yahoo.jdisc.http.filter.RequestView)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.filter.SecurityResponseFilterChain": {
+    "superClass": "com.yahoo.jdisc.AbstractResource",
+    "interfaces": [
+      "com.yahoo.jdisc.http.filter.ResponseFilter"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void filter(com.yahoo.jdisc.Response, com.yahoo.jdisc.Request)",
+      "public void filter(com.yahoo.jdisc.http.filter.RequestView, com.yahoo.jdisc.http.filter.DiscFilterResponse)",
+      "public static varargs com.yahoo.jdisc.http.filter.ResponseFilter newInstance(com.yahoo.jdisc.http.filter.SecurityResponseFilter[])",
+      "public static com.yahoo.jdisc.http.filter.ResponseFilter newInstance(java.util.List)",
+      "public java.util.List getFilters()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.jdisc.http.ssl.SslContextFactoryProvider": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.AutoCloseable"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract org.eclipse.jetty.util.ssl.SslContextFactory getInstance(java.lang.String, int)",
+      "public void close()"
+    ],
+    "fields": []
+  },
   "com.yahoo.processing.IllegalInputException": {
     "superClass": "java.lang.IllegalArgumentException",
     "interfaces": [],
diff --git a/container-core/pom.xml b/container-core/pom.xml
index ea6e7d32310..d0722a081d1 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -29,33 +29,27 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>http-utils</artifactId>
+      <artifactId>container-documentapi</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>linguistics</artifactId>
+      <artifactId>document</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
-          <!-- Pulled in by language-detector in scope compile -->
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>log4j</groupId>
           <artifactId>log4j</artifactId>
         </exclusion>
         <exclusion>
-          <!-- Pulled in by language-detector in scope compile -->
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
+          <groupId>com.yahoo.vespa</groupId>
+          <artifactId>config</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>messagebus</artifactId>
+      <artifactId>fileacquirer</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
@@ -70,53 +64,53 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>document</artifactId>
+      <artifactId>http-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>linguistics</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
+          <!-- Pulled in by language-detector in scope compile -->
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>log4j</groupId>
           <artifactId>log4j</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>com.yahoo.vespa</groupId>
-          <artifactId>config</artifactId>
+          <!-- Pulled in by language-detector in scope compile -->
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-documentapi</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vdslib</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-core-config</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vespajlib</artifactId>
+      <artifactId>messagebus</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
           <groupId>log4j</groupId>
           <artifactId>log4j</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.yahoo.vespa</groupId>
+          <artifactId>config</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>fileacquirer</artifactId>
+      <artifactId>security-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>statistics</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
@@ -131,23 +125,28 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>statistics</artifactId>
+      <artifactId>vdslib</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>vespajlib</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
           <groupId>log4j</groupId>
           <artifactId>log4j</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>com.yahoo.vespa</groupId>
-          <artifactId>config</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>vespalog</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -192,6 +191,12 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <classifier>no_aop</classifier>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>component</artifactId>
       <version>${project.version}</version>
@@ -199,54 +204,66 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>defaults</artifactId>
+      <artifactId>config</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_core</artifactId>
+      <artifactId>config-bundle</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_http_service</artifactId>
+      <artifactId>config-lib</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>defaults</artifactId>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>jdisc_core</artifactId>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>jdisc_jetty</artifactId>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>config-bundle</artifactId>
+      <artifactId>yolean</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>config</artifactId>
-      <version>${project.version}</version>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
       <scope>provided</scope>
     </dependency>
 
     <!-- TEST scope -->
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
+      <groupId>com.github.tomakehurst</groupId>
+      <artifactId>wiremock-standalone</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -256,8 +273,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-standalone</artifactId>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpmime</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -265,6 +287,42 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.cthul</groupId>
+      <artifactId>cthul-matchers</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <version>${jetty.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -326,6 +384,22 @@
         <groupId>com.yahoo.vespa</groupId>
         <artifactId>abi-check-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.bouncycastle</includeGroupIds>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <outputDirectory>${buildOutputDirectory}</outputDirectory>
   </build>
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLog.java b/container-core/src/main/java/com/yahoo/container/logging/AccessLog.java
index 2d46c53bca7..2d46c53bca7 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLog.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/AccessLog.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogEntry.java b/container-core/src/main/java/com/yahoo/container/logging/AccessLogEntry.java
index 42285fb85bb..42285fb85bb 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogEntry.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/AccessLogEntry.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogHandler.java b/container-core/src/main/java/com/yahoo/container/logging/AccessLogHandler.java
index 89aab1513ee..89aab1513ee 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/AccessLogHandler.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java b/container-core/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java
index dc749c71613..dc749c71613 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLog.java b/container-core/src/main/java/com/yahoo/container/logging/ConnectionLog.java
index 310231a4a1e..310231a4a1e 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLog.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/ConnectionLog.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogEntry.java b/container-core/src/main/java/com/yahoo/container/logging/ConnectionLogEntry.java
index 6afe3b74329..6afe3b74329 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogEntry.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/ConnectionLogEntry.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java b/container-core/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java
index 7a0e8aca95e..7a0e8aca95e 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/Coverage.java b/container-core/src/main/java/com/yahoo/container/logging/Coverage.java
index 9d122b90641..9d122b90641 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/Coverage.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/Coverage.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/FileConnectionLog.java b/container-core/src/main/java/com/yahoo/container/logging/FileConnectionLog.java
index 7432c313286..7432c313286 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/FileConnectionLog.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/FileConnectionLog.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/FormatUtil.java b/container-core/src/main/java/com/yahoo/container/logging/FormatUtil.java
index ee780ad2a83..ee780ad2a83 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/FormatUtil.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/FormatUtil.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/HitCounts.java b/container-core/src/main/java/com/yahoo/container/logging/HitCounts.java
index fed12281962..fed12281962 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/HitCounts.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/HitCounts.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONAccessLog.java b/container-core/src/main/java/com/yahoo/container/logging/JSONAccessLog.java
index ece9d0d2c4a..ece9d0d2c4a 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONAccessLog.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/JSONAccessLog.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONFormatter.java b/container-core/src/main/java/com/yahoo/container/logging/JSONFormatter.java
index 680ee5acbd9..680ee5acbd9 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONFormatter.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/JSONFormatter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JsonConnectionLogWriter.java b/container-core/src/main/java/com/yahoo/container/logging/JsonConnectionLogWriter.java
index 158d2ec4ea6..158d2ec4ea6 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JsonConnectionLogWriter.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/JsonConnectionLogWriter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java b/container-core/src/main/java/com/yahoo/container/logging/LogFileHandler.java
index 0f2a9e42eb8..0f2a9e42eb8 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/LogFileHandler.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFormatter.java b/container-core/src/main/java/com/yahoo/container/logging/LogFormatter.java
index cc1dcb579aa..cc1dcb579aa 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFormatter.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/LogFormatter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogWriter.java b/container-core/src/main/java/com/yahoo/container/logging/LogWriter.java
index 15a983cfb43..15a983cfb43 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogWriter.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/LogWriter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/RequestLog.java b/container-core/src/main/java/com/yahoo/container/logging/RequestLog.java
index 2090ba1b9f1..2090ba1b9f1 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/RequestLog.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/RequestLog.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/RequestLogEntry.java b/container-core/src/main/java/com/yahoo/container/logging/RequestLogEntry.java
index 819907fc9f1..819907fc9f1 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/RequestLogEntry.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/RequestLogEntry.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/RequestLogHandler.java b/container-core/src/main/java/com/yahoo/container/logging/RequestLogHandler.java
index 85df08e4abb..85df08e4abb 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/RequestLogHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/RequestLogHandler.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/TraceRenderer.java b/container-core/src/main/java/com/yahoo/container/logging/TraceRenderer.java
index 41b88e08c19..41b88e08c19 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/TraceRenderer.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/TraceRenderer.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java b/container-core/src/main/java/com/yahoo/container/logging/VespaAccessLog.java
index 254b7fe5385..254b7fe5385 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/VespaAccessLog.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/package-info.java b/container-core/src/main/java/com/yahoo/container/logging/package-info.java
index fc2abb7b609..fc2abb7b609 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/package-info.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/package-info.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/CertificateStore.java b/container-core/src/main/java/com/yahoo/jdisc/http/CertificateStore.java
index 3a63726b951..3a63726b951 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/CertificateStore.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/CertificateStore.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java b/container-core/src/main/java/com/yahoo/jdisc/http/Cookie.java
index d882cf7a34a..d882cf7a34a 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/Cookie.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java b/container-core/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java
index 039966133e8..039966133e8 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
index 118c34245c0..118c34245c0 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpResponse.java b/container-core/src/main/java/com/yahoo/jdisc/http/HttpResponse.java
index f7138ba0e2b..f7138ba0e2b 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpResponse.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/HttpResponse.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/SecretStore.java b/container-core/src/main/java/com/yahoo/jdisc/http/SecretStore.java
index 4f739c5bd78..4f739c5bd78 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/SecretStore.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/SecretStore.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/cloud/package-info.java b/container-core/src/main/java/com/yahoo/jdisc/http/cloud/package-info.java
index 43da1a82077..43da1a82077 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/cloud/package-info.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/cloud/package-info.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterRequest.java
index f7ab399574c..f7ab399574c 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterRequest.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterResponse.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterResponse.java
index 4e8b779c516..4e8b779c516 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterResponse.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterResponse.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/FilterConfig.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/FilterConfig.java
index af9e2b5e99a..af9e2b5e99a 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/FilterConfig.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/FilterConfig.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/JDiscCookieWrapper.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/JDiscCookieWrapper.java
index 2b9c650d545..2b9c650d545 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/JDiscCookieWrapper.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/JDiscCookieWrapper.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java
index f8d9e6b2642..f8d9e6b2642 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterResponse.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterResponse.java
index ff81359f93c..ff81359f93c 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterResponse.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterResponse.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestFilter.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/RequestFilter.java
index 977e3ab5d1d..977e3ab5d1d 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestFilter.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/RequestFilter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestFilterBase.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/RequestFilterBase.java
index 4eb7091f378..4eb7091f378 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestFilterBase.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/RequestFilterBase.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestView.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/RequestView.java
index e5e7ae1ef56..e5e7ae1ef56 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestView.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/RequestView.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/ResponseFilter.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/ResponseFilter.java
index 44fe7d9fcf1..44fe7d9fcf1 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/ResponseFilter.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/ResponseFilter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/ResponseFilterBase.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/ResponseFilterBase.java
index b869c882351..b869c882351 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/ResponseFilterBase.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/ResponseFilterBase.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityFilterInvoker.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityFilterInvoker.java
index cbed273b7ee..cbed273b7ee 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityFilterInvoker.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityFilterInvoker.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilter.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilter.java
index e6f4add49de..e6f4add49de 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilter.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java
index 2d97bbdc494..2d97bbdc494 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilter.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilter.java
index aa4f7d29b89..aa4f7d29b89 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilter.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java
index d45b406a375..d45b406a375 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/ServletFilterRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/ServletFilterRequest.java
index f06f9e256ff..f06f9e256ff 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/ServletFilterRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/ServletFilterRequest.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/ServletFilterResponse.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/ServletFilterResponse.java
index b603e7776f1..b603e7776f1 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/ServletFilterResponse.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/ServletFilterResponse.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/chain/EmptyRequestFilter.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/EmptyRequestFilter.java
index e1834fd8b7d..e1834fd8b7d 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/chain/EmptyRequestFilter.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/EmptyRequestFilter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/chain/EmptyResponseFilter.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/EmptyResponseFilter.java
index 5ce3f6a496f..5ce3f6a496f 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/chain/EmptyResponseFilter.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/EmptyResponseFilter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/chain/RequestFilterChain.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/RequestFilterChain.java
index 85f71777cf3..85f71777cf3 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/chain/RequestFilterChain.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/RequestFilterChain.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/chain/ResponseFilterChain.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/ResponseFilterChain.java
index 5c5eda1f139..5c5eda1f139 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/chain/ResponseFilterChain.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/ResponseFilterChain.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/chain/ResponseHandlerGuard.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/ResponseHandlerGuard.java
index 02600683e27..02600683e27 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/chain/ResponseHandlerGuard.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/ResponseHandlerGuard.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/chain/package-info.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/package-info.java
index 540a1be7b73..540a1be7b73 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/chain/package-info.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/chain/package-info.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/package-info.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/package-info.java
index e97d447adbb..e97d447adbb 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/package-info.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/package-info.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/package-info.java b/container-core/src/main/java/com/yahoo/jdisc/http/package-info.java
index b8bd76483cf..b8bd76483cf 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/package-info.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/package-info.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java
index 4de5e5e5387..4de5e5e5387 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java
index 842ab75a312..842ab75a312 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AsyncCompleteListener.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AsyncCompleteListener.java
index 7dba217e01c..7dba217e01c 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AsyncCompleteListener.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AsyncCompleteListener.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/CompletionHandlerUtils.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/CompletionHandlerUtils.java
index f436d5490d7..f436d5490d7 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/CompletionHandlerUtils.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/CompletionHandlerUtils.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/CompletionHandlers.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/CompletionHandlers.java
index 975d88f5c34..975d88f5c34 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/CompletionHandlers.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/CompletionHandlers.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java
index b9001d187a9..b9001d187a9 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
index d7ad12a5c64..d7ad12a5c64 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreator.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreator.java
index cd21dccde0e..cd21dccde0e 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreator.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreator.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ExceptionWrapper.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ExceptionWrapper.java
index ebc10482600..ebc10482600 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ExceptionWrapper.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ExceptionWrapper.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterBindings.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterBindings.java
index 310f3c9a646..310f3c9a646 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterBindings.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterBindings.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterInvoker.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterInvoker.java
index 0827ccdc39e..0827ccdc39e 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterInvoker.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterInvoker.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterInvokingPrintWriter.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterInvokingPrintWriter.java
index 3ebc7bbc551..3ebc7bbc551 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterInvokingPrintWriter.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterInvokingPrintWriter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterInvokingServletOutputStream.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterInvokingServletOutputStream.java
index a605ccebfa7..a605ccebfa7 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterInvokingServletOutputStream.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterInvokingServletOutputStream.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterResolver.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterResolver.java
index 1e2686aa184..1e2686aa184 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterResolver.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterResolver.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilteringRequestHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FilteringRequestHandler.java
index de768f979a1..de768f979a1 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilteringRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FilteringRequestHandler.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java
index 38f84438526..38f84438526 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java
index 0f7ce77e4cd..0f7ce77e4cd 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
index 05715b13d10..05715b13d10 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java
index e8d37cfadb5..e8d37cfadb5 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java
index 82c445c7ca9..82c445c7ca9 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpServletRequestUtils.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpServletRequestUtils.java
index e7b9f459d2e..e7b9f459d2e 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpServletRequestUtils.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpServletRequestUtils.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscContext.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscContext.java
index b37a7352dc6..b37a7352dc6 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscContext.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscContext.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java
index a89c115a1c2..a89c115a1c2 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java
index 41a1ffc2709..41a1ffc2709 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscServerConnector.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscServerConnector.java
index 99d0c5c8d8c..99d0c5c8d8c 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscServerConnector.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscServerConnector.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java
index cd1ca490f61..cd1ca490f61 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
index 510c561c10f..510c561c10f 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java
index 5e953179b53..5e953179b53 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/OneTimeRunnable.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/OneTimeRunnable.java
index eb83d3d7d03..eb83d3d7d03 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/OneTimeRunnable.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/OneTimeRunnable.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ReferenceCountingRequestHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ReferenceCountingRequestHandler.java
index f2bf5b56d5c..f2bf5b56d5c 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ReferenceCountingRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ReferenceCountingRequestHandler.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestException.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestException.java
index eea69cd7f74..eea69cd7f74 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestException.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestException.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestMetricReporter.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestMetricReporter.java
index 7596be0415a..7596be0415a 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestMetricReporter.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestMetricReporter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SecuredRedirectHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/SecuredRedirectHandler.java
index e32c9d46deb..e32c9d46deb 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SecuredRedirectHandler.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/SecuredRedirectHandler.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServerMetricReporter.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServerMetricReporter.java
index ba3694ffc2f..ba3694ffc2f 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServerMetricReporter.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServerMetricReporter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
index b4d03385c3b..b4d03385c3b 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
index 1882448757a..1882448757a 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
index 60b7878156f..60b7878156f 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListener.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListener.java
index 822e1c2ffb8..822e1c2ffb8 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListener.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListener.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailure.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailure.java
index 64f70564137..64f70564137 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailure.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailure.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/TlsClientAuthenticationEnforcer.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/TlsClientAuthenticationEnforcer.java
index 10a6c4702b5..10a6c4702b5 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/TlsClientAuthenticationEnforcer.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/TlsClientAuthenticationEnforcer.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/UnsupportedFilterInvoker.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/UnsupportedFilterInvoker.java
index ce52bccf52d..ce52bccf52d 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/UnsupportedFilterInvoker.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/UnsupportedFilterInvoker.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/VoidConnectionLog.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/VoidConnectionLog.java
index 5d33cc0835e..5d33cc0835e 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/VoidConnectionLog.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/VoidConnectionLog.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/VoidRequestLog.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/VoidRequestLog.java
index 9db5ba99115..9db5ba99115 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/VoidRequestLog.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/VoidRequestLog.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/package-info.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/package-info.java
index 189751aa9c0..189751aa9c0 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/package-info.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/package-info.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/servlet/ServletOrJdiscHttpRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/servlet/ServletOrJdiscHttpRequest.java
index eaac2b1c415..eaac2b1c415 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/servlet/ServletOrJdiscHttpRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/servlet/ServletOrJdiscHttpRequest.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/servlet/ServletOrJdiscHttpResponse.java b/container-core/src/main/java/com/yahoo/jdisc/http/servlet/ServletOrJdiscHttpResponse.java
index a24ada05b3d..a24ada05b3d 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/servlet/ServletOrJdiscHttpResponse.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/servlet/ServletOrJdiscHttpResponse.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/servlet/ServletRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/servlet/ServletRequest.java
index c945dc6d8b6..c945dc6d8b6 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/servlet/ServletRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/servlet/ServletRequest.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/servlet/ServletResponse.java b/container-core/src/main/java/com/yahoo/jdisc/http/servlet/ServletResponse.java
index 48c8f577de9..48c8f577de9 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/servlet/ServletResponse.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/servlet/ServletResponse.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/servlet/package-info.java b/container-core/src/main/java/com/yahoo/jdisc/http/servlet/package-info.java
index 0120f164cae..0120f164cae 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/servlet/package-info.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/servlet/package-info.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/SslContextFactoryProvider.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/SslContextFactoryProvider.java
index c364116e0af..c364116e0af 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/SslContextFactoryProvider.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/SslContextFactoryProvider.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java
index 90848f1dfd4..90848f1dfd4 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/DefaultSslContextFactoryProvider.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/DefaultSslContextFactoryProvider.java
index 7395d2307af..7395d2307af 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/DefaultSslContextFactoryProvider.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/DefaultSslContextFactoryProvider.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java
index 006a282e1e0..006a282e1e0 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/SslContextFactoryUtils.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/SslContextFactoryUtils.java
index a0172668cbb..a0172668cbb 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/SslContextFactoryUtils.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/SslContextFactoryUtils.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProvider.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProvider.java
index 93d4f1dca3f..93d4f1dca3f 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProvider.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProvider.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/package-info.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/package-info.java
index f337e9d010b..f337e9d010b 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/package-info.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/package-info.java
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/package-info.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/package-info.java
index 085e9dedf20..085e9dedf20 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/package-info.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/package-info.java
diff --git a/container-core-config/src/main/resources/configdefinitions/container.core.access-log.def b/container-core/src/main/resources/configdefinitions/container.core.access-log.def
index 69058b3d8da..69058b3d8da 100644
--- a/container-core-config/src/main/resources/configdefinitions/container.core.access-log.def
+++ b/container-core/src/main/resources/configdefinitions/container.core.access-log.def
diff --git a/jdisc_http_service/src/main/resources/configdefinitions/container.logging.connection-log.def b/container-core/src/main/resources/configdefinitions/container.logging.connection-log.def
index 39841dba6f2..65b632c9008 100644
--- a/jdisc_http_service/src/main/resources/configdefinitions/container.logging.connection-log.def
+++ b/container-core/src/main/resources/configdefinitions/container.logging.connection-log.def
@@ -8,4 +8,4 @@ cluster             string
 logDirectoryName string default="qrs"
 
 # Max queue length of file handler
-queueSize int default=10000
+queueSize int default=10000
\ No newline at end of file
diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def b/container-core/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def
index 8f99fccec94..8f99fccec94 100644
--- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def
+++ b/container-core/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def
diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def
index 055e5ad62d2..055e5ad62d2 100644
--- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def
+++ b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def
diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def
index 049080dedbd..049080dedbd 100644
--- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def
+++ b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def
diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def
index 86707b027be..86707b027be 100644
--- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def
+++ b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def
diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/CircularArrayAccessLogKeeperTest.java b/container-core/src/test/java/com/yahoo/container/logging/CircularArrayAccessLogKeeperTest.java
index 5d9509eb045..5d9509eb045 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/CircularArrayAccessLogKeeperTest.java
+++ b/container-core/src/test/java/com/yahoo/container/logging/CircularArrayAccessLogKeeperTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java b/container-core/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java
index cb3d1d0a12f..cb3d1d0a12f 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java
+++ b/container-core/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/JsonConnectionLogWriterTest.java b/container-core/src/test/java/com/yahoo/container/logging/JsonConnectionLogWriterTest.java
index 33ecb664af5..75bc0c915d3 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/JsonConnectionLogWriterTest.java
+++ b/container-core/src/test/java/com/yahoo/container/logging/JsonConnectionLogWriterTest.java
@@ -1,5 +1,6 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.logging;
+
 import com.yahoo.test.json.JsonTestHelper;
 import org.junit.jupiter.api.Test;
 
@@ -41,4 +42,4 @@ class JsonConnectionLogWriterTest {
         String actualJson = out.toString(StandardCharsets.UTF_8);
         JsonTestHelper.assertJsonEquals(actualJson, expectedJson);
     }
-}
+}
\ No newline at end of file
diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java b/container-core/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java
index dad8f5e3f90..dad8f5e3f90 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java
+++ b/container-core/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java b/container-core/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java
index ecacf95d100..ecacf95d100 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java
+++ b/container-core/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java
index dbdce5c704e..dbdce5c704e 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/CookieTestCase.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpHeadersTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/HttpHeadersTestCase.java
index d8ce4a6da0c..d8ce4a6da0c 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpHeadersTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/HttpHeadersTestCase.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
index a3cb31d5ecb..a3cb31d5ecb 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpResponseTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/HttpResponseTestCase.java
index 61499200f3c..61499200f3c 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpResponseTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/HttpResponseTestCase.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
index 1c05a3f3db2..1c05a3f3db2 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterResponseTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterResponseTest.java
index b349cb8d803..b349cb8d803 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterResponseTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterResponseTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/EmptyRequestFilterTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/EmptyRequestFilterTestCase.java
index f4418e74169..f4418e74169 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/EmptyRequestFilterTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/EmptyRequestFilterTestCase.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/EmptyResponseFilterTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/EmptyResponseFilterTestCase.java
index e6d7259ea41..e6d7259ea41 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/EmptyResponseFilterTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/EmptyResponseFilterTestCase.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/JDiscCookieWrapperTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/JDiscCookieWrapperTest.java
index 9948e5bfe7f..9948e5bfe7f 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/JDiscCookieWrapperTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/JDiscCookieWrapperTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/RequestViewImplTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/RequestViewImplTest.java
index ec0e0a33d35..ec0e0a33d35 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/RequestViewImplTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/RequestViewImplTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/ResponseHeaderFilter.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/ResponseHeaderFilter.java
index 3855c3a494b..3855c3a494b 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/ResponseHeaderFilter.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/ResponseHeaderFilter.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChainTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChainTest.java
index be19313dee2..be19313dee2 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChainTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChainTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChainTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChainTest.java
index 25291de5cc1..25291de5cc1 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChainTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChainTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterRequestTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterRequestTest.java
index 3052902f174..3052902f174 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterRequestTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterRequestTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterResponseTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterResponseTest.java
index a2bc2badea3..a2bc2badea3 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterResponseTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterResponseTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java b/container-core/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java
index cc2a00c08c6..cc2a00c08c6 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ServletModule.java b/container-core/src/test/java/com/yahoo/jdisc/http/guiceModules/ServletModule.java
index dd6511d1f88..dd6511d1f88 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ServletModule.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/guiceModules/ServletModule.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java
index 6370912af48..6370912af48 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/BlockingQueueRequestLog.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/BlockingQueueRequestLog.java
index c1a2bea8ac4..c1a2bea8ac4 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/BlockingQueueRequestLog.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/BlockingQueueRequestLog.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottlerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottlerTest.java
index 65eb7e1c145..65eb7e1c145 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottlerTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottlerTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
index df794c7ecb8..df794c7ecb8 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java
index d66f22801f7..d66f22801f7 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ExceptionWrapperTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ExceptionWrapperTest.java
index de8df283afe..de8df283afe 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ExceptionWrapperTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ExceptionWrapperTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java
index a67656dd5ca..a67656dd5ca 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java
index 9c1348004ee..9c1348004ee 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollectorTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollectorTest.java
index bb92d75bed5..bb92d75bed5 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollectorTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollectorTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
index 5659dfc2d3c..5659dfc2d3c 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
index c00525a3ddc..c00525a3ddc 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/InMemoryConnectionLog.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/InMemoryConnectionLog.java
index 6d1baf0423f..6d1baf0423f 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/InMemoryConnectionLog.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/InMemoryConnectionLog.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/InMemoryRequestLog.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/InMemoryRequestLog.java
index b87ec5e8b8b..b87ec5e8b8b 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/InMemoryRequestLog.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/InMemoryRequestLog.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServletTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServletTest.java
index 230f59cbb34..230f59cbb34 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServletTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServletTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/MetricConsumerMock.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/MetricConsumerMock.java
index f839d83a800..f839d83a800 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/MetricConsumerMock.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/MetricConsumerMock.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java
index f1d710bd10f..f1d710bd10f 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListenerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListenerTest.java
index 20f050d715d..20f050d715d 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListenerTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListenerTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java
index 875889ed5ce..49928a5679e 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java
@@ -13,8 +13,7 @@ import java.nio.file.Paths;
 import static com.yahoo.yolean.Exceptions.uncheck;
 
 /**
- * This class is based on the class by the same name in the jdisc_http_service module.
- * It provides functionality for setting up a jdisc container with an HTTP server and handlers.
+ * Provides functionality for setting up a jdisc container with an HTTP server and handlers.
  *
  * @author Simon Thoresen Hult
  * @author bakksjo
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java
index 7d7530c32e0..7d7530c32e0 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/JDiscFilterForServletTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/JDiscFilterForServletTest.java
index 16969a47b84..16969a47b84 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/JDiscFilterForServletTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/JDiscFilterForServletTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java
index a533a447f6a..a533a447f6a 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletTestBase.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletTestBase.java
index 54bfe8c026d..54bfe8c026d 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletTestBase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletTestBase.java
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProviderTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProviderTest.java
index eb292199ea2..eb292199ea2 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProviderTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProviderTest.java
diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index 48f409dfc2c..2dcb03bba58 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -36,17 +36,6 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_http_service</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
       <artifactId>simplemetrics</artifactId>
       <version>${project.version}</version>
       <exclusions>
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index a5f678ad828..b8fbf5fae2a 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -178,6 +178,7 @@
             <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle>
             <discPreInstallBundle>
                 <!-- Vespa bundles -->
+                component-jar-with-dependencies.jar,
                 configgen.jar,
                 config-bundle-jar-with-dependencies.jar,
                 configdefinitions-jar-with-dependencies.jar,
@@ -187,7 +188,6 @@
                 docprocs-jar-with-dependencies.jar,
                 hosted-zone-api-jar-with-dependencies.jar,
                 jdisc-security-filters-jar-with-dependencies.jar,
-                jdisc_http_service-jar-with-dependencies.jar,
                 model-evaluation-jar-with-dependencies.jar,
                 model-integration-jar-with-dependencies.jar,
                 vespaclient-container-plugin-jar-with-dependencies.jar,
@@ -198,9 +198,21 @@
                 component-jar-with-dependencies.jar,
                 zkfacade-jar-with-dependencies.jar,
                 zookeeper-server-jar-with-dependencies.jar,
+                <!-- Jetty -->
+                jetty-continuation-${jetty.version}.jar,
+                jetty-http-${jetty.version}.jar,
+                jetty-io-${jetty.version}.jar,
+                jetty-jmx-${jetty.version}.jar,
+                jetty-security-${jetty.version}.jar,
+                jetty-server-${jetty.version}.jar,
+                jetty-servlet-${jetty.version}.jar,
+                jetty-servlets-${jetty.version}.jar,
+                jetty-util-${jetty.version}.jar,
+                jetty-util-ajax-${jetty.version}.jar,
                 <!-- Misc 3rd party bundles -->
                 bcpkix-jdk15on-${bouncycastle.version}.jar,
                 bcprov-jdk15on-${bouncycastle.version}.jar,
+                javax.servlet-api-3.1.0.jar,
                 <!-- Jersey 2 + Jackson 2 -->
                 aopalliance-repackaged-${hk2.version}.jar,
                 hk2-api-${hk2.version}.jar,
diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml
index 6e256fc0ef6..27334a8ddf3 100644
--- a/container-search-and-docproc/pom.xml
+++ b/container-search-and-docproc/pom.xml
@@ -128,12 +128,6 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_http_service</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
       <artifactId>simplemetrics</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
diff --git a/container-search-gui/pom.xml b/container-search-gui/pom.xml
index 64c53a1f453..b1a02a2411a 100644
--- a/container-search-gui/pom.xml
+++ b/container-search-gui/pom.xml
@@ -28,12 +28,6 @@
         </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
-            <artifactId>jdisc_http_service</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
             <artifactId>jdisc_core</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
diff --git a/controller-server/pom.xml b/controller-server/pom.xml
index 906cc5c0ee1..0c05f7d70bb 100644
--- a/controller-server/pom.xml
+++ b/controller-server/pom.xml
@@ -42,13 +42,6 @@
 
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
-            <artifactId>jdisc_http_service</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>
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 6e154a64a80..c357784fde7 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -648,7 +648,6 @@ fi
 %{_prefix}/lib/jars/javax.*.jar
 %{_prefix}/lib/jars/jdisc-cloud-aws-jar-with-dependencies.jar
 %{_prefix}/lib/jars/jdisc_core-jar-with-dependencies.jar
-%{_prefix}/lib/jars/jdisc_http_service-jar-with-dependencies.jar
 %{_prefix}/lib/jars/jdisc-security-filters-jar-with-dependencies.jar
 %{_prefix}/lib/jars/jersey-*.jar
 %{_prefix}/lib/jars/jetty-*.jar
diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml
index 694f4b4d14f..d3228cf3933 100644
--- a/fat-model-dependencies/pom.xml
+++ b/fat-model-dependencies/pom.xml
@@ -207,11 +207,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_http_service</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
       <version>${protobuf.version}</version>
diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml
index 1406a70ece0..9f4572736c8 100644
--- a/jdisc-cloud-aws/pom.xml
+++ b/jdisc-cloud-aws/pom.xml
@@ -43,12 +43,6 @@
         </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
-            <artifactId>jdisc_http_service</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
             <artifactId>component</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
diff --git a/jdisc_http_service/.gitignore b/jdisc_http_service/.gitignore
deleted file mode 100644
index 3cc25b51fc4..00000000000
--- a/jdisc_http_service/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/pom.xml.build
-/target
diff --git a/jdisc_http_service/CMakeLists.txt b/jdisc_http_service/CMakeLists.txt
deleted file mode 100644
index e9e9447bd03..00000000000
--- a/jdisc_http_service/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(jdisc_http_service)
-install_java_artifact_dependencies(jdisc_http_service)
-
-install_config_definitions()
diff --git a/jdisc_http_service/OWNERS b/jdisc_http_service/OWNERS
deleted file mode 100644
index 78b92e411b4..00000000000
--- a/jdisc_http_service/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-gjoranv
-bjorncs
diff --git a/jdisc_http_service/README.md b/jdisc_http_service/README.md
deleted file mode 100644
index bb7882b9a2a..00000000000
--- a/jdisc_http_service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-# JDisc HTTP Service
-
-This package provides a ClientProvider and a ServerProvider implementation using HTTP on JDisc. Built on Jetty.
diff --git a/jdisc_http_service/abi-spec.json b/jdisc_http_service/abi-spec.json
deleted file mode 100644
index 34e021eec62..00000000000
--- a/jdisc_http_service/abi-spec.json
+++ /dev/null
@@ -1,1482 +0,0 @@
-{
-  "com.yahoo.jdisc.http.CertificateStore": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public java.lang.String getCertificate(java.lang.String)",
-      "public java.lang.String getCertificate(java.lang.String, long)",
-      "public abstract java.lang.String getCertificate(java.lang.String, long, long)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigInstance$Builder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder listenPort(int)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder name(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder headerCacheSize(int)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder outputBufferSize(int)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder requestHeaderSize(int)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder responseHeaderSize(int)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder acceptQueueSize(int)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder reuseAddress(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder idleTimeout(double)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder stopTimeout(double)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder tcpKeepAliveEnabled(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder tcpNoDelay(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder throttling(com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder implicitTlsEnabled(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder ssl(com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder tlsClientAuthEnforcer(com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder healthCheckProxy(com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder proxyProtocol(com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol$Builder)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder secureRedirect(com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect$Builder)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder maxRequestsPerConnection(int)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder maxConnectionLife(double)",
-      "public final boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)",
-      "public final java.lang.String getDefMd5()",
-      "public final java.lang.String getDefName()",
-      "public final java.lang.String getDefNamespace()",
-      "public final boolean getApplyOnRestart()",
-      "public final void setApplyOnRestart(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig build()"
-    ],
-    "fields": [
-      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder throttling",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder ssl",
-      "public com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder tlsClientAuthEnforcer",
-      "public com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder healthCheckProxy",
-      "public com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol$Builder proxyProtocol",
-      "public com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect$Builder secureRedirect"
-    ]
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder enable(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder port(int)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder clientTimeout(double)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy$Builder)",
-      "public boolean enable()",
-      "public int port()",
-      "public double clientTimeout()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Producer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigInstance$Producer"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void getConfig(com.yahoo.jdisc.http.ConnectorConfig$Builder)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol$Builder enabled(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol$Builder mixedMode(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol$Builder)",
-      "public boolean enabled()",
-      "public boolean mixedMode()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect$Builder enabled(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect$Builder port(int)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect$Builder)",
-      "public boolean enabled()",
-      "public int port()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder enabled(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder privateKeyFile(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder privateKey(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder certificateFile(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder certificate(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder caCertificateFile(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder caCertificate(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder clientAuth(com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder enabledCipherSuites(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder enabledCipherSuites(java.util.Collection)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder enabledProtocols(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder enabledProtocols(java.util.Collection)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl build()"
-    ],
-    "fields": [
-      "public java.util.List enabledCipherSuites",
-      "public java.util.List enabledProtocols"
-    ]
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum[] values()",
-      "public static com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum valueOf(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum DISABLED",
-      "public static final enum com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum WANT_AUTH",
-      "public static final enum com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum NEED_AUTH"
-    ]
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth": {
-    "superClass": "com.yahoo.config.EnumNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum)"
-    ],
-    "fields": [
-      "public static final com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum DISABLED",
-      "public static final com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum WANT_AUTH",
-      "public static final com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum NEED_AUTH"
-    ]
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder)",
-      "public boolean enabled()",
-      "public java.lang.String privateKeyFile()",
-      "public java.lang.String privateKey()",
-      "public java.lang.String certificateFile()",
-      "public java.lang.String certificate()",
-      "public java.lang.String caCertificateFile()",
-      "public java.lang.String caCertificate()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum clientAuth()",
-      "public java.util.List enabledCipherSuites()",
-      "public java.lang.String enabledCipherSuites(int)",
-      "public java.util.List enabledProtocols()",
-      "public java.lang.String enabledProtocols(int)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Throttling)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder enabled(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder maxConnections(int)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder maxHeapUtilization(double)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder maxAcceptRate(int)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder idleTimeout(double)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Throttling": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder)",
-      "public boolean enabled()",
-      "public int maxConnections()",
-      "public double maxHeapUtilization()",
-      "public int maxAcceptRate()",
-      "public double idleTimeout()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder enable(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder pathWhitelist(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder pathWhitelist(java.util.Collection)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer build()"
-    ],
-    "fields": [
-      "public java.util.List pathWhitelist"
-    ]
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer$Builder)",
-      "public boolean enable()",
-      "public java.util.List pathWhitelist()",
-      "public java.lang.String pathWhitelist(int)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig": {
-    "superClass": "com.yahoo.config.ConfigInstance",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public static java.lang.String getDefMd5()",
-      "public static java.lang.String getDefName()",
-      "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Builder)",
-      "public int listenPort()",
-      "public java.lang.String name()",
-      "public int headerCacheSize()",
-      "public int outputBufferSize()",
-      "public int requestHeaderSize()",
-      "public int responseHeaderSize()",
-      "public int acceptQueueSize()",
-      "public boolean reuseAddress()",
-      "public double idleTimeout()",
-      "public double stopTimeout()",
-      "public boolean tcpKeepAliveEnabled()",
-      "public boolean tcpNoDelay()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Throttling throttling()",
-      "public boolean implicitTlsEnabled()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl ssl()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$TlsClientAuthEnforcer tlsClientAuthEnforcer()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$HealthCheckProxy healthCheckProxy()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$ProxyProtocol proxyProtocol()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$SecureRedirect secureRedirect()",
-      "public int maxRequestsPerConnection()",
-      "public double maxConnectionLife()"
-    ],
-    "fields": [
-      "public static final java.lang.String CONFIG_DEF_MD5",
-      "public static final java.lang.String CONFIG_DEF_NAME",
-      "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
-      "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
-    ]
-  },
-  "com.yahoo.jdisc.http.Cookie$SameSite": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.jdisc.http.Cookie$SameSite[] values()",
-      "public static com.yahoo.jdisc.http.Cookie$SameSite valueOf(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.jdisc.http.Cookie$SameSite NONE",
-      "public static final enum com.yahoo.jdisc.http.Cookie$SameSite STRICT",
-      "public static final enum com.yahoo.jdisc.http.Cookie$SameSite LAX"
-    ]
-  },
-  "com.yahoo.jdisc.http.Cookie": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.Cookie)",
-      "public void <init>(java.lang.String, java.lang.String)",
-      "public java.lang.String getName()",
-      "public com.yahoo.jdisc.http.Cookie setName(java.lang.String)",
-      "public java.lang.String getValue()",
-      "public com.yahoo.jdisc.http.Cookie setValue(java.lang.String)",
-      "public java.lang.String getDomain()",
-      "public com.yahoo.jdisc.http.Cookie setDomain(java.lang.String)",
-      "public java.lang.String getPath()",
-      "public com.yahoo.jdisc.http.Cookie setPath(java.lang.String)",
-      "public com.yahoo.jdisc.http.Cookie$SameSite getSameSite()",
-      "public com.yahoo.jdisc.http.Cookie setSameSite(com.yahoo.jdisc.http.Cookie$SameSite)",
-      "public int getMaxAge(java.util.concurrent.TimeUnit)",
-      "public com.yahoo.jdisc.http.Cookie setMaxAge(int, java.util.concurrent.TimeUnit)",
-      "public boolean isSecure()",
-      "public com.yahoo.jdisc.http.Cookie setSecure(boolean)",
-      "public boolean isHttpOnly()",
-      "public com.yahoo.jdisc.http.Cookie setHttpOnly(boolean)",
-      "public boolean equals(java.lang.Object)",
-      "public int hashCode()",
-      "public java.lang.String toString()",
-      "public static java.lang.String toCookieHeader(java.lang.Iterable)",
-      "public static java.util.List fromCookieHeader(java.lang.String)",
-      "public static java.util.List toSetCookieHeaders(java.lang.Iterable)",
-      "public static java.util.List toSetCookieHeaderAll(java.lang.Iterable)",
-      "public static com.yahoo.jdisc.http.Cookie fromSetCookieHeader(java.lang.String)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.HttpHeaders$Names": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [],
-    "fields": [
-      "public static final java.lang.String ACCEPT",
-      "public static final java.lang.String ACCEPT_CHARSET",
-      "public static final java.lang.String ACCEPT_ENCODING",
-      "public static final java.lang.String ACCEPT_LANGUAGE",
-      "public static final java.lang.String ACCEPT_RANGES",
-      "public static final java.lang.String ACCEPT_PATCH",
-      "public static final java.lang.String AGE",
-      "public static final java.lang.String ALLOW",
-      "public static final java.lang.String AUTHORIZATION",
-      "public static final java.lang.String CACHE_CONTROL",
-      "public static final java.lang.String CONNECTION",
-      "public static final java.lang.String CONTENT_BASE",
-      "public static final java.lang.String CONTENT_ENCODING",
-      "public static final java.lang.String CONTENT_LANGUAGE",
-      "public static final java.lang.String CONTENT_LENGTH",
-      "public static final java.lang.String CONTENT_LOCATION",
-      "public static final java.lang.String CONTENT_TRANSFER_ENCODING",
-      "public static final java.lang.String CONTENT_MD5",
-      "public static final java.lang.String CONTENT_RANGE",
-      "public static final java.lang.String CONTENT_TYPE",
-      "public static final java.lang.String COOKIE",
-      "public static final java.lang.String DATE",
-      "public static final java.lang.String ETAG",
-      "public static final java.lang.String EXPECT",
-      "public static final java.lang.String EXPIRES",
-      "public static final java.lang.String FROM",
-      "public static final java.lang.String HOST",
-      "public static final java.lang.String IF_MATCH",
-      "public static final java.lang.String IF_MODIFIED_SINCE",
-      "public static final java.lang.String IF_NONE_MATCH",
-      "public static final java.lang.String IF_RANGE",
-      "public static final java.lang.String IF_UNMODIFIED_SINCE",
-      "public static final java.lang.String LAST_MODIFIED",
-      "public static final java.lang.String LOCATION",
-      "public static final java.lang.String MAX_FORWARDS",
-      "public static final java.lang.String ORIGIN",
-      "public static final java.lang.String PRAGMA",
-      "public static final java.lang.String PROXY_AUTHENTICATE",
-      "public static final java.lang.String PROXY_AUTHORIZATION",
-      "public static final java.lang.String RANGE",
-      "public static final java.lang.String REFERER",
-      "public static final java.lang.String RETRY_AFTER",
-      "public static final java.lang.String SEC_WEBSOCKET_KEY1",
-      "public static final java.lang.String SEC_WEBSOCKET_KEY2",
-      "public static final java.lang.String SEC_WEBSOCKET_LOCATION",
-      "public static final java.lang.String SEC_WEBSOCKET_ORIGIN",
-      "public static final java.lang.String SEC_WEBSOCKET_PROTOCOL",
-      "public static final java.lang.String SEC_WEBSOCKET_VERSION",
-      "public static final java.lang.String SEC_WEBSOCKET_KEY",
-      "public static final java.lang.String SEC_WEBSOCKET_ACCEPT",
-      "public static final java.lang.String SERVER",
-      "public static final java.lang.String SET_COOKIE",
-      "public static final java.lang.String SET_COOKIE2",
-      "public static final java.lang.String TE",
-      "public static final java.lang.String TRAILER",
-      "public static final java.lang.String TRANSFER_ENCODING",
-      "public static final java.lang.String UPGRADE",
-      "public static final java.lang.String USER_AGENT",
-      "public static final java.lang.String VARY",
-      "public static final java.lang.String VIA",
-      "public static final java.lang.String WARNING",
-      "public static final java.lang.String WEBSOCKET_LOCATION",
-      "public static final java.lang.String WEBSOCKET_ORIGIN",
-      "public static final java.lang.String WEBSOCKET_PROTOCOL",
-      "public static final java.lang.String WWW_AUTHENTICATE",
-      "public static final java.lang.String X_DISABLE_CHUNKING",
-      "public static final java.lang.String X_YAHOO_SERVING_HOST"
-    ]
-  },
-  "com.yahoo.jdisc.http.HttpHeaders$Values": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [],
-    "fields": [
-      "public static final java.lang.String APPLICATION_X_WWW_FORM_URLENCODED",
-      "public static final java.lang.String BASE64",
-      "public static final java.lang.String BINARY",
-      "public static final java.lang.String BYTES",
-      "public static final java.lang.String CHARSET",
-      "public static final java.lang.String CHUNKED",
-      "public static final java.lang.String CLOSE",
-      "public static final java.lang.String COMPRESS",
-      "public static final java.lang.String CONTINUE",
-      "public static final java.lang.String DEFLATE",
-      "public static final java.lang.String GZIP",
-      "public static final java.lang.String IDENTITY",
-      "public static final java.lang.String KEEP_ALIVE",
-      "public static final java.lang.String MAX_AGE",
-      "public static final java.lang.String MAX_STALE",
-      "public static final java.lang.String MIN_FRESH",
-      "public static final java.lang.String MUST_REVALIDATE",
-      "public static final java.lang.String NO_CACHE",
-      "public static final java.lang.String NO_STORE",
-      "public static final java.lang.String NO_TRANSFORM",
-      "public static final java.lang.String NONE",
-      "public static final java.lang.String ONLY_IF_CACHED",
-      "public static final java.lang.String PRIVATE",
-      "public static final java.lang.String PROXY_REVALIDATE",
-      "public static final java.lang.String PUBLIC",
-      "public static final java.lang.String QUOTED_PRINTABLE",
-      "public static final java.lang.String S_MAXAGE",
-      "public static final java.lang.String TRAILERS",
-      "public static final java.lang.String UPGRADE",
-      "public static final java.lang.String WEBSOCKET"
-    ]
-  },
-  "com.yahoo.jdisc.http.HttpHeaders": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.HttpRequest$Method": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.jdisc.http.HttpRequest$Method[] values()",
-      "public static com.yahoo.jdisc.http.HttpRequest$Method valueOf(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method OPTIONS",
-      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method GET",
-      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method HEAD",
-      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method POST",
-      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method PUT",
-      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method PATCH",
-      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method DELETE",
-      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method TRACE",
-      "public static final enum com.yahoo.jdisc.http.HttpRequest$Method CONNECT"
-    ]
-  },
-  "com.yahoo.jdisc.http.HttpRequest$Version": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.jdisc.http.HttpRequest$Version[] values()",
-      "public static com.yahoo.jdisc.http.HttpRequest$Version valueOf(java.lang.String)",
-      "public java.lang.String toString()",
-      "public static com.yahoo.jdisc.http.HttpRequest$Version fromString(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.jdisc.http.HttpRequest$Version HTTP_1_0",
-      "public static final enum com.yahoo.jdisc.http.HttpRequest$Version HTTP_1_1"
-    ]
-  },
-  "com.yahoo.jdisc.http.HttpRequest": {
-    "superClass": "com.yahoo.jdisc.Request",
-    "interfaces": [
-      "com.yahoo.jdisc.http.servlet.ServletOrJdiscHttpRequest"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "protected void <init>(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version, java.net.SocketAddress, java.lang.Long)",
-      "public com.yahoo.jdisc.http.HttpRequest$Method getMethod()",
-      "public void setMethod(com.yahoo.jdisc.http.HttpRequest$Method)",
-      "public com.yahoo.jdisc.http.HttpRequest$Version getVersion()",
-      "public java.lang.String getRemoteHostAddress()",
-      "public java.lang.String getRemoteHostName()",
-      "public int getRemotePort()",
-      "public void setVersion(com.yahoo.jdisc.http.HttpRequest$Version)",
-      "public java.net.SocketAddress getRemoteAddress()",
-      "public void setRemoteAddress(java.net.SocketAddress)",
-      "public java.net.URI getProxyServer()",
-      "public void setProxyServer(java.net.URI)",
-      "public long getConnectedAt(java.util.concurrent.TimeUnit)",
-      "public java.lang.Long getConnectionTimeout(java.util.concurrent.TimeUnit)",
-      "public void setConnectionTimeout(long, java.util.concurrent.TimeUnit)",
-      "public java.util.Map parameters()",
-      "public void copyHeaders(com.yahoo.jdisc.HeaderFields)",
-      "public java.util.List decodeCookieHeader()",
-      "public void encodeCookieHeader(java.util.List)",
-      "public com.yahoo.jdisc.HeaderFields trailers()",
-      "public boolean isChunked()",
-      "public boolean hasChunkedResponse()",
-      "public boolean isKeepAlive()",
-      "public java.security.Principal getUserPrincipal()",
-      "public void setUserPrincipal(java.security.Principal)",
-      "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI)",
-      "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method)",
-      "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version)",
-      "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version, java.net.SocketAddress)",
-      "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version, java.net.SocketAddress, long)",
-      "public static com.yahoo.jdisc.http.HttpRequest newClientRequest(com.yahoo.jdisc.Request, java.net.URI)",
-      "public static com.yahoo.jdisc.http.HttpRequest newClientRequest(com.yahoo.jdisc.Request, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method)",
-      "public static com.yahoo.jdisc.http.HttpRequest newClientRequest(com.yahoo.jdisc.Request, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.HttpResponse$Status": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.jdisc.Response$Status"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [],
-    "fields": [
-      "public static final int REQUEST_ENTITY_TOO_LARGE",
-      "public static final int REQUEST_RANGE_NOT_SATISFIABLE"
-    ]
-  },
-  "com.yahoo.jdisc.http.HttpResponse": {
-    "superClass": "com.yahoo.jdisc.Response",
-    "interfaces": [
-      "com.yahoo.jdisc.http.servlet.ServletOrJdiscHttpResponse"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "protected void <init>(com.yahoo.jdisc.Request, int, java.lang.String, java.lang.Throwable)",
-      "public boolean isChunkedEncodingEnabled()",
-      "public void setChunkedEncodingEnabled(boolean)",
-      "public void setMessage(java.lang.String)",
-      "public java.lang.String getMessage()",
-      "public void copyHeaders(com.yahoo.jdisc.HeaderFields)",
-      "public java.util.List decodeSetCookieHeader()",
-      "public void encodeSetCookieHeader(java.util.List)",
-      "public com.yahoo.jdisc.HeaderFields trailers()",
-      "public static boolean isServerError(com.yahoo.jdisc.Response)",
-      "public static com.yahoo.jdisc.http.HttpResponse newInstance(int)",
-      "public static com.yahoo.jdisc.http.HttpResponse newInstance(int, java.lang.String)",
-      "public static com.yahoo.jdisc.http.HttpResponse newError(com.yahoo.jdisc.Request, int, java.lang.Throwable)",
-      "public static com.yahoo.jdisc.http.HttpResponse newInternalServerError(com.yahoo.jdisc.Request, java.lang.Throwable)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.SecretStore": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract java.lang.String getSecret(java.lang.String)",
-      "public java.lang.String getSecret(java.lang.String, int)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$AccessLog)",
-      "public com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder remoteAddressHeaders(java.lang.String)",
-      "public com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder remoteAddressHeaders(java.util.Collection)",
-      "public com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder remotePortHeaders(java.lang.String)",
-      "public com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder remotePortHeaders(java.util.Collection)",
-      "public com.yahoo.jdisc.http.ServerConfig$AccessLog build()"
-    ],
-    "fields": [
-      "public java.util.List remoteAddressHeaders",
-      "public java.util.List remotePortHeaders"
-    ]
-  },
-  "com.yahoo.jdisc.http.ServerConfig$AccessLog": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder)",
-      "public java.util.List remoteAddressHeaders()",
-      "public java.lang.String remoteAddressHeaders(int)",
-      "public java.util.List remotePortHeaders()",
-      "public java.lang.String remotePortHeaders(int)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServerConfig$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigInstance$Builder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder developerMode(boolean)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder responseCompressionLevel(int)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder httpKeepAliveEnabled(boolean)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder maxKeepAliveRequests(int)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder removeRawPostBodyForWwwUrlEncodedPost(boolean)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder filter(com.yahoo.jdisc.http.ServerConfig$Filter$Builder)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder filter(java.util.List)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder defaultFilters(com.yahoo.jdisc.http.ServerConfig$DefaultFilters$Builder)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder defaultFilters(java.util.List)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder strictFiltering(boolean)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder maxWorkerThreads(int)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder minWorkerThreads(int)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder stopTimeout(double)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder jmx(com.yahoo.jdisc.http.ServerConfig$Jmx$Builder)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder metric(com.yahoo.jdisc.http.ServerConfig$Metric$Builder)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder accessLog(com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder)",
-      "public com.yahoo.jdisc.http.ServerConfig$Builder connectionLog(com.yahoo.jdisc.http.ServerConfig$ConnectionLog$Builder)",
-      "public final boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)",
-      "public final java.lang.String getDefMd5()",
-      "public final java.lang.String getDefName()",
-      "public final java.lang.String getDefNamespace()",
-      "public final boolean getApplyOnRestart()",
-      "public final void setApplyOnRestart(boolean)",
-      "public com.yahoo.jdisc.http.ServerConfig build()"
-    ],
-    "fields": [
-      "public java.util.List filter",
-      "public java.util.List defaultFilters",
-      "public com.yahoo.jdisc.http.ServerConfig$Jmx$Builder jmx",
-      "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder metric",
-      "public com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder accessLog",
-      "public com.yahoo.jdisc.http.ServerConfig$ConnectionLog$Builder connectionLog"
-    ]
-  },
-  "com.yahoo.jdisc.http.ServerConfig$ConnectionLog$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$ConnectionLog)",
-      "public com.yahoo.jdisc.http.ServerConfig$ConnectionLog$Builder enabled(boolean)",
-      "public com.yahoo.jdisc.http.ServerConfig$ConnectionLog build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServerConfig$ConnectionLog": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$ConnectionLog$Builder)",
-      "public boolean enabled()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServerConfig$DefaultFilters$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$DefaultFilters)",
-      "public com.yahoo.jdisc.http.ServerConfig$DefaultFilters$Builder filterId(java.lang.String)",
-      "public com.yahoo.jdisc.http.ServerConfig$DefaultFilters$Builder localPort(int)",
-      "public com.yahoo.jdisc.http.ServerConfig$DefaultFilters build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServerConfig$DefaultFilters": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$DefaultFilters$Builder)",
-      "public java.lang.String filterId()",
-      "public int localPort()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServerConfig$Filter$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Filter)",
-      "public com.yahoo.jdisc.http.ServerConfig$Filter$Builder id(java.lang.String)",
-      "public com.yahoo.jdisc.http.ServerConfig$Filter$Builder binding(java.lang.String)",
-      "public com.yahoo.jdisc.http.ServerConfig$Filter build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServerConfig$Filter": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Filter$Builder)",
-      "public java.lang.String id()",
-      "public java.lang.String binding()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServerConfig$Jmx$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Jmx)",
-      "public com.yahoo.jdisc.http.ServerConfig$Jmx$Builder enabled(boolean)",
-      "public com.yahoo.jdisc.http.ServerConfig$Jmx$Builder listenPort(int)",
-      "public com.yahoo.jdisc.http.ServerConfig$Jmx build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServerConfig$Jmx": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Jmx$Builder)",
-      "public boolean enabled()",
-      "public int listenPort()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServerConfig$Metric$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Metric)",
-      "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder monitoringHandlerPaths(java.lang.String)",
-      "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder monitoringHandlerPaths(java.util.Collection)",
-      "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder searchHandlerPaths(java.lang.String)",
-      "public com.yahoo.jdisc.http.ServerConfig$Metric$Builder searchHandlerPaths(java.util.Collection)",
-      "public com.yahoo.jdisc.http.ServerConfig$Metric build()"
-    ],
-    "fields": [
-      "public java.util.List monitoringHandlerPaths",
-      "public java.util.List searchHandlerPaths"
-    ]
-  },
-  "com.yahoo.jdisc.http.ServerConfig$Metric": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Metric$Builder)",
-      "public java.util.List monitoringHandlerPaths()",
-      "public java.lang.String monitoringHandlerPaths(int)",
-      "public java.util.List searchHandlerPaths()",
-      "public java.lang.String searchHandlerPaths(int)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServerConfig$Producer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigInstance$Producer"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void getConfig(com.yahoo.jdisc.http.ServerConfig$Builder)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServerConfig": {
-    "superClass": "com.yahoo.config.ConfigInstance",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public static java.lang.String getDefMd5()",
-      "public static java.lang.String getDefName()",
-      "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
-      "public void <init>(com.yahoo.jdisc.http.ServerConfig$Builder)",
-      "public boolean developerMode()",
-      "public int responseCompressionLevel()",
-      "public boolean httpKeepAliveEnabled()",
-      "public int maxKeepAliveRequests()",
-      "public boolean removeRawPostBodyForWwwUrlEncodedPost()",
-      "public java.util.List filter()",
-      "public com.yahoo.jdisc.http.ServerConfig$Filter filter(int)",
-      "public java.util.List defaultFilters()",
-      "public com.yahoo.jdisc.http.ServerConfig$DefaultFilters defaultFilters(int)",
-      "public boolean strictFiltering()",
-      "public int maxWorkerThreads()",
-      "public int minWorkerThreads()",
-      "public double stopTimeout()",
-      "public com.yahoo.jdisc.http.ServerConfig$Jmx jmx()",
-      "public com.yahoo.jdisc.http.ServerConfig$Metric metric()",
-      "public com.yahoo.jdisc.http.ServerConfig$AccessLog accessLog()",
-      "public com.yahoo.jdisc.http.ServerConfig$ConnectionLog connectionLog()"
-    ],
-    "fields": [
-      "public static final java.lang.String CONFIG_DEF_MD5",
-      "public static final java.lang.String CONFIG_DEF_NAME",
-      "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
-      "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
-    ]
-  },
-  "com.yahoo.jdisc.http.ServletPathsConfig$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigInstance$Builder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ServletPathsConfig)",
-      "public com.yahoo.jdisc.http.ServletPathsConfig$Builder servlets(java.lang.String, com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder)",
-      "public com.yahoo.jdisc.http.ServletPathsConfig$Builder servlets(java.util.Map)",
-      "public final boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)",
-      "public final java.lang.String getDefMd5()",
-      "public final java.lang.String getDefName()",
-      "public final java.lang.String getDefNamespace()",
-      "public final boolean getApplyOnRestart()",
-      "public final void setApplyOnRestart(boolean)",
-      "public com.yahoo.jdisc.http.ServletPathsConfig build()"
-    ],
-    "fields": [
-      "public java.util.Map servlets"
-    ]
-  },
-  "com.yahoo.jdisc.http.ServletPathsConfig$Producer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigInstance$Producer"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void getConfig(com.yahoo.jdisc.http.ServletPathsConfig$Builder)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ServletPathsConfig$Servlets)",
-      "public com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder path(java.lang.String)",
-      "public com.yahoo.jdisc.http.ServletPathsConfig$Servlets build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServletPathsConfig$Servlets": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder)",
-      "public java.lang.String path()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ServletPathsConfig": {
-    "superClass": "com.yahoo.config.ConfigInstance",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public static java.lang.String getDefMd5()",
-      "public static java.lang.String getDefName()",
-      "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
-      "public void <init>(com.yahoo.jdisc.http.ServletPathsConfig$Builder)",
-      "public java.util.Map servlets()",
-      "public com.yahoo.jdisc.http.ServletPathsConfig$Servlets servlets(java.lang.String)"
-    ],
-    "fields": [
-      "public static final java.lang.String CONFIG_DEF_MD5",
-      "public static final java.lang.String CONFIG_DEF_NAME",
-      "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
-      "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
-    ]
-  },
-  "com.yahoo.jdisc.http.filter.DiscFilterRequest$ThreadLocalSimpleDateFormat": {
-    "superClass": "java.lang.ThreadLocal",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.util.Locale)",
-      "public java.util.Date parse(java.lang.String)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.DiscFilterRequest": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "abstract"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.servlet.ServletOrJdiscHttpRequest)",
-      "public abstract java.lang.String getMethod()",
-      "public com.yahoo.jdisc.http.HttpRequest$Version getVersion()",
-      "public java.net.URI getUri()",
-      "public abstract void setUri(java.net.URI)",
-      "public com.yahoo.jdisc.http.HttpRequest getParentRequest()",
-      "public java.lang.String getRemoteAddr()",
-      "public void setRemoteAddr(java.lang.String)",
-      "public java.lang.String getLocalAddr()",
-      "public java.util.Enumeration getAttributeNames()",
-      "public java.lang.Object getAttribute(java.lang.String)",
-      "public void setAttribute(java.lang.String, java.lang.Object)",
-      "public boolean containsAttribute(java.lang.String)",
-      "public void removeAttribute(java.lang.String)",
-      "public abstract java.lang.String getParameter(java.lang.String)",
-      "public abstract java.util.Enumeration getParameterNames()",
-      "public java.util.List getParameterNamesAsList()",
-      "public java.util.Enumeration getParameterValues(java.lang.String)",
-      "public java.util.List getParameterValuesAsList(java.lang.String)",
-      "public java.util.Map getParameterMap()",
-      "public java.lang.String getRemoteHost()",
-      "public int getLocalPort()",
-      "public int getRemotePort()",
-      "public java.util.Map getUntreatedParams()",
-      "public com.yahoo.jdisc.HeaderFields getUntreatedHeaders()",
-      "public java.util.List getUntreatedCookies()",
-      "public abstract void addHeader(java.lang.String, java.lang.String)",
-      "public long getDateHeader(java.lang.String)",
-      "public abstract java.lang.String getHeader(java.lang.String)",
-      "public abstract java.util.Enumeration getHeaderNames()",
-      "public abstract java.util.List getHeaderNamesAsList()",
-      "public abstract java.util.Enumeration getHeaders(java.lang.String)",
-      "public abstract java.util.List getHeadersAsList(java.lang.String)",
-      "public abstract void removeHeaders(java.lang.String)",
-      "public abstract void setHeaders(java.lang.String, java.lang.String)",
-      "public abstract void setHeaders(java.lang.String, java.util.List)",
-      "public int getIntHeader(java.lang.String)",
-      "public java.util.List getCookies()",
-      "public void setCookies(java.util.List)",
-      "public long getConnectedAt(java.util.concurrent.TimeUnit)",
-      "public java.lang.String getProtocol()",
-      "public java.lang.String getQueryString()",
-      "public java.lang.String getRemoteUser()",
-      "public java.lang.String getRequestURI()",
-      "public java.lang.String getRequestedSessionId()",
-      "public java.lang.String getScheme()",
-      "public void setScheme(java.lang.String, boolean)",
-      "public java.lang.String getServerName()",
-      "public int getServerPort()",
-      "public abstract java.security.Principal getUserPrincipal()",
-      "public boolean isSecure()",
-      "public boolean isUserInRole(java.lang.String)",
-      "public void setOverrideIsUserInRole(boolean)",
-      "public void setRemoteHost(java.lang.String)",
-      "public void setRemoteUser(java.lang.String)",
-      "public abstract void setUserPrincipal(java.security.Principal)",
-      "public abstract java.util.List getClientCertificateChain()",
-      "public void setUserRoles(java.lang.String[])",
-      "public java.lang.String getContentType()",
-      "public java.lang.String getCharacterEncoding()",
-      "public void setCharacterEncoding(java.lang.String)",
-      "public void addCookie(com.yahoo.jdisc.http.filter.JDiscCookieWrapper)",
-      "public abstract void clearCookies()",
-      "public com.yahoo.jdisc.http.filter.JDiscCookieWrapper[] getWrappedCookies()",
-      "public static boolean isMultipart(com.yahoo.jdisc.http.filter.DiscFilterRequest)"
-    ],
-    "fields": [
-      "protected static final java.lang.String HTTPS_PREFIX",
-      "protected static final int DEFAULT_HTTP_PORT",
-      "protected static final int DEFAULT_HTTPS_PORT",
-      "protected final java.util.Map untreatedParams",
-      "protected static com.yahoo.jdisc.http.filter.DiscFilterRequest$ThreadLocalSimpleDateFormat[] formats"
-    ]
-  },
-  "com.yahoo.jdisc.http.filter.DiscFilterResponse": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "abstract"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.servlet.ServletOrJdiscHttpResponse)",
-      "public java.util.Enumeration getAttributeNames()",
-      "public java.lang.Object getAttribute(java.lang.String)",
-      "public void setAttribute(java.lang.String, java.lang.Object)",
-      "public void removeAttribute(java.lang.String)",
-      "public com.yahoo.jdisc.HeaderFields getUntreatedHeaders()",
-      "public java.util.List getUntreatedCookies()",
-      "public abstract void setHeader(java.lang.String, java.lang.String)",
-      "public abstract void removeHeaders(java.lang.String)",
-      "public abstract void setHeaders(java.lang.String, java.lang.String)",
-      "public abstract void setHeaders(java.lang.String, java.util.List)",
-      "public abstract void addHeader(java.lang.String, java.lang.String)",
-      "public abstract java.lang.String getHeader(java.lang.String)",
-      "public java.util.List getCookies()",
-      "public abstract void setCookies(java.util.List)",
-      "public int getStatus()",
-      "public abstract void setStatus(int)",
-      "public com.yahoo.jdisc.http.HttpResponse getParentResponse()",
-      "public void addCookie(com.yahoo.jdisc.http.filter.JDiscCookieWrapper)",
-      "public void sendError(int)",
-      "public void setCookie(java.lang.String, java.lang.String)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.FilterConfig": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract java.lang.String getFilterName()",
-      "public abstract java.lang.String getFilterClass()",
-      "public abstract java.lang.String getInitParameter(java.lang.String)",
-      "public abstract boolean getBooleanInitParameter(java.lang.String, boolean)",
-      "public abstract java.util.Collection getInitParameterNames()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.JDiscCookieWrapper": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "protected void <init>(com.yahoo.jdisc.http.Cookie)",
-      "public static com.yahoo.jdisc.http.filter.JDiscCookieWrapper wrap(com.yahoo.jdisc.http.Cookie)",
-      "public java.lang.String getDomain()",
-      "public int getMaxAge()",
-      "public java.lang.String getName()",
-      "public java.lang.String getPath()",
-      "public boolean getSecure()",
-      "public java.lang.String getValue()",
-      "public void setDomain(java.lang.String)",
-      "public void setMaxAge(int)",
-      "public void setPath(java.lang.String)",
-      "public void setSecure(boolean)",
-      "public void setValue(java.lang.String)",
-      "public com.yahoo.jdisc.http.Cookie getCookie()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.JdiscFilterRequest": {
-    "superClass": "com.yahoo.jdisc.http.filter.DiscFilterRequest",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.HttpRequest)",
-      "public com.yahoo.jdisc.http.HttpRequest getParentRequest()",
-      "public void setUri(java.net.URI)",
-      "public java.lang.String getMethod()",
-      "public java.lang.String getParameter(java.lang.String)",
-      "public java.util.Enumeration getParameterNames()",
-      "public void addHeader(java.lang.String, java.lang.String)",
-      "public java.lang.String getHeader(java.lang.String)",
-      "public java.util.Enumeration getHeaderNames()",
-      "public java.util.List getHeaderNamesAsList()",
-      "public java.util.Enumeration getHeaders(java.lang.String)",
-      "public java.util.List getHeadersAsList(java.lang.String)",
-      "public void removeHeaders(java.lang.String)",
-      "public void setHeaders(java.lang.String, java.lang.String)",
-      "public void setHeaders(java.lang.String, java.util.List)",
-      "public java.security.Principal getUserPrincipal()",
-      "public void setUserPrincipal(java.security.Principal)",
-      "public java.util.List getClientCertificateChain()",
-      "public void clearCookies()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.JdiscFilterResponse": {
-    "superClass": "com.yahoo.jdisc.http.filter.DiscFilterResponse",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.HttpResponse)",
-      "public void setStatus(int)",
-      "public void setHeader(java.lang.String, java.lang.String)",
-      "public void removeHeaders(java.lang.String)",
-      "public void setHeaders(java.lang.String, java.lang.String)",
-      "public void setHeaders(java.lang.String, java.util.List)",
-      "public void addHeader(java.lang.String, java.lang.String)",
-      "public java.lang.String getHeader(java.lang.String)",
-      "public void setCookies(java.util.List)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.RequestFilter": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.jdisc.SharedResource",
-      "com.yahoo.jdisc.http.filter.RequestFilterBase"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void filter(com.yahoo.jdisc.http.HttpRequest, com.yahoo.jdisc.handler.ResponseHandler)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.RequestFilterBase": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.RequestView": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract java.lang.Object getAttribute(java.lang.String)",
-      "public abstract java.util.List getHeaders(java.lang.String)",
-      "public abstract java.util.Optional getFirstHeader(java.lang.String)",
-      "public abstract java.util.Optional getMethod()",
-      "public abstract java.net.URI getUri()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.ResponseFilter": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.jdisc.SharedResource",
-      "com.yahoo.jdisc.http.filter.ResponseFilterBase"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void filter(com.yahoo.jdisc.Response, com.yahoo.jdisc.Request)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.ResponseFilterBase": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.SecurityFilterInvoker": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.jdisc.http.server.jetty.FilterInvoker"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public javax.servlet.http.HttpServletRequest invokeRequestFilterChain(com.yahoo.jdisc.http.filter.RequestFilter, java.net.URI, javax.servlet.http.HttpServletRequest, com.yahoo.jdisc.handler.ResponseHandler)",
-      "public void invokeResponseFilterChain(com.yahoo.jdisc.http.filter.ResponseFilter, java.net.URI, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.SecurityRequestFilter": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.jdisc.http.filter.RequestFilterBase"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void filter(com.yahoo.jdisc.http.filter.DiscFilterRequest, com.yahoo.jdisc.handler.ResponseHandler)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.SecurityRequestFilterChain": {
-    "superClass": "com.yahoo.jdisc.AbstractResource",
-    "interfaces": [
-      "com.yahoo.jdisc.http.filter.RequestFilter"
-    ],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void filter(com.yahoo.jdisc.http.HttpRequest, com.yahoo.jdisc.handler.ResponseHandler)",
-      "public void filter(com.yahoo.jdisc.http.filter.DiscFilterRequest, com.yahoo.jdisc.handler.ResponseHandler)",
-      "public static varargs com.yahoo.jdisc.http.filter.RequestFilter newInstance(com.yahoo.jdisc.http.filter.SecurityRequestFilter[])",
-      "public static com.yahoo.jdisc.http.filter.RequestFilter newInstance(java.util.List)",
-      "public java.util.List getFilters()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.SecurityResponseFilter": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.jdisc.http.filter.ResponseFilterBase"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void filter(com.yahoo.jdisc.http.filter.DiscFilterResponse, com.yahoo.jdisc.http.filter.RequestView)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.filter.SecurityResponseFilterChain": {
-    "superClass": "com.yahoo.jdisc.AbstractResource",
-    "interfaces": [
-      "com.yahoo.jdisc.http.filter.ResponseFilter"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void filter(com.yahoo.jdisc.Response, com.yahoo.jdisc.Request)",
-      "public void filter(com.yahoo.jdisc.http.filter.RequestView, com.yahoo.jdisc.http.filter.DiscFilterResponse)",
-      "public static varargs com.yahoo.jdisc.http.filter.ResponseFilter newInstance(com.yahoo.jdisc.http.filter.SecurityResponseFilter[])",
-      "public static com.yahoo.jdisc.http.filter.ResponseFilter newInstance(java.util.List)",
-      "public java.util.List getFilters()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ssl.SslContextFactoryProvider": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.AutoCloseable"
-    ],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract org.eclipse.jetty.util.ssl.SslContextFactory getInstance(java.lang.String, int)",
-      "public void close()"
-    ],
-    "fields": []
-  }
-}
\ No newline at end of file
diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml
deleted file mode 100644
index 57d69a2f2dd..00000000000
--- a/jdisc_http_service/pom.xml
+++ /dev/null
@@ -1,222 +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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.yahoo.vespa</groupId>
-    <artifactId>parent</artifactId>
-    <version>7-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>jdisc_http_service</artifactId>
-  <version>7-SNAPSHOT</version>
-  <packaging>container-plugin</packaging>
-  <name>${project.artifactId}</name>
-  <dependencies>
-    <!-- COMPILE SCOPE -->
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <scope>compile</scope>
-    </dependency>
-
-    <!-- PROVIDED SCOPE -->
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <scope>provided</scope>
-      <classifier>no_aop</classifier>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_jetty</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>config-lib</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>defaults</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>annotations</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>component</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>security-utils</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>yolean</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vespalog</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-core-config</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vespajlib</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-
-    <!-- TEST SCOPE -->
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-client</artifactId>
-      <version>${jetty.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.cthul</groupId>
-      <artifactId>cthul-matchers</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>testutil</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <compilerArgs>
-            <arg>-Xlint:all</arg>
-            <arg>-Xlint:-serial</arg>
-            <arg>-Werror</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle>
-          <discPreInstallBundle>
-            javax.servlet-api-3.1.0.jar,
-            jetty-continuation-${jetty.version}.jar,
-            jetty-http-${jetty.version}.jar,
-            jetty-io-${jetty.version}.jar,
-            jetty-jmx-${jetty.version}.jar,
-            jetty-security-${jetty.version}.jar,
-            jetty-server-${jetty.version}.jar,
-            jetty-servlet-${jetty.version}.jar,
-            jetty-servlets-${jetty.version}.jar,
-            jetty-util-${jetty.version}.jar,
-            jetty-util-ajax-${jetty.version}.jar,
-            component-jar-with-dependencies.jar
-          </discPreInstallBundle>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeGroupIds>org.bouncycastle</includeGroupIds>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>abi-check-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml
index 90d9f093da1..928179a6124 100644
--- a/metrics-proxy/pom.xml
+++ b/metrics-proxy/pom.xml
@@ -79,12 +79,6 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_http_service</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
       <artifactId>jrt</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
diff --git a/model-evaluation/pom.xml b/model-evaluation/pom.xml
index 3cf3988fc48..00560a22bc7 100644
--- a/model-evaluation/pom.xml
+++ b/model-evaluation/pom.xml
@@ -74,12 +74,6 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_http_service</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
       <artifactId>jdisc_jetty</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/pom.xml b/pom.xml
index def94f212b1..abba8594956 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,6 @@
         <module>config_test</module>
         <module>container</module>
         <module>container-core</module>
-        <module>container-core-config</module>
         <module>container-dependencies-enforcer</module>
         <module>container-dependency-versions</module>
         <module>container-dev</module>
@@ -94,7 +93,6 @@
         <module>jdisc-security-filters</module>
         <module>jdisc_core</module>
         <module>jdisc_core_test</module>
-        <module>jdisc_http_service</module>
         <module>jdisc_jetty</module>
         <module>jdisc_messagebus_service</module>
         <module>jrt</module>
diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml
index e73d9902ebe..acad1f9e444 100755
--- a/provided-dependencies/pom.xml
+++ b/provided-dependencies/pom.xml
@@ -23,11 +23,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jdisc_http_service</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
     </dependency>
diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml
index 93f1579f58c..566b48ba933 100644
--- a/vespaclient-java/pom.xml
+++ b/vespaclient-java/pom.xml
@@ -51,11 +51,6 @@
         </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
-            <artifactId>jdisc_http_service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
             <artifactId>predicate-search-core</artifactId>
             <version>${project.version}</version>
         </dependency>