From 7c193f6141f0f321649127d9bcd0afc4a9189a3b Mon Sep 17 00:00:00 2001
From: Varun Nandi <varunkn@amazon.com>
Date: Thu, 7 Jun 2018 10:13:19 -0700
Subject: [PATCH] Add Automatic-Module-Name in manifest so Java9 modular
 applications can depend on this library

---
 fluent-hc/pom.xml        | 22 ++++++++++++++++++++++
 httpclient-cache/pom.xml | 10 ++++++++++
 httpclient-win/pom.xml   | 25 +++++++++++++++++++++++++
 httpclient/pom.xml       | 10 ++++++++++
 httpmime/pom.xml         | 19 +++++++++++++++++++
 5 files changed, 86 insertions(+)

diff --git a/fluent-hc/pom.xml b/fluent-hc/pom.xml
index e02fbbe38..08f351b88 100644
--- a/fluent-hc/pom.xml
+++ b/fluent-hc/pom.xml
@@ -81,6 +81,28 @@
         </includes>
       </resource>
     </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <archive combine.children="append">
+                <manifestEntries>
+                  <Automatic-Module-Name>org.apache.httpcomponents.fluent-hc</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
 
   <reporting>
diff --git a/httpclient-cache/pom.xml b/httpclient-cache/pom.xml
index e23149293..7279d7b8e 100644
--- a/httpclient-cache/pom.xml
+++ b/httpclient-cache/pom.xml
@@ -133,9 +133,19 @@
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
+            <id>default-jar</id>
+            <phase>package</phase>
             <goals>
+              <goal>jar</goal>
               <goal>test-jar</goal>
             </goals>
+            <configuration>
+              <archive combine.children="append">
+                <manifestEntries>
+                  <Automatic-Module-Name>org.apache.httpcomponents.httpclient-cache</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
+            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/httpclient-win/pom.xml b/httpclient-win/pom.xml
index cdc948af0..d045a2b78 100644
--- a/httpclient-win/pom.xml
+++ b/httpclient-win/pom.xml
@@ -69,6 +69,31 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <archive combine.children="append">
+                <manifestEntries>
+                  <Automatic-Module-Name>org.apache.httpcomponents.httpclient-win</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
   <reporting>
     <plugins>
 
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index 56a589dfb..c8e366c6a 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -119,9 +119,19 @@
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
+            <id>default-jar</id>
+            <phase>package</phase>
             <goals>
+              <goal>jar</goal>
               <goal>test-jar</goal>
             </goals>
+            <configuration>
+              <archive combine.children="append">
+                <manifestEntries>
+                  <Automatic-Module-Name>org.apache.httpcomponents.httpclient</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
+            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/httpmime/pom.xml b/httpmime/pom.xml
index ba07fa233..308e76f0f 100644
--- a/httpmime/pom.xml
+++ b/httpmime/pom.xml
@@ -89,6 +89,25 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <archive combine.children="append">
+                <manifestEntries>
+                  <Automatic-Module-Name>org.apache.httpcomponents.httpmime</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>