diff --git a/integration/pom.xml b/integration/pom.xml index ee4e605c8..ee3ec9227 100755 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index ef5cf65d8..8b3c57db6 100755 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index c61dadb53..5075bb7be 100755 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index 77d031461..43c669cd9 100755 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index c78e87423..3d150a270 100755 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 5659ab9b6..1448665f3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-bom - 2.0.14 + 2.0.15 ../pom.xml @@ -26,7 +26,7 @@ - 2024-08-06T20:18:00Z + 2024-08-08T12:55:00Z 1.7.36 8 diff --git a/pom.xml b/pom.xml index a0fb09d2f..f9d971e81 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-bom - 2.0.14 + 2.0.15 pom http://www.slf4j.org diff --git a/release.sh b/release.sh index 30daedec7..9571cb567 100755 --- a/release.sh +++ b/release.sh @@ -46,8 +46,9 @@ echoRunAndCheck "$MVN install" if [ ! -z "$PASS" ] then - export GPG_TTY=$(tty) - echoRunAndCheck "$MVN deploy -P javadocjar,sign-artifacts" + # WARNING deploying without cleaning may leave stale MANIFEST files + export GPG_TTY=$(tty) + echoRunAndCheck "$MVN deploy -P javadocjar,sign-artifacts" fi diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 4db3f3b21..0752a2e3b 100755 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/Slf4jEnvUtil.java b/slf4j-api/src/main/java/org/slf4j/helpers/Slf4jEnvUtil.java index 9921b02ed..690829302 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/Slf4jEnvUtil.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/Slf4jEnvUtil.java @@ -1,8 +1,37 @@ +/* + * Copyright (c) 2004-2024 QOS.ch + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package org.slf4j.helpers; import java.lang.module.ModuleDescriptor; import java.util.Optional; +/** + * Various utility methods + * + * @since 2.0.14 + */ public class Slf4jEnvUtil { @@ -12,7 +41,7 @@ public class Slf4jEnvUtil { *

* * @return current version or null if missing version data - * @since 1.3.0 + * @since 2.0.14 */ static public String slf4jVersion() { String moduleVersion = slf4jVersionByModule(); @@ -32,7 +61,7 @@ static public String slf4jVersion() { * available. *

* - * @since 1.3.0 + * @since 2.0.14 * @return current version or null if missing version data */ static private String slf4jVersionByModule() { diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index a7d92bdae..b5aa02d52 100755 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml diff --git a/slf4j-jdk-platform-logging/pom.xml b/slf4j-jdk-platform-logging/pom.xml index fccef0d6a..21b774fce 100644 --- a/slf4j-jdk-platform-logging/pom.xml +++ b/slf4j-jdk-platform-logging/pom.xml @@ -8,7 +8,7 @@ slf4j-parent org.slf4j - 2.0.14 + 2.0.15 ../parent/pom.xml diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 567cfcc30..d52f754e1 100755 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index a380a60c6..c6da9adcf 100755 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -8,7 +8,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml @@ -24,7 +24,7 @@ org.slf4j slf4j-reload4j - 2.0.14 + 2.0.15 diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index fc6316a34..b9142919c 100755 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 746bc8097..78441960d 100755 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml diff --git a/slf4j-reload4j/pom.xml b/slf4j-reload4j/pom.xml index 1c64b3847..da98c8ca1 100644 --- a/slf4j-reload4j/pom.xml +++ b/slf4j-reload4j/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index b3a57a564..cf4e8fb29 100755 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.14 + 2.0.15 ../parent/pom.xml