fix SLF4J-456

qos-ch · Feb 19, 2019 · fb418db · cowwoc · Feb 19, 2019 · ceki
1 parent e9d4b6a
commit fb418db
Show file tree

Hide file tree

Showing 18 changed files with 177 additions and 42 deletions.
diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml
@@ -16,6 +16,10 @@
   <description>JCL 1.2 implemented over SLF4J</description>
   <url>http://www.slf4j.org</url>
 
+  <properties>
+    <module-name>org.apache.commons.logging</module-name>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -28,4 +32,4 @@
     </dependency>
   </dependencies>
 
-</project>
+</project>
diff --git a/...over-slf4j/src/main/java/module-info.java → ...ver-slf4j/src/main/java9/module-info.java b/...over-slf4j/src/main/java/module-info.java → ...ver-slf4j/src/main/java9/module-info.java
diff --git a/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF b/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@ Bundle-Vendor: SLF4J.ORG
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.slf4j.bridge;version=${parsedVersion.osgiVersion};uses:="org.slf4j,org.slf4j.spi"
 Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},org.slf4j.spi;version=${parsedVersion.osgiVersion}
-Automatic-Module-Name: jul_to_slf4j
+Automatic-Module-Name: jul.to.slf4j
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
@@ -25,6 +25,10 @@
     </license>
   </licenses>
 
+  <properties>
+    <module-name>log4j</module-name>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -37,4 +41,4 @@
     </dependency>
   </dependencies>
 
-</project>
+</project>
diff --git a/...over-slf4j/src/main/java/module-info.java → ...ver-slf4j/src/main/java9/module-info.java b/...over-slf4j/src/main/java/module-info.java → ...ver-slf4j/src/main/java9/module-info.java
diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
   </scm>  
 
   <properties>
-    <stable.version>1.7.25</stable.version>
+    <latest.stable.version>1.7.26</latest.stable.version>
     <!-- java.util.ServiceLoader requires Java 6 -->
     <jdk.version>1.6</jdk.version>
     <maven.compiler.source>${jdk.version}</maven.compiler.source>
@@ -50,6 +50,7 @@
     <maven-site-plugin.version>3.6</maven-site-plugin.version>
     <compiler-plugin.version>3.6.1</compiler-plugin.version>
     <javadoc.plugin.version>2.10.4</javadoc.plugin.version>
+    <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
   </properties>
 
   <developers>
@@ -183,34 +184,45 @@
         <executions>
 
           <execution>
-            <id>base-compile</id>
+            <id>default-compile</id>
             <goals>
               <goal>compile</goal>
             </goals>
             <configuration>
-              <excludes>
-                <exclude>module-info.java</exclude>
-              </excludes>
+              <jdkToolchain>
+                <version>[6, )</version>
+              </jdkToolchain>
+              <source>${jdk.version}</source>
+              <target>${jdk.version}</target>
             </configuration>
           </execution> 
 
-          <execution>
-            <id>default-compile</id>
+          <execution>                      
+            <id>module-compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>          
             <configuration>
               <jdkToolchain>
                 <version>[9, )</version>
               </jdkToolchain>
               <release>9</release>
+              <compileSourceRoots>
+                <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
+              </compileSourceRoots>
+              <outputDirectory>${project.build.outputDirectory}/META-INF/versions/9</outputDirectory>
+              <compilerArgs>
+                <arg>--patch-module</arg>
+                <arg>${module-name}=${project.build.outputDirectory}</arg>
+              </compilerArgs>
             </configuration>
           </execution>
+
+
+
         </executions>
-        <configuration>
-          <jdkToolchain>
-            <version>[1.6, )</version>
-          </jdkToolchain>
-          <source>${jdk.version}</source>
-          <target>${jdk.version}</target>
-        </configuration>
+
       </plugin>
 
       <plugin>
@@ -225,6 +237,7 @@
               <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
               <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
               <Implementation-Version>${project.version}</Implementation-Version>
+              <Multi-Release>true</Multi-Release>
             </manifestEntries>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
           </archive>
@@ -251,7 +264,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.1.2</version>
+        <version>${maven-source-plugin.version}</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -492,6 +505,18 @@
   </profiles>
 
   <pluginRepositories>
+    <pluginRepository>
+         <id>apache-snapshot-repo</id>
+         <name>apache-snapshot-repo</name>
+         <url>https://repository.apache.org/content/groups/snapshots/</url>
+         <releases>
+           <enabled>false</enabled>
+         </releases>
+         <snapshots>
+           <enabled>true</enabled>
+         </snapshots>
+
+    </pluginRepository>
   </pluginRepositories>
 
   <distributionManagement>

diff --git a/release.sh b/release.sh
@@ -0,0 +1,49 @@
+#mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${VERSION_NUMBER} 
+
+MVN='/java/maven-3.5.2//bin/mvn'
+
+PASS=$1
+echo $PASS
+
+function checkExit(){
+    if test "$?" != "0"; then
+      echo Command $1 exited with abnormal status
+      exit 1;
+    else echo $?
+    fi
+}
+
+function echoThenRun () { # echo and then run the command
+  echo $1
+  $1
+  ret=$?
+  echo $ret
+  return $ret
+}
+
+$MVN clean
+checkExit "mvn clean"
+
+
+$MVN install
+checkExit "mvn install"
+
+
+$MVN site:site
+checkExit "mvn site:ste"
+
+
+$MVN assembly:single
+checkExit "mvn assembly:single"
+
+
+$MVN deploy -P javadocjar,sign-artifacts -Dgpg.passphrase=$PASS
+checkExit "mvn deploy -P javadocjar,sign-artifacts -Dgpg.passphrase=xxx"
+
+#$MVN site:deploy -N # with Java 8!!!
+#checkExit "mvn site:deploy -N"
+
+#git tag -m "tagging" -a v_${VERSION_NUMBER}
+#git push --tags
+
+#release version and add next version on jira
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
@@ -18,6 +18,10 @@
 
   <url>http://www.slf4j.org</url>
 
+  <properties>
+    <module-name>org.slf4j</module-name>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -52,4 +56,4 @@
 
   </build>
 
-</project>
+</project>
diff --git a/slf4j-api/src/main/java/module-info.java → slf4j-api/src/main/java9/module-info.java b/slf4j-api/src/main/java/module-info.java → slf4j-api/src/main/java9/module-info.java
diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
@@ -16,6 +16,10 @@
   <description>SLF4J JDK14 Binding</description>
   <url>http://www.slf4j.org</url>
 
+  <properties>
+    <module-name>org.slf4j.jul</module-name>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -31,4 +35,4 @@
     </dependency>
   </dependencies>
 
-</project>
+</project>
diff --git a/slf4j-jdk14/src/main/java/module-info.java → slf4j-jdk14/src/main/java9/module-info.java b/slf4j-jdk14/src/main/java/module-info.java → slf4j-jdk14/src/main/java9/module-info.java
diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
@@ -17,11 +17,15 @@
   <description>SLF4J NOP Binding</description>
   <url>http://www.slf4j.org</url>
 
+  <properties>
+    <module-name>org.slf4j.nop</module-name>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
   </dependencies>
 
-</project>
+</project>
diff --git a/slf4j-nop/src/main/java/module-info.java → slf4j-nop/src/main/java9/module-info.java b/slf4j-nop/src/main/java/module-info.java → slf4j-nop/src/main/java9/module-info.java
diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
@@ -16,6 +16,10 @@
   <description>SLF4J Simple binding</description>
   <url>http://www.slf4j.org</url>
 
+  <properties>
+    <module-name>org.slf4j.simple</module-name>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -31,4 +35,4 @@
     </dependency>
   </dependencies>
 
-</project>
+</project>
diff --git a/slf4j-simple/src/main/java/module-info.java → slf4j-simple/src/main/java9/module-info.java b/slf4j-simple/src/main/java/module-info.java → slf4j-simple/src/main/java9/module-info.java
diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml
@@ -38,7 +38,28 @@
           <outputDirectory>${project.parent.basedir}/target/site</outputDirectory>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>${maven-source-plugin.version}</version>
+        <configuration>
+          <!-- Maven central does not allow entries with ../.. in
+               *-source.jar but requires that they exist. -->
+          <includes>
+            <include>**/META-INF/*</include>
+          </includes>          
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
-</project>
+</project>
diff --git a/slf4j-site/src/site/pages/download.html b/slf4j-site/src/site/pages/download.html
@@ -43,12 +43,12 @@ <h3>Would you like to subscribe to the QOS.CH announcements mailing
 
       <h2>Latest STABLE version</h2>
 
-      <p>Download version ${stable.version} including <i>full source code</i>,
+      <p>Download version ${latest.stable.version} including <i>full source code</i>,
       class files and documentation in ZIP or TAR.GZ format: </p>
 
       <ul>
-        <li><a href="dist/slf4j-${stable.version}.tar.gz"><b>slf4j-${stable.version}.tar.gz</b></a> </li>
-        <li><a href="dist/slf4j-${stable.version}.zip"><b>slf4j-${stable.version}.zip</b></a> </li>    
+        <li><a href="dist/slf4j-${latest.stable.version}.tar.gz"><b>slf4j-${latest.stable.version}.tar.gz</b></a> </li>
+        <li><a href="dist/slf4j-${latest.stable.version}.zip"><b>slf4j-${latest.stable.version}.zip</b></a> </li>    
       </ul>  
 
       <h2>Java 9 Modularized EXPERIMENTAL version</h2>