You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2016/12/21 18:50:37 UTC

nifi-minifi git commit: MINIFI-144 Bumping logback version to 1.1.8

Repository: nifi-minifi
Updated Branches:
  refs/heads/master d3bbb8ca1 -> 4514a04fb


MINIFI-144 Bumping logback version to 1.1.8

This closes #67.

Signed-off-by: Aldrin Piri <al...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/4514a04f
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/4514a04f
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/4514a04f

Branch: refs/heads/master
Commit: 4514a04fb75ff39a726cb2fe15157fde072810cf
Parents: d3bbb8c
Author: Joseph Percivall <JP...@apache.org>
Authored: Tue Dec 20 15:43:51 2016 -0500
Committer: Aldrin Piri <al...@apache.org>
Committed: Wed Dec 21 09:47:57 2016 -0500

----------------------------------------------------------------------
 minifi-assembly/NOTICE                                         | 4 ++--
 .../minifi-resources/src/main/resources/conf/logback.xml       | 6 +-----
 pom.xml                                                        | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/4514a04f/minifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/minifi-assembly/NOTICE b/minifi-assembly/NOTICE
index a374875..cff7be1 100644
--- a/minifi-assembly/NOTICE
+++ b/minifi-assembly/NOTICE
@@ -688,8 +688,8 @@ The following binary components are provided under the Eclipse Public License 1.
 
     (EPL 1.0) AspectJ Weaver (org.aspectj:aspectjweaver:jar:1.8.5 - http://www.aspectj.org)
     (EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - http://www.h2database.com/html/license.html)
-    (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.7 - http://logback.qos.ch/)
-    (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.7 - http://logback.qos.ch/)
+    (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.8 - http://logback.qos.ch/)
+    (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.8 - http://logback.qos.ch/)
 
 *****************
 Mozilla Public License v2.0

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/4514a04f/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
----------------------------------------------------------------------
diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
index 33c1534..555a25c 100644
--- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
+++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
@@ -33,11 +33,7 @@
             <maxHistory>10</maxHistory>
             <!-- Max size each log file will be-->
             <maxFileSize>1MB</maxFileSize>
-            <!--
-                Provide a cap of 10 MB across all archive files
-                NOTE: Size constraints are not guaranteed due to a bug in logback as per
-                http://jira.qos.ch/browse/LOGBACK-1166
-            -->
+            <!-- Provide a cap of 10 MB across all archive files -->
             <totalSizeCap>10MB</totalSizeCap>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/4514a04f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 446d8ea..fc3271b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@ limitations under the License.
         <inceptionYear>2016</inceptionYear>
         <org.slf4j.version>1.7.12</org.slf4j.version>
         <org.apache.nifi.version>1.1.0</org.apache.nifi.version>
-        <logback.version>1.1.7</logback.version>
+        <logback.version>1.1.8</logback.version>
         <jetty.version>9.3.9.v20160517</jetty.version>
         <jersey.version>1.19</jersey.version>
         <yammer.metrics.version>2.2.0</yammer.metrics.version>