From c952b69610be378def7ae4c415d6f50c47eabf46 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@oath.com>
Date: Mon, 19 Nov 2018 15:12:53 +0100
Subject: Do not provide apache httpclient and httpcore.

---
 container-search-and-docproc/pom.xml                             | 8 --------
 .../main/java/org/apache/commons/codec/binary/package-info.java  | 7 -------
 .../main/java/org/apache/commons/codec/digest/package-info.java  | 7 -------
 .../java/org/apache/commons/codec/language/package-info.java     | 7 -------
 .../src/main/java/org/apache/commons/codec/net/package-info.java | 7 -------
 .../src/main/java/org/apache/commons/codec/package-info.java     | 7 -------
 .../src/main/java/org/apache/http/auth/package-info.java         | 9 ---------
 .../main/java/org/apache/http/client/config/package-info.java    | 7 -------
 .../main/java/org/apache/http/client/entity/package-info.java    | 7 -------
 .../main/java/org/apache/http/client/methods/package-info.java   | 7 -------
 .../src/main/java/org/apache/http/client/package-info.java       | 7 -------
 .../src/main/java/org/apache/http/conn/package-info.java         | 7 -------
 .../src/main/java/org/apache/http/conn/params/package-info.java  | 7 -------
 .../src/main/java/org/apache/http/conn/scheme/package-info.java  | 7 -------
 .../src/main/java/org/apache/http/conn/ssl/package-info.java     | 6 ------
 .../src/main/java/org/apache/http/entity/package-info.java       | 7 -------
 .../src/main/java/org/apache/http/impl/client/package-info.java  | 9 ---------
 .../src/main/java/org/apache/http/impl/conn/package-info.java    | 9 ---------
 .../src/main/java/org/apache/http/message/package-info.java      | 7 -------
 .../src/main/java/org/apache/http/package-info.java              | 9 ---------
 .../src/main/java/org/apache/http/params/package-info.java       | 7 -------
 .../src/main/java/org/apache/http/protocol/package-info.java     | 7 -------
 .../src/main/java/org/apache/http/util/package-info.java         | 7 -------
 23 files changed, 169 deletions(-)
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/commons/codec/binary/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/commons/codec/digest/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/commons/codec/language/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/commons/codec/net/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/commons/codec/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/auth/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/client/config/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/client/entity/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/client/methods/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/client/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/conn/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/conn/params/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/conn/scheme/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/conn/ssl/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/entity/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/impl/client/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/impl/conn/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/message/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/params/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/protocol/package-info.java
 delete mode 100644 container-search-and-docproc/src/main/java/org/apache/http/util/package-info.java

(limited to 'container-search-and-docproc')

diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml
index 7e9937d4470..c66c5f9e1fe 100644
--- a/container-search-and-docproc/pom.xml
+++ b/container-search-and-docproc/pom.xml
@@ -211,14 +211,6 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/binary/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/binary/package-info.java
deleted file mode 100644
index 80f76e6b263..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/binary/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 1, minor = 4, micro = 0))
-package org.apache.commons.codec.binary;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/digest/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/digest/package-info.java
deleted file mode 100644
index 117120c1641..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/digest/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 1, minor = 4, micro = 0))
-package org.apache.commons.codec.digest;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/language/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/language/package-info.java
deleted file mode 100644
index de288618ad9..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/language/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 1, minor = 4, micro = 0))
-package org.apache.commons.codec.language;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/net/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/net/package-info.java
deleted file mode 100644
index 49510c6feac..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/net/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 1, minor = 4, micro = 0))
-package org.apache.commons.codec.net;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/package-info.java
deleted file mode 100644
index c698ba0233a..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 1, minor = 4, micro = 0))
-package org.apache.commons.codec;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/auth/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/auth/package-info.java
deleted file mode 100644
index dbf6d408a2f..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/auth/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/*
- * Exported due to usage in HTTPSearcher API
- */
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
-package org.apache.http.auth;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/client/config/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/client/config/package-info.java
deleted file mode 100644
index bc480dd1838..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/client/config/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
-package org.apache.http.client.config;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/client/entity/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/client/entity/package-info.java
deleted file mode 100644
index c3bb1fbbf3e..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/client/entity/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
-package org.apache.http.client.entity;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/client/methods/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/client/methods/package-info.java
deleted file mode 100644
index c938418fa71..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/client/methods/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
-package org.apache.http.client.methods;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/client/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/client/package-info.java
deleted file mode 100644
index 85e68ea27b6..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/client/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
-package org.apache.http.client;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/conn/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/conn/package-info.java
deleted file mode 100644
index c8e606d25ee..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/conn/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
-package org.apache.http.conn;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/conn/params/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/conn/params/package-info.java
deleted file mode 100644
index 9469bfc7333..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/conn/params/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
-package org.apache.http.conn.params;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/conn/scheme/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/conn/scheme/package-info.java
deleted file mode 100644
index bd54cb060a9..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/conn/scheme/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
-package org.apache.http.conn.scheme;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/conn/ssl/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/conn/ssl/package-info.java
deleted file mode 100644
index 2dd9254cdb0..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/conn/ssl/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
-package org.apache.http.conn.ssl;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/entity/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/entity/package-info.java
deleted file mode 100644
index a843aa9ceb2..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/entity/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 3))
-package org.apache.http.entity;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/impl/client/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/impl/client/package-info.java
deleted file mode 100644
index 89973cb6cc5..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/impl/client/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/*
- * Exported due to usage in HTTPSearcher API
- */
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
-package org.apache.http.impl.client;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/impl/conn/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/impl/conn/package-info.java
deleted file mode 100644
index 4d167d5e627..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/impl/conn/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/*
- * Exported due to usage in HTTPSearcher API
- */
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
-package org.apache.http.impl.conn;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/message/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/message/package-info.java
deleted file mode 100644
index 7430e71d0c7..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/message/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 3))
-package org.apache.http.message;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/package-info.java
deleted file mode 100644
index 9dcfc75e5a4..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/*
- * Exported due to usage in HTTPSearcher API
- */
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 3))
-package org.apache.http;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/params/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/params/package-info.java
deleted file mode 100644
index 9bfd6e48404..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/params/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 3))
-package org.apache.http.params;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/protocol/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/protocol/package-info.java
deleted file mode 100644
index 7bb784f7197..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/protocol/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 3))
-package org.apache.http.protocol;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/util/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/util/package-info.java
deleted file mode 100644
index 89f73ab1a12..00000000000
--- a/container-search-and-docproc/src/main/java/org/apache/http/util/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 4, minor = 3, micro = 3))
-package org.apache.http.util;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
-
-- 
cgit v1.2.3