You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2012/03/06 16:04:02 UTC
svn commit: r1297515 - in /jackrabbit/oak/trunk: oak-core/pom.xml
oak-parent/pom.xml
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