From 88c0601fa0e5ac592fbcbf621845d284dc661a78 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 12 Apr 2018 12:18:47 +0200
Subject: [PATCH] Update to upstream version 4.4.10

---
 httpcomponents-core.spec | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index 7d5769d..7e5e9f8 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -1,7 +1,7 @@
 Name:           httpcomponents-core
 Summary:        Set of low level Java HTTP transport components for HTTP services
-Version:        4.4.9
-Release:        4%{?dist}
+Version:        4.4.10
+Release:        1%{?dist}
 License:        ASL 2.0
 URL:            http://hc.apache.org/
 Source0:        http://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-%{version}-src.tar.gz
@@ -44,13 +44,6 @@ Summary:        API documentation for %{name}
 # very performant arch, lets make it 2 s
 sed -i '/Thread.sleep/s/100/2000/' httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
 
-# The following tests use DSA key, which is rejected by Fedora's security policy
-# https://issues.apache.org/jira/browse/HTTPCORE-519
-rm httpcore/src/test/java/org/apache/http/ssl/TestSSLContextBuilder.java
-rm httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java
-rm httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
-rm httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlersPipelining.java
-
 %pom_remove_plugin :maven-checkstyle-plugin
 %pom_remove_plugin :apache-rat-plugin
 %pom_remove_plugin :maven-source-plugin
@@ -64,6 +57,7 @@ rm httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandl
 for module in httpcore httpcore-nio; do
     %pom_xpath_remove "pom:project/pom:packaging" $module
     %pom_xpath_inject "pom:project" "<packaging>bundle</packaging>" $module
+    %pom_remove_plugin :maven-jar-plugin $module
     %pom_xpath_inject "pom:build/pom:plugins" "
         <plugin>
           <groupId>org.apache.felix</groupId>
@@ -73,6 +67,7 @@ for module in httpcore httpcore-nio; do
             <instructions>
               <Export-Package>*</Export-Package>
               <Private-Package></Private-Package>
+              <Automatic-Module-Name>org.apache.httpcomponents.$module</Automatic-Module-Name>
               <_nouses>true</_nouses>
             </instructions>
           </configuration>
@@ -96,6 +91,9 @@ done
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Mon Jul 02 2018 Michael Simacek <msimacek@redhat.com> - 4.4.10-1
+- Update to upstream version 4.4.10
+
 * Mon Mar 19 2018 Michael Simacek <msimacek@redhat.com> - 4.4.9-4
 - Fix FTBFS (weak encryption in tests)