From ad830474ac0a2b915bba940299de8f3083fae653 Mon Sep 17 00:00:00 2001
From: Varun Nandi <varunkn@amazon.com>
Date: Thu, 31 May 2018 12:22:58 -0700
Subject: [PATCH] Add Automatic-Module-Name in manifest so Java9 modular
 applications can depend on this library

---
 httpcore-ab/pom.xml  | 25 +++++++++++++++++++++++++
 httpcore-nio/pom.xml | 20 ++++++++++++++++++++
 httpcore/pom.xml     |  7 +++++++
 3 files changed, 52 insertions(+)

diff --git a/httpcore-ab/pom.xml b/httpcore-ab/pom.xml
index 3a47d5580f..80de4cd9c6 100644
--- a/httpcore-ab/pom.xml
+++ b/httpcore-ab/pom.xml
@@ -58,6 +58,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.httpcore-ab</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
   <reporting>
     <plugins>
 
diff --git a/httpcore-nio/pom.xml b/httpcore-nio/pom.xml
index fc76058869..bbc6240b73 100644
--- a/httpcore-nio/pom.xml
+++ b/httpcore-nio/pom.xml
@@ -93,6 +93,26 @@
           </execution>
         </executions>
       </plugin>
+      <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.httpcore-nio</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/httpcore/pom.xml b/httpcore/pom.xml
index dc22cb217e..d43f1476c8 100644
--- a/httpcore/pom.xml
+++ b/httpcore/pom.xml
@@ -93,6 +93,13 @@
                   </goals>
               </execution>
           </executions>
+        <configuration>
+          <archive>
+            <manifestEntries combine.children="append">
+              <Automatic-Module-Name>org.apache.httpcomponents.httpcore</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
       </plugin>
     </plugins>
     <resources>