Skip to content

Commit

Permalink
revert to mixed jdk 8 and 9 requirement
Browse files Browse the repository at this point in the history
Signed-off-by: Ceki Gulcu <[email protected]>
  • Loading branch information
ceki committed Jan 2, 2024
1 parent f4adff9 commit c63a840
Show file tree
Hide file tree
Showing 20 changed files with 254 additions and 44 deletions.
2 changes: 1 addition & 1 deletion jcl-over-slf4j-blackbox/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</licenses>

<properties>

<jdk.version>${jdk9.version}</jdk.version>
</properties>

<dependencies>
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion log4j-over-slf4j-blackbox/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</licenses>

<properties>

<jdk.version>${jdk9.version}</jdk.version>
</properties>

<dependencies>
Expand Down
File renamed without changes.
30 changes: 29 additions & 1 deletion parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@
<project.build.outputTimestamp>2023-12-28T23:04:51Z</project.build.outputTimestamp>
<latest.1.version>1.7.36</latest.1.version>
<!-- java.util.ServiceLoader requires Java 6 -->
<jdk.version>11</jdk.version>
<jdk.version>8</jdk.version>
<!-- used in test modules, unpublished modules or where it does not matter -->
<jdk9.version>9</jdk9.version>
<maven.compiler.source>${jdk.version}</maven.compiler.source>
<maven.compiler.target>${jdk.version}</maven.compiler.target>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down Expand Up @@ -145,6 +148,31 @@
<release>${jdk.version}</release>
</configuration>
</execution>

<execution>
<id>default-testCompile</id>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<release>${jdk.version}</release>
</configuration>
</execution>

<execution>
<id>module-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>9</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
</compileSourceRoots>
<multiReleaseOutput>true</multiReleaseOutput>
</configuration>
</execution>
</executions>

</plugin>
Expand Down
64 changes: 58 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
<module>jcl-over-slf4j-blackbox</module>
<module>log4j-over-slf4j</module>
<module>log4j-over-slf4j-blackbox</module>
<module>jul-to-slf4j</module>
<module>jul-to-slf4j-blackbox</module>
<module>osgi-over-slf4j</module>
<module>integration</module>
<module>slf4j-migrator</module>
<!-- <module>jul-to-slf4j</module>-->
<!-- <module>jul-to-slf4j-blackbox</module>-->
<!-- <module>osgi-over-slf4j</module>-->
<!-- <module>integration</module>-->
<!-- <module>slf4j-migrator</module>-->
</modules>

<dependencyManagement>
Expand Down Expand Up @@ -166,7 +166,7 @@
<configuration>
<verbose>true</verbose>
<skippedModules>
slf4j-testing,slf4j-ext,log4j-over-slf4j,log4j-over-slf4j-blackbox,jul-to-slf4j-blackbox,slf4j-migrator,osgi-over-slf4j
slf4j-testing,slf4j-jdk-platform-logging,jcl-over-slf4j-blackbox,log4j-over-slf4j-blackbox,jul-to-slf4j-blackbox,slf4j-migrator,osgi-over-slf4j
</skippedModules>
<detectLinks>true</detectLinks>
<doctitle>SLF4J project modules 2.1.0-alpha0</doctitle>
Expand All @@ -176,6 +176,58 @@
<additionalOptions>
<additionalOption>-Xdoclint:none</additionalOption>
</additionalOptions>
<groups>
<group>
<title>SLF4J API packages</title>
<packages>org.slf4j:org.slf4j.spi:org.slf4j.event:org.slf4j.helpers</packages>
</group>

<group>
<title>slf4j-simple package</title>
<packages>org.slf4j.simple</packages>
</group>

<group>
<title>slf4j-nop package</title>
<packages>org.slf4j.nop</packages>
</group>


<group>
<title>slf4j-jdk14 package</title>
<packages>org.slf4j.jul</packages>
</group>


<group>
<title>slf4j-reload4j package</title>
<packages>org.slf4j.reload4j</packages>
</group>


<group>
<title>SLF4J extensions</title>
<packages>
org.slf4j.cal10n:org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent
</packages>
</group>

<group>
<title>Jakarta Commons Logging packages</title>
<packages>org.apache.commons.*</packages>
</group>

<group>
<title>java.util.logging (JUL) to SLF4J bridge</title>
<packages>org.slf4j.bridge</packages>
</group>

<group>
<title>log4j-over-slf4j redirection</title>
<packages>org.apache.log4j:org.apache.log4j.*</packages>
</group>
</groups>

</configuration>
</plugin>
</plugins>
Expand Down
28 changes: 25 additions & 3 deletions slf4j-api/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -59,7 +59,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Import-Package>org.slf4j.spi;version="${range;[===,+);${version_cleanup;${project.version}}}"</Import-Package>
<Import-Package>org.slf4j.spi;version="${range;[===,+);${version_cleanup;${project.version}}}"
</Import-Package>
<!-- Export the client/user package of slf4j-api version 1 to make the slf4j-api bundle in version 2 usable for bundles that only import slf4j-1.x -->
<_exportcontents><![CDATA[
*,\
Expand All @@ -74,8 +75,29 @@
</configuration>
</plugin>

</plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<executions>

<execution>
<id>module-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>${jdk9.version}</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
</compileSourceRoots>
<multiReleaseOutput>true</multiReleaseOutput>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* <p></p>
* <p>As the name indicates, the methods in this class do nothing. In case a return value is expected, a singleton,
* i.e. the unique instance of this class, is returned.
* </p
* </p>
* <p></p>
* <p>Note that the default implementations of {@link Logger#atTrace()}, {@link Logger#atDebug()} , {@link Logger#atInfo()},
* {@link Logger#atWarn()} and {@link Logger#atError()}, return an instance of {@link NOPLoggingEventBuilder}
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion slf4j-ext/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.slf4j.ext</Automatic-Module-Name>
<!-- <Automatic-Module-Name>org.slf4j.ext</Automatic-Module-Name>-->
<Premain-Class>org.slf4j.agent.AgentPremain</Premain-Class>
<!-- what is the proper way to specify the maven full name? /ravn -->
<Boot-Class-Path>../../../../javassist/javassist/3.4.GA/javassist-3.4.GA.jar javassist-3.4.GA.jar javassist.jar</Boot-Class-Path>
Expand Down
62 changes: 33 additions & 29 deletions slf4j-jdk-platform-logging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

<url>https://www.slf4j.org</url>

<properties>
<jdk.version>${jdk9.version}</jdk.version>
</properties>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -36,35 +40,35 @@
<build>
<plugins>
<!-- target Java 9+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<executions>
<execution>
<id>default-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<source>9</source>
<target>9</target>
<release>9</release>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<source>9</source>
<target>9</target>
<release>9</release>
</configuration>
</execution>
</executions>
</plugin>
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
<!-- <version>${maven-compiler-plugin.version}</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>default-compile</id>-->
<!-- <goals>-->
<!-- <goal>compile</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <source>9</source>-->
<!-- <target>9</target>-->
<!-- <release>9</release>-->
<!-- </configuration> -->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>default-testCompile</id>-->
<!-- <goals>-->
<!-- <goal>testCompile</goal> -->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <source>9</source>-->
<!-- <target>9</target>-->
<!-- <release>9</release>-->
<!-- </configuration> -->
<!-- </execution> -->
<!-- </executions> -->
<!-- </plugin>-->

<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
29 changes: 29 additions & 0 deletions slf4j-jdk14/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,33 @@

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<executions>

<execution>
<id>module-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>${jdk9.version}</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
</compileSourceRoots>
<multiReleaseOutput>true</multiReleaseOutput>
</configuration>
</execution>
</executions>
</plugin>
</plugins>


</build>

</project>
File renamed without changes.
26 changes: 26 additions & 0 deletions slf4j-nop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,30 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<executions>

<execution>
<id>module-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>${jdk9.version}</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
</compileSourceRoots>
<multiReleaseOutput>true</multiReleaseOutput>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
File renamed without changes.
29 changes: 29 additions & 0 deletions slf4j-simple/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

<properties>
<module-name>org.slf4j.simple</module-name>

<slf4j.provider.implementation>org.slf4j.simple.SimpleServiceProvider</slf4j.provider.implementation>
<slf4j.provider.type>simple</slf4j.provider.type>
</properties>
Expand All @@ -38,4 +39,32 @@

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<executions>

<execution>
<id>module-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>${jdk9.version}</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
</compileSourceRoots>
<multiReleaseOutput>true</multiReleaseOutput>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

</build>

</project>
File renamed without changes.
Loading

0 comments on commit c63a840

Please sign in to comment.