You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/06/18 08:26:59 UTC

svn commit: r1833683 - in /jackrabbit/branches/2.14: ./ jackrabbit-parent/pom.xml

Author: reschke
Date: Mon Jun 18 08:26:59 2018
New Revision: 1833683

URL: http://svn.apache.org/viewvc?rev=1833683&view=rev
Log:
JCR-4254: Update Logback version to >= 1.2.0, SLF4J accordingly (ported to 2.14)

Modified:
    jackrabbit/branches/2.14/   (props changed)
    jackrabbit/branches/2.14/jackrabbit-parent/pom.xml

Propchange: jackrabbit/branches/2.14/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 18 08:26:59 2018
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779614,1779632,1780208,1780220,1780406,1785225,1786325,1786330,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1793339,1796980,1797209,1797917,1798586,1799429,1799538,1799549,1799575,1800359,1800378,1800752,1802925,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1809624,1810108,1811667,1812543,1812634,1812994,1814831,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822863,1822947,1822950,1824876,1826230,1826647,1826940,1826964,1833374
+/jackrabbit/trunk:1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779614,1779632,1780208,1780220,1780406,1785225,1786325,1786330,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1793339,1796980,1797209,1797917,1798586,1799429,1799538,1799549,1799575,1800359,1800378,1800752,1802925,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1809624,1810108,1811667,1812543,1812634,1812994,1814831,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824876,1826230,1826647,1826940,1826964,1833374

Modified: jackrabbit/branches/2.14/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-parent/pom.xml?rev=1833683&r1=1833682&r2=1833683&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.14/jackrabbit-parent/pom.xml Mon Jun 18 08:26:59 2018
@@ -50,15 +50,9 @@
     <jetty.version>8.2.0.v20160908</jetty.version>
     <tika.version>1.17</tika.version>
     <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
-    <!-- Note that we're using SLF4J API version 1.6 when compiling     -->
-    <!-- core Oak components but more recent SLF4J and Logback versions -->
-    <!-- when compiling and running test cases and the oak-run jar.     -->
-    <!-- This way it's possible to use Oak also in environments that    -->
-    <!-- only provide SLF4J version 1.6, while still using a more       -->
-    <!-- recent version when we are in control the runtime environment. -->
-    <slf4j.api.version>1.6.6</slf4j.api.version>
-    <slf4j.version>1.7.4</slf4j.version> <!-- sync with logback version -->
-    <logback.version>1.0.12</logback.version>
+    <slf4j.api.version>1.7.25</slf4j.api.version>
+    <slf4j.version>1.7.25</slf4j.version> <!-- sync with logback version -->
+    <logback.version>1.2.3</logback.version>
     <java.version>1.7</java.version>
     <java.version.signature>java17</java.version.signature>
     <skip.coverage>true</skip.coverage>