Skip to content

Commit

Permalink
update certain plugins, add parent-pom.xml as a module fixing SLF4J-596
Browse files Browse the repository at this point in the history
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
  • Loading branch information
ceki committed Jul 12, 2023
1 parent 06fa09a commit 3f20e0d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 18 deletions.
11 changes: 0 additions & 11 deletions jul-to-slf4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,6 @@

<build>
<plugins>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Automatic-Module-Name>jul.to.slf4j</Automatic-Module-Name>
</instructions>
</configuration>
</plugin>

</plugins>
</build>

Expand Down
11 changes: 5 additions & 6 deletions parent-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-bom</artifactId>
<version>2.0.8-SNAPSHOT</version>
<relativePath>pom.xml</relativePath>
</parent>

<groupId>org.slf4j</groupId>

<artifactId>slf4j-parent</artifactId>
<packaging>pom</packaging>

<name>SLF4J Parent OM</name>
<description>Top SLF4J project parent pom.xml file</description>
<url>http://www.slf4j.org</url>
Expand All @@ -39,7 +38,7 @@

<properties>
<!-- yyyy-MM-dd'T'HH:mm:ss'Z' -->
<project.build.outputTimestamp>2023-03-17T19:40:51Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2023-07-12T19:48:00Z</project.build.outputTimestamp>
<latest.1.version>1.7.36</latest.1.version>
<!-- java.util.ServiceLoader requires Java 6 -->
<jdk.version>8</jdk.version>
Expand All @@ -55,8 +54,8 @@
<jcl.version>1.2</jcl.version>
<junit.version>4.13.1</junit.version>
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<description>SLF4J project BOM</description>

<modules>
<module>parent-pom.xml</module>
<module>slf4j-api</module>
<module>slf4j-simple</module>
<module>slf4j-nop</module>
Expand Down
2 changes: 1 addition & 1 deletion slf4j-log4j12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<relocation>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<version>2.0.7</version>
<version>2.0.8-SNAPSHOT</version>
</relocation>
</distributionManagement>

Expand Down

0 comments on commit 3f20e0d

Please sign in to comment.