From eb16f22feb55d493581e3e8786497c0a78fb8b32 Mon Sep 17 00:00:00 2001
From: GedMarc <ged_marc@hotmail.com>
Date: Mon, 26 Nov 2018 22:05:21 +0200
Subject: [PATCH 1/2] org.json JPMS Module Naming

---
 .gitignore                    |  5 +++-
 package.sh                    |  5 ++++
 pom.xml                       | 44 +++++++++++++++++++++++++++++++++++
 src/moditect/module-info.java |  3 +++
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 src/moditect/module-info.java

diff --git a/.gitignore b/.gitignore
index 723ef36f4..cf2abc0d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-.idea
\ No newline at end of file
+**/*.idea
+src/main
+dist/
+*.iml
diff --git a/package.sh b/package.sh
index b16026d1e..6356fe44c 100644
--- a/package.sh
+++ b/package.sh
@@ -1,9 +1,14 @@
 #!/bin/bash
 SRC_FOLDER=dist/src/main/java/org/json
+MODITECT_FOLDER=dist/src/moditect
 WORKING_DIR=`pwd`
 
 # Get the original sources from Douglas Crockfords GitHub repo
 mkdir -p $SRC_FOLDER
+mkdir -p $MODITECT_FOLDER
+# Copy the module-info to the dist folder to build
+cp src/moditect/module-info.java $MODITECT_FOLDER/module-info.java
+echo "Copied the module info file"
 git clone https://github.com/stleary/JSON-java.git $SRC_FOLDER
 
 echo ""
diff --git a/pom.xml b/pom.xml
index 4f7e02b58..94c6784d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,6 +113,27 @@
 					</instructions>
 				</configuration>
 			</plugin>
+            <!-- Force Maven to run under 1.8, The compiler is set to 1.6, and 1.7 to build the output -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M2</version>
+                <executions>
+                    <execution>
+                        <id>enforce-java</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>1.8.0</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -187,6 +208,29 @@
 					</archive>
 				</configuration>
 			</plugin>
+            <!-- Attach the generated module-info the class file. This plugin requires JDK 1.8 -->
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <version>1.0.0.Beta1</version>
+                <executions>
+                    <execution>
+                        <id>add-module-infos</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                        <configuration>
+                            <overwriteExistingFiles>true</overwriteExistingFiles>
+                            <module>
+                                <moduleInfoFile>
+                                    src/moditect/module-info.java
+                                </moduleInfoFile>
+                            </module>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/src/moditect/module-info.java b/src/moditect/module-info.java
new file mode 100644
index 000000000..202a3a774
--- /dev/null
+++ b/src/moditect/module-info.java
@@ -0,0 +1,3 @@
+module org.json {
+	exports org.json;
+}

From 98d7f5291937f98b232779db2a3b8a1adf9452f3 Mon Sep 17 00:00:00 2001
From: GedMarc <ged_marc@hotmail.com>
Date: Mon, 26 Nov 2018 23:46:40 +0200
Subject: [PATCH 2/2] Don't crash the build cause of JDK 8 JavaDoc (Still gets
 rendered)

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 94c6784d9..844130708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,6 +168,7 @@
 						</goals>
 						<configuration>
 							<additionalparam>-Xdoclint:none</additionalparam>
+                            <failOnError>false</failOnError>
 						</configuration>
 					</execution>
 				</executions>