You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2019/11/16 23:11:45 UTC
[maven] 02/07: [MNG-6779] Update slf4j to 1.7.29
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-6771
in repository https://gitbox.apache.org/repos/asf/maven.git
commit be7b2fedeebf2d46246b1584cbe67bb590c17b60
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Mon Nov 11 14:04:27 2019 +0100
[MNG-6779] Update slf4j to 1.7.29
---
apache-maven/src/main/appended-resources/META-INF/LICENSE.vm | 4 ----
pom.xml | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
index 16fab9c..6f95b96 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -34,10 +34,6 @@ subject to the terms and conditions of the following licenses:
#* *##set ( $spdx = false )
#* *##set ( $includeLicense = true )
#* *###
-#* *##if ( $project.artifact.artifactId == "jcl-over-slf4j" )
-#* *### jcl-over-slf4j is Apache 2.0, even if its pom says MIT
-#* *##set ( $includeLicense = false )
-#* *##end
#* *##if ( $license.name == "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0" )
#* *##set ( $spdx = 'CDDL-1.0' )
#* *##end
diff --git a/pom.xml b/pom.xml
index cdc3cd6..703a7f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@ under the License.
<modelloVersion>1.11</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.4.1</resolverVersion>
- <slf4jVersion>1.7.25</slf4jVersion>
+ <slf4jVersion>1.7.29</slf4jVersion>
<xmlunitVersion>2.2.1</xmlunitVersion>
<powermockVersion>1.7.4</powermockVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>