Return-Path: 
 <commits-return-14150-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org
Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E7A7010761
	for <apmail-jackrabbit-commits-archive@www.apache.org>;
 Tue,  7 May 2013 13:50:03 +0000 (UTC)
Received: (qmail 20872 invoked by uid 500); 7 May 2013 13:50:03 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 20658 invoked by uid 500); 7 May 2013 13:49:58 -0000
Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:commits@jackrabbit.apache.org>
List-Id: <commits.jackrabbit.apache.org>
Reply-To: dev@jackrabbit.apache.org
Delivered-To: mailing list commits@jackrabbit.apache.org
Received: (qmail 20614 invoked by uid 99); 7 May 2013 13:49:57 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 May 2013 13:49:57 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 May 2013 13:49:56 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id AFCC52388962;
	Tue,  7 May 2013 13:49:35 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1479908 - /jackrabbit/trunk/jackrabbit-parent/pom.xml
Date: Tue, 07 May 2013 13:49:35 -0000
To: commits@jackrabbit.apache.org
From: jukka@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130507134935.AFCC52388962@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jukka
Date: Tue May  7 13:49:35 2013
New Revision: 1479908

URL: http://svn.apache.org/r1479908
Log:
JCR-3591: Upgrade to latest Logback

Modified:
    jackrabbit/trunk/jackrabbit-parent/pom.xml

Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=1479908&r1=1479907&r2=1479908&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Tue May  7 13:49:35 2013
@@ -43,12 +43,19 @@
   </issueManagement>
 
   <properties>
-    <slf4j.version>1.6.4</slf4j.version>
-    <logback.version>1.0.0</logback.version>
     <jetty.version>6.1.22</jetty.version>
     <tika.version>1.3</tika.version>
-    <clirr.baseline.version>2.2.0</clirr.baseline.version>
     <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
+    <clirr.baseline.version>2.2.0</clirr.baseline.version>
+    <!-- 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>
   </properties>
 
   <url>http://jackrabbit.apache.org/</url>
@@ -332,7 +339,7 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
+        <version>${slf4j.api.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>