From d29b6921ed1cbbf93be048510ab7a3e59be41f53 Mon Sep 17 00:00:00 2001
From: Ceki Gulcu <ceki@qos.ch>
Date: Tue, 21 Mar 2017 21:36:27 +0100
Subject: [PATCH] initial attempt at introducing modules

---
 pom.xml                                       | 70 +++++++++++++++----
 .../src/main/java/org.slf4j/module-info.java  |  5 ++
 .../java/org.slf4j.jdk14/module-info.java     |  5 ++
 .../java/org.slf4j.log4j12/module-info.java   |  5 ++
 .../main/java/org.slf4j.nop/module-info.java  |  5 ++
 .../java/org.slf4j.simple/module-info.java    |  5 ++
 6 files changed, 81 insertions(+), 14 deletions(-)
 create mode 100755 slf4j-api/src/main/java/org.slf4j/module-info.java
 create mode 100755 slf4j-jdk14/src/main/java/org.slf4j.jdk14/module-info.java
 create mode 100755 slf4j-log4j12/src/main/java/org.slf4j.log4j12/module-info.java
 create mode 100755 slf4j-nop/src/main/java/org.slf4j.nop/module-info.java
 create mode 100755 slf4j-simple/src/main/java/org.slf4j.simple/module-info.java

diff --git a/pom.xml b/pom.xml
index 5de77892..fa301793 100755
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,8 @@
     <logback.version>1.0.13</logback.version>
     <junit.version>4.12</junit.version>
     <maven-site-plugin.version>3.3</maven-site-plugin.version>
-    <javadoc.plugin.version>2.10.4</javadoc.plugin.version>
+    <javadoc-plugin.version>2.10.4</javadoc-plugin.version>
+    <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
   </properties>
 
   <developers>
@@ -130,6 +131,20 @@
 
     <pluginManagement>
       <plugins>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-toolchains-plugin</artifactId>
+          <version>1.1</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>toolchain</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -150,20 +165,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
-
+        <version>${maven-compiler-plugin.version}</version>
+       
         <executions>
           <execution>
             <id>default-compile</id>
             <configuration>
-              <!-- compile everything to ensure module-info contains right entries -->
-              <!-- required when JAVA_HOME is JDK 8 or below -->
-              <jdkToolchain>
-                <version>9</version>
-              </jdkToolchain>
-              <release>9</release>
             </configuration>
           </execution>
+
           <execution>
             <id>base-compile</id>
             <goals>
@@ -172,16 +182,13 @@
             <!-- recompile everything for target VM except the module-info.java -->
             <configuration>
               <excludes>
-                <exclude>module-info.java</exclude>
+                <exclude>**/module-info.java</exclude>
               </excludes>
             </configuration>
           </execution>
         </executions>
 
         <configuration>
-          <jdkToolchain>
-            <version>[1.5,9)</version>
-          </jdkToolchain>
           <source>${required.jdk.version}</source>
           <target>${required.jdk.version}</target>
         </configuration>
@@ -287,7 +294,7 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-javadoc-plugin</artifactId>
-              <version>${javadoc.plugin.version}</version>
+              <version>${javadoc-plugin.version}</version>
               <configuration>
                 <linksource>true</linksource>
                 <!--<aggregate>true</aggregate>-->
@@ -343,6 +350,41 @@
       </properties>
     </profile>
 
+    <profile>
+      <id>jigsaw</id>
+      <activation>
+        <jdk>[1.9,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>${maven-compiler-plugin.version}</version>
+            <configuration>
+              <source>${required.jdk.version}</source>
+              <target>${required.jdk.version}</target>
+            </configuration>
+            <executions>
+              <execution>
+                <id>module-infos</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>compile</goal>
+                </goals>
+                <configuration>
+                  <includes>
+                    <include>**/module-info.java</include>
+                  </includes>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+
     <profile>
       <id>javadocjar</id>
       <build>
diff --git a/slf4j-api/src/main/java/org.slf4j/module-info.java b/slf4j-api/src/main/java/org.slf4j/module-info.java
new file mode 100755
index 00000000..437d57cd
--- /dev/null
+++ b/slf4j-api/src/main/java/org.slf4j/module-info.java
@@ -0,0 +1,5 @@
+module org.slf4j { 
+  exports org.slf4j;
+  exports org.slf4j.spi;
+  uses org.slf4j.spi.SLF4JServiceProvider;
+}
diff --git a/slf4j-jdk14/src/main/java/org.slf4j.jdk14/module-info.java b/slf4j-jdk14/src/main/java/org.slf4j.jdk14/module-info.java
new file mode 100755
index 00000000..ffa04093
--- /dev/null
+++ b/slf4j-jdk14/src/main/java/org.slf4j.jdk14/module-info.java
@@ -0,0 +1,5 @@
+module org.slf4j.jdk14 { 
+  requires org.slf4j;
+  requires org.slf4j.spi;
+  provides org.slf4j.spi.SLF4JServiceProvider with org.slf4j.impl.JULServiceProvider;
+}
diff --git a/slf4j-log4j12/src/main/java/org.slf4j.log4j12/module-info.java b/slf4j-log4j12/src/main/java/org.slf4j.log4j12/module-info.java
new file mode 100755
index 00000000..db50856b
--- /dev/null
+++ b/slf4j-log4j12/src/main/java/org.slf4j.log4j12/module-info.java
@@ -0,0 +1,5 @@
+module org.slf4j.log4j12 { 
+  requires org.slf4j;
+  requires org.slf4j.spi;
+  provides org.slf4j.spi.SLF4JServiceProvider with org.slf4j.impl.Log4j12ServiceProvider
+}
diff --git a/slf4j-nop/src/main/java/org.slf4j.nop/module-info.java b/slf4j-nop/src/main/java/org.slf4j.nop/module-info.java
new file mode 100755
index 00000000..77de0d79
--- /dev/null
+++ b/slf4j-nop/src/main/java/org.slf4j.nop/module-info.java
@@ -0,0 +1,5 @@
+module org.slf4j.nop { 
+  requires org.slf4j;
+  requires org.slf4j.spi;
+  provides org.slf4j.spi.SLF4JServiceProvider with org.slf4j.helpers.NOPServiceProvider;
+}
diff --git a/slf4j-simple/src/main/java/org.slf4j.simple/module-info.java b/slf4j-simple/src/main/java/org.slf4j.simple/module-info.java
new file mode 100755
index 00000000..8dc3f7e7
--- /dev/null
+++ b/slf4j-simple/src/main/java/org.slf4j.simple/module-info.java
@@ -0,0 +1,5 @@
+module org.slf4j.simple { 
+  requires org.slf4j;
+  requires org.slf4j.spi;
+  provides org.slf4j.spi.SLF4JServiceProvider with org.slf4j.impl.SimpleServiceProvider;
+}