From 9069fcb5abc32af8b6088a26fde2b5b7e8216101 Mon Sep 17 00:00:00 2001
From: joehni <joerg.schaible@gmx.de>
Date: Tue, 14 May 2019 00:31:50 +0200
Subject: [PATCH] Add Automatic-Module-Name entry to XStream's manifests. Close
 #120.

---
 pom.xml                                       | 4 +++-
 xstream-benchmark/pom.xml                     | 3 ++-
 xstream-distribution/src/content/changes.html | 1 +
 xstream-hibernate/pom.xml                     | 3 ++-
 xstream-jmh/pom.xml                           | 5 ++++-
 xstream/pom.xml                               | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 64d2ba571..028292a53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <!--
      Copyright (C) 2006 Joe Walnes.
-     Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018 XStream committers.
+     Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2019 XStream committers.
      All rights reserved.
      
      The software in this package is published under the terms of the BSD
@@ -646,6 +646,7 @@
               </manifest>
               <manifestEntries>
                 <Specification-Version>${project.info.majorVersion}.${project.info.minorVersion}</Specification-Version>
+                <Automatic-Module-Name>${jar.module.name}</Automatic-Module-Name>
                 <X-Compile-Source>${version.java.source}</X-Compile-Source>
                 <X-Compile-Target>${version.java.target}</X-Compile-Target>
                 <X-Builder>Maven ${maven.version}</X-Builder>
@@ -985,6 +986,7 @@
     <version.xom>1.3.2</version.xom>
     <version.xpp3>1.1.4c</version.xpp3>
 
+    <jar.module.name>${project.artifactId}</jar.module.name>
     <javadoc.link.javase>http://docs.oracle.com/javase/8/docs/api/</javadoc.link.javase>
     <surefire.illegal.access>permit</surefire.illegal.access>
 
diff --git a/xstream-benchmark/pom.xml b/xstream-benchmark/pom.xml
index e964520c5..1fbbb750a 100644
--- a/xstream-benchmark/pom.xml
+++ b/xstream-benchmark/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <!--
      Copyright (C) 2006 Joe Walnes.
-     Copyright (C) 2006, 2007, 2009, 2011, 2012, 2013, 2015, 2017, 2018 XStream committers.
+     Copyright (C) 2006, 2007, 2009, 2011, 2012, 2013, 2015, 2017, 2018, 2019 XStream committers.
      All rights reserved.
      
      The software in this package is published under the terms of the BSD
@@ -50,5 +50,6 @@
 
   <properties>
     <bundle.export.package>!com.thoughtworks.xstream.tools.benchmark.model,com.thoughtworks.xstream.tools.benchmark.*;-noimport:=true</bundle.export.package>
+    <jar.module.name>xstream.benchmark</jar.module.name>
   </properties>
 </project>
diff --git a/xstream-distribution/src/content/changes.html b/xstream-distribution/src/content/changes.html
index e17770368..c85c94793 100644
--- a/xstream-distribution/src/content/changes.html
+++ b/xstream-distribution/src/content/changes.html
@@ -38,6 +38,7 @@ <h2>Major changes</h2>
 		<li>Usage of Java generic types. Most code bases will still compile without change.</li>
 		<li>Support for fail-safe deserialization unless the parser is not directly involved (I/O or syntax error) as
 		combination of new method getLevel() of HierarchicalStreamReader and GHPR:#91.</li>
+		<li>GHI:#120: Add <em>Automatic-Module-Name</em> entry to XStream's manifests.</li>
 	</ul>
 
 	<h2>Minor changes</h2>
diff --git a/xstream-hibernate/pom.xml b/xstream-hibernate/pom.xml
index e0e426df4..727aaf729 100644
--- a/xstream-hibernate/pom.xml
+++ b/xstream-hibernate/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <!--
-     Copyright (C) 2011, 2012, 2013, 2015, 2017, 2018 XStream committers.
+     Copyright (C) 2011, 2012, 2013, 2015, 2017, 2018, 2019 XStream committers.
      All rights reserved.
      
      The software in this package is published under the terms of the BSD
@@ -141,5 +141,6 @@
 
   <properties>
     <bundle.export.package>!com.thoughtworks.xstream.hibernate.util,com.thoughtworks.xstream.hibernate.*;-noimport:=true</bundle.export.package>
+    <jar.module.name>xstream.hibernate</jar.module.name>
   </properties>
 </project>
diff --git a/xstream-jmh/pom.xml b/xstream-jmh/pom.xml
index 12aa600f6..56dc2a0c4 100644
--- a/xstream-jmh/pom.xml
+++ b/xstream-jmh/pom.xml
@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <!--
-     Copyright (C) 2015, 2017, 2018 XStream committers.
+     Copyright (C) 2015, 2017, 2018, 2019 XStream committers.
      All rights reserved.
      
      The software in this package is published under the terms of the BSD
@@ -212,4 +212,7 @@
       <artifactId>jakarta.xml.bind-api</artifactId>
     </dependency>
   </dependencies>
+  <properties>
+    <jar.module.name>xstream.jmh</jar.module.name>
+  </properties>
 </project>
diff --git a/xstream/pom.xml b/xstream/pom.xml
index 6bf81ab1e..4fe4e3b2a 100644
--- a/xstream/pom.xml
+++ b/xstream/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <!--
      Copyright (C) 2006 Joe Walnes.
-     Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018 XStream committers.
+     Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019 XStream committers.
      All rights reserved.
      
      The software in this package is published under the terms of the BSD