You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2016/04/26 06:31:20 UTC

[24/34] logging-log4j2 git commit: LOG4J2-1374 & LOG4J2-1375: Migrate tests from Logback 1.1.3 to 1.1.7, Update SLF4J from 1.7.13 to 1.7.21

LOG4J2-1374 & LOG4J2-1375: Migrate tests from Logback 1.1.3 to 1.1.7, Update SLF4J from 1.7.13 to 1.7.21


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/66cc0c83
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/66cc0c83
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/66cc0c83

Branch: refs/heads/LOG4j2-494
Commit: 66cc0c839101424fc7c79659d9abf4c402c871a6
Parents: 2db215b
Author: rpopma <rp...@apache.org>
Authored: Sat Apr 23 20:12:12 2016 +0900
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Mon Apr 25 21:30:30 2016 -0700

----------------------------------------------------------------------
 pom.xml                 | 4 ++--
 src/changes/changes.xml | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/66cc0c83/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index df4140d..8815982 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,8 +187,8 @@
     <!-- <Log4jReleaseManager>Matt Sicker</Log4jReleaseManager>
     <Log4jReleaseKey>FA1C814D</Log4jReleaseKey> -->
     <!-- note that any properties you want available in velocity templates must not use periods! -->
-    <slf4jVersion>1.7.13</slf4jVersion>
-    <logbackVersion>1.1.3</logbackVersion>
+    <slf4jVersion>1.7.21</slf4jVersion>
+    <logbackVersion>1.1.7</logbackVersion>
     <jackson1Version>1.9.13</jackson1Version>
     <jackson2Version>2.7.3</jackson2Version>
     <springVersion>3.2.13.RELEASE</springVersion>

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/66cc0c83/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4c23f35..c5831c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,12 @@
   </properties>
   <body>
     <release version="2.6" date="2016-MM-DD" description="GA Release 2.6">
+      <action issue="LOG4J2-1375" dev="rpopma" type="update">
+        Update SLF4J from 1.7.13 to 1.7.21.
+      </action>
+      <action issue="LOG4J2-1374" dev="rpopma" type="update">
+        Migrate tests from Logback 1.1.3 to 1.1.7.
+      </action>
       <action issue="LOG4J2-1373" dev="rpopma" type="add">
         (GC) Update Logger wrapper Generator tool to generate methods for the new Logger methods.
       </action>