From 6fd9db9b5eef541d9648d486b5db096ed5d00b37 Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Fri, 16 Jun 2023 18:05:17 +0200 Subject: [PATCH] add BOM file, fixes SLF4J-437 Signed-off-by: Ceki Gulcu --- integration/pom.xml | 1 + jcl-over-slf4j/pom.xml | 1 + .../maven/org.slf4j/jcl-over-slf4j/pom.xml | 43 -- jul-to-slf4j/pom.xml | 1 + log4j-over-slf4j/pom.xml | 1 + osgi-over-slf4j/pom.xml | 1 + parent-pom.xml | 528 +++++++++++++++++ pom.xml | 556 ++---------------- slf4j-api/pom.xml | 1 + slf4j-ext/pom.xml | 1 + slf4j-jdk-platform-logging/pom.xml | 1 + slf4j-jdk14/pom.xml | 1 + slf4j-log4j12/pom.xml | 1 + slf4j-migrator/pom.xml | 1 + slf4j-nop/pom.xml | 1 + slf4j-reload4j/pom.xml | 1 + slf4j-simple/pom.xml | 1 + 17 files changed, 597 insertions(+), 544 deletions(-) delete mode 100644 jcl-over-slf4j/x/META-INF/maven/org.slf4j/jcl-over-slf4j/pom.xml create mode 100644 parent-pom.xml diff --git a/integration/pom.xml b/integration/pom.xml index 22fd57bf2..5cd07c22f 100755 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -8,6 +8,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml integration diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 240b2b0f1..19481df61 100755 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -6,6 +6,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml 4.0.0 diff --git a/jcl-over-slf4j/x/META-INF/maven/org.slf4j/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/x/META-INF/maven/org.slf4j/jcl-over-slf4j/pom.xml deleted file mode 100644 index a959f2c96..000000000 --- a/jcl-over-slf4j/x/META-INF/maven/org.slf4j/jcl-over-slf4j/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - org.slf4j - slf4j-parent - 2.0.6 - - - 4.0.0 - - jcl-over-slf4j - jar - JCL 1.2 implemented over SLF4J - JCL 1.2 implemented over SLF4J - http://www.slf4j.org - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - org.apache.commons.logging - - - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-jdk14 - test - - - - diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index d51b08da1..52b8f0f8d 100755 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -8,6 +8,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml jul-to-slf4j diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index 527103329..c9d12ad81 100755 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -8,6 +8,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index be3554b65..d3ec24baf 100755 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -8,6 +8,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml osgi-over-slf4j diff --git a/parent-pom.xml b/parent-pom.xml new file mode 100644 index 000000000..02f80f258 --- /dev/null +++ b/parent-pom.xml @@ -0,0 +1,528 @@ + + + + 4.0.0 + + + org.slf4j + slf4j-bom + 2.0.8-SNAPSHOT + + + org.slf4j + slf4j-parent + pom + + SLF4J Parent OM + Top SLF4J project parent pom.xml file + http://www.slf4j.org + + + QOS.ch + http://www.qos.ch + + 2005 + + + + MIT License + http://www.opensource.org/licenses/mit-license.php + repo + + + + + https://github.com/qos-ch/slf4j + scm:git:https://github.com/qos-ch/slf4j.git + + + + + 2023-03-17T19:40:51Z + 1.7.36 + + 8 + ${jdk.version} + ${jdk.version} + UTF-8 + UTF-8 + UTF-8 + + 0.8.1 + 1.2.22 + 1.2.10 + 1.2 + 4.13.1 + 3.7.1 + 3.8.1 + 3.0.0-M5 + 3.5.0 + 3.2.1 + 3.0.0-M1 + 3.2.0 + 3.1.1 + 5.1.8 + + + + + ceki + Ceki Gulcu + ceki@qos.ch + + + + + + + junit + junit + ${junit.version} + test + + + + + + + + ch.qos.reload4j + reload4j + ${reload4j.version} + + + + ch.qos.cal10n + cal10n-api + ${cal10n.version} + + + + + + + + + org.apache.maven.wagon + wagon-ssh + 2.10 + + + + + + ${project.basedir}/src/main/resources + true + + + + . + META-INF + + LICENSE.txt + + + + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.14 + + + org.codehaus.mojo.signature + java16 + 1.0 + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + + default-compile + + compile + + + ${jdk.version} + ${jdk.version} + + + + + module-compile + compile + + compile + + + 9 + + ${project.basedir}/src/main/java9 + + true + + + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + + default-jar + package + + jar + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + true + + + + + + + org.apache.felix + maven-bundle-plugin + ${maven-bundle-plugin.version} + + true + + + ${replacestring;${project.artifactId};-;.} + SLF4J.ORG + <_snapshot/> + <_exportcontents>!META-INF.versions.9,*;-noimport:=true + ${project.description} + ${project.url} + ${maven.compiler.source} + ${maven.compiler.target} + ${project.version} + ${project.artifactId} + true + <_removeheaders>Private-Package,Bundle-SCM, Bundle-Developers, Include-Resource + + + + + bundle-manifest + process-classes + + manifest + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + 1 + false + plain + false + + **/AllTest.java + **/PackageTest.java + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + package + + jar + + + + + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin.version} + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + + + + + + + + + org.apache.maven.plugins + maven-jxr-plugin + ${maven-jxr-plugin.version} + + true + target/site/apidocs/ + true + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + true + true + true + + -Xdoclint:none + + org.slf4j.migrator:org.slf4j.migrator.* + + **/module-info.java + + + + + SLF4J packages + org.slf4j:org.slf4j.* + + + + SLF4J extensions + + org.slf4j.cal10n:org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent + + + + + Jakarta Commons Logging packages + org.apache.commons.* + + + + java.util.logging (JUL) to SLF4J bridge + org.slf4j.bridge + + + + Apache log4j + org.apache.log4j:org.apache.log4j.* + + + + + + + + + + + skipTests + + true + + + + + javadocjar + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + attach-javadocs + + jar + + + + + -Xdoclint:none + false + + **/module-info.java + + + + + + + + + license + + + + com.google.code.maven-license-plugin + maven-license-plugin + +
src/main/licenseHeader.txt
+ false + true + true + + src/**/*.java + + true + true + + 1999 + + + src/main/javadocHeaders.xml + +
+
+
+
+ + + +
+ + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.1 + + + sign-artifacts + verify + + sign + + + + + + + + + + generate-osgi-service-loader-mediator-entries + + + src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider + + + + + + + org.apache.felix + maven-bundle-plugin + + + ="org.slf4j.spi.SLF4JServiceProvider";type=${slf4j.provider.type};effective:=active, + osgi.serviceloader;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register:="${slf4j.provider.implementation}";type=${slf4j.provider.type} + ]]> + =1.0.0)(!(version>=2.0.0)))" + ]]> + + + + + + + + +
+ + + + apache-snapshot-repo + apache-snapshot-repo + https://repository.apache.org/content/groups/snapshots/ + + false + + + true + + + + + + + + + + + sonatype-nexus-staging + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + +
diff --git a/pom.xml b/pom.xml index 40029a5a5..6ec986eb3 100755 --- a/pom.xml +++ b/pom.xml @@ -5,68 +5,13 @@ 4.0.0 org.slf4j - slf4j-parent + slf4j-bom 2.0.8-SNAPSHOT - pom - SLF4J - Top SLF4J project pom.xml file - http://www.slf4j.org - - - QOS.ch - http://www.qos.ch - - 2005 - - - - MIT License - http://www.opensource.org/licenses/mit-license.php - repo - - - - https://github.com/qos-ch/slf4j - scm:git:https://github.com/qos-ch/slf4j.git - - - - - 2023-03-17T19:40:51Z - 1.7.36 - - 8 - ${jdk.version} - ${jdk.version} - UTF-8 - UTF-8 - UTF-8 - - 0.8.1 - 1.2.22 - 1.2.10 - 1.2 - 4.13.1 - 3.7.1 - 3.8.1 - 3.0.0-M5 - 3.5.0 - 3.2.1 - 3.0.0-M1 - 3.2.0 - 3.1.1 - 5.1.8 - - - - - ceki - Ceki Gulcu - ceki@qos.ch - - + + SLF4J BOM + SLF4J project BOM slf4j-api @@ -83,18 +28,8 @@ osgi-over-slf4j integration slf4j-migrator - - - - junit - junit - ${junit.version} - test - - - @@ -106,454 +41,73 @@ org.slf4j - slf4j-jdk14 + slf4j-simple ${project.version} + + org.slf4j + slf4j-nop + ${project.version} + org.slf4j - slf4j-simple + slf4j-jdk14 ${project.version} + + + org.slf4j + slf4j-jdk-platform-logging + ${project.version} + + + + org.slf4j + slf4j-log4j12 + ${project.version} + + + + org.slf4j + slf4j-reload4j + ${project.version} + + + + org.slf4j + slf4j-ext + ${project.version} + + + + org.slf4j + jcl-over-slf4j + ${project.version} + + + + org.slf4j + log4j-over-slf4j + ${project.version} + + - ch.qos.reload4j - reload4j - ${reload4j.version} + org.slf4j + jul-to-slf4j + ${project.version} - ch.qos.cal10n - cal10n-api - ${cal10n.version} + org.slf4j + osgi-over-slf4j + ${project.version} + - - - - - org.apache.maven.wagon - wagon-ssh - 2.10 - - - - - - ${project.basedir}/src/main/resources - true - - - - . - META-INF - - LICENSE.txt - - - - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.14 - - - org.codehaus.mojo.signature - java16 - 1.0 - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - - - default-compile - - compile - - - ${jdk.version} - ${jdk.version} - - - - - module-compile - compile - - compile - - - 9 - - ${project.basedir}/src/main/java9 - - true - - - - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - - default-jar - package - - jar - - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - true - - - - - - - org.apache.felix - maven-bundle-plugin - ${maven-bundle-plugin.version} - - true - - - ${replacestring;${project.artifactId};-;.} - SLF4J.ORG - <_snapshot/> - <_exportcontents>!META-INF.versions.9,*;-noimport:=true - ${project.description} - ${project.url} - ${maven.compiler.source} - ${maven.compiler.target} - ${project.version} - ${project.artifactId} - true - <_removeheaders>Private-Package,Bundle-SCM, Bundle-Developers, Include-Resource - - - - - bundle-manifest - process-classes - - manifest - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - 1 - false - plain - false - - **/AllTest.java - **/PackageTest.java - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - package - - jar - - - - - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.0.0 - - - - - - - - org.apache.maven.plugins - maven-jxr-plugin - ${maven-jxr-plugin.version} - - true - target/site/apidocs/ - true - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - true - true - true - - -Xdoclint:none - - org.slf4j.migrator:org.slf4j.migrator.* - - **/module-info.java - - - - - SLF4J packages - org.slf4j:org.slf4j.* - - - - SLF4J extensions - - org.slf4j.cal10n:org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent - - - - - Jakarta Commons Logging packages - org.apache.commons.* - - - - java.util.logging (JUL) to SLF4J bridge - org.slf4j.bridge - - - - Apache log4j - org.apache.log4j:org.apache.log4j.* - - - - - - - - - - - skipTests - - true - - - - - javadocjar - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - attach-javadocs - - jar - - - - - -Xdoclint:none - false - - **/module-info.java - - - - - - - - - license - - - - com.google.code.maven-license-plugin - maven-license-plugin - -
src/main/licenseHeader.txt
- false - true - true - - src/**/*.java - - true - true - - 1999 - - - src/main/javadocHeaders.xml - -
-
-
-
- - - -
- - - sign-artifacts - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.1 - - - sign-artifacts - verify - - sign - - - - - - - - - - generate-osgi-service-loader-mediator-entries - - - src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider - - - - - - - org.apache.felix - maven-bundle-plugin - - - ="org.slf4j.spi.SLF4JServiceProvider";type=${slf4j.provider.type};effective:=active, - osgi.serviceloader;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register:="${slf4j.provider.implementation}";type=${slf4j.provider.type} - ]]> - =1.0.0)(!(version>=2.0.0)))" - ]]> - - - - - - - - -
- - - - apache-snapshot-repo - apache-snapshot-repo - https://repository.apache.org/content/groups/snapshots/ - - false - - - true - - - - - - - - - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 4fd443be5..57c3d5461 100755 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -8,6 +8,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml slf4j-api diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index 2cdf11898..b21382c61 100755 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -8,6 +8,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml slf4j-ext diff --git a/slf4j-jdk-platform-logging/pom.xml b/slf4j-jdk-platform-logging/pom.xml index bc4d11dfd..29a45c0c5 100644 --- a/slf4j-jdk-platform-logging/pom.xml +++ b/slf4j-jdk-platform-logging/pom.xml @@ -9,6 +9,7 @@ slf4j-parent org.slf4j 2.0.8-SNAPSHOT + ../parent-pom.xml slf4j-jdk-platform-logging diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 6639b1e52..de08b29f5 100755 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -8,6 +8,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml slf4j-jdk14 diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 7cb232185..f0306598f 100755 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -9,6 +9,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml slf4j-log4j12 diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index 1bbfd0cf9..45ad88e32 100755 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -8,6 +8,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml slf4j-migrator diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index b94300f11..e216ce434 100755 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -8,6 +8,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml slf4j-nop diff --git a/slf4j-reload4j/pom.xml b/slf4j-reload4j/pom.xml index 6ed24dae9..c914b8ac0 100644 --- a/slf4j-reload4j/pom.xml +++ b/slf4j-reload4j/pom.xml @@ -8,6 +8,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml slf4j-reload4j diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index debdc03a6..e110894c9 100755 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -8,6 +8,7 @@ org.slf4j slf4j-parent 2.0.8-SNAPSHOT + ../parent-pom.xml slf4j-simple