From 53de5d070f8b6cc271c1642a5140d368444fc5b7 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Thu, 18 Mar 2021 11:56:04 +0100
Subject: Remove the container-core-config module.

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index def94f212b1..60fe298330f 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>
-- 
cgit v1.2.3


From 8576c65baa3b66a06ae25a6342c589bcfd2d5cbe Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Fri, 19 Mar 2021 18:28:17 +0100
Subject: Do not build or install the jdisc_http_service module.

---
 CMakeLists.txt  | 1 -
 dist/vespa.spec | 1 -
 pom.xml         | 1 -
 3 files changed, 3 deletions(-)

(limited to 'pom.xml')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40f60d7daab..1b4a87aa39c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,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/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/pom.xml b/pom.xml
index 60fe298330f..abba8594956 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,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>
-- 
cgit v1.2.3