You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/02/19 03:52:52 UTC
svn commit: r911682 - in /openjpa/trunk: openjpa-examples/pom.xml
openjpa-integration/osgi-itests/pom.xml openjpa-integration/tck/pom.xml
openjpa-kernel/pom.xml pom.xml
Author: dwoods
Date: Fri Feb 19 02:52:51 2010
New Revision: 911682
URL: http://svn.apache.org/viewvc?rev=911682&view=rev
Log:
OPENJPA-1520 Compile for 1.6 and update javadoc links to use 1.6
Modified:
openjpa/trunk/openjpa-examples/pom.xml
openjpa/trunk/openjpa-integration/osgi-itests/pom.xml
openjpa/trunk/openjpa-integration/tck/pom.xml
openjpa/trunk/openjpa-kernel/pom.xml
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/pom.xml?rev=911682&r1=911681&r2=911682&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/pom.xml Fri Feb 19 02:52:51 2010
@@ -62,8 +62,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
<!--
need to skip reversemapping since it depends on
classes that are generated by the build.xml file
Modified: openjpa/trunk/openjpa-integration/osgi-itests/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/osgi-itests/pom.xml?rev=911682&r1=911681&r2=911682&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/osgi-itests/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/osgi-itests/pom.xml Fri Feb 19 02:52:51 2010
@@ -224,14 +224,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: openjpa/trunk/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/tck/pom.xml?rev=911682&r1=911681&r2=911682&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/tck/pom.xml Fri Feb 19 02:52:51 2010
@@ -191,25 +191,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>[1.5,)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
Modified: openjpa/trunk/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/pom.xml?rev=911682&r1=911681&r2=911682&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/pom.xml (original)
+++ openjpa/trunk/openjpa-kernel/pom.xml Fri Feb 19 02:52:51 2010
@@ -75,7 +75,7 @@
<phase>generate-sources</phase>
<configuration>
<buildNodeFiles>false</buildNodeFiles>
- <jdkVersion>1.5</jdkVersion>
+ <jdkVersion>1.6</jdkVersion>
</configuration>
<goals>
<goal>jjtree-javacc</goal>
Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=911682&r1=911681&r2=911682&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Fri Feb 19 02:52:51 2010
@@ -309,8 +309,8 @@
<verbose>false</verbose>
<maxmemory>512m</maxmemory>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- <link>http://java.sun.com/javaee/5/docs/api</link>
+ <link>http://java.sun.com/javase/6/docs/api</link>
+ <link>http://java.sun.com/javaee/6/docs/api</link>
<link>http://jakarta.apache.org/commons/collections/api-release</link>
</links>
</configuration>
@@ -479,8 +479,8 @@
<!-- <linksource>true</linksource> -->
<maxmemory>512m</maxmemory>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- <link>http://java.sun.com/javaee/5/docs/api</link>
+ <link>http://java.sun.com/javase/6/docs/api</link>
+ <link>http://java.sun.com/javaee/6/docs/api</link>
<link>http://jakarta.apache.org/commons/collections/api-release</link>
</links>
</configuration>
@@ -735,8 +735,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>