Return-Path: 
 <commits-return-13114-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 13C8997D9
	for <apmail-jackrabbit-commits-archive@www.apache.org>;
 Tue,  6 Mar 2012 15:04:26 +0000 (UTC)
Received: (qmail 44128 invoked by uid 500); 6 Mar 2012 15:04:26 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 44103 invoked by uid 500); 6 Mar 2012 15:04:25 -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 44096 invoked by uid 99); 6 Mar 2012 15:04:25 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2012 15:04:25 +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, 06 Mar 2012 15:04:23 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 78FE22388BEF;
	Tue,  6 Mar 2012 15:04:02 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1297515 - in /jackrabbit/oak/trunk: oak-core/pom.xml
 oak-parent/pom.xml
Date: Tue, 06 Mar 2012 15:04:02 -0000
To: commits@jackrabbit.apache.org
From: jukka@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120306150402.78FE22388BEF@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jukka
Date: Tue Mar  6 15:04:02 2012
New Revision: 1297515

URL: http://svn.apache.org/viewvc?rev=1297515&view=rev
Log:
OAK-2: Use Java 6 as base platform

Switch to Java 6 and as an extra upgrade JUnit to version 4.10.

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

Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1297515&r1=1297514&r2=1297515&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Tue Mar  6 15:04:02 2012
@@ -64,7 +64,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1297515&r1=1297514&r2=1297515&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Tue Mar  6 15:04:02 2012
@@ -60,16 +60,16 @@
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
-            <target>1.5</target>
-            <source>1.5</source>
+            <target>1.6</target>
+            <source>1.6</source>
           </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
           <configuration>
-            <source>1.5</source>
+            <source>1.6</source>
             <links>
-              <link>http://docs.oracle.com/javase/1.5.0/docs/api/</link>
+              <link>http://docs.oracle.com/javase/6/docs/api/</link>
             </links>
           </configuration>
         </plugin>
@@ -83,4 +83,14 @@
     </pluginManagement>
   </build>
 
-</project>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.10</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+</project>
\ No newline at end of file