You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mp...@apache.org on 2007/06/13 09:50:12 UTC
svn commit: r546768 - in /openjpa/trunk: openjpa-jdbc/pom.xml
openjpa-kernel/pom.xml openjpa-lib/pom.xml openjpa-persistence-jdbc/pom.xml
openjpa-xmlstore/pom.xml
Author: mprudhom
Date: Wed Jun 13 00:50:11 2007
New Revision: 546768
URL: http://svn.apache.org/viewvc?view=rev&rev=546768
Log:
Added a 'java14.jar' property that can be used to specify the location of the JDK 1.4 runtime jar, against which we will compile the JDK 1.4-specific modules. This can be used to ensure that JDK 1.5-specific methods and classes don't slip into the JDK 1.4 modules.
Modified:
openjpa/trunk/openjpa-jdbc/pom.xml
openjpa/trunk/openjpa-kernel/pom.xml
openjpa/trunk/openjpa-lib/pom.xml
openjpa/trunk/openjpa-persistence-jdbc/pom.xml
openjpa/trunk/openjpa-xmlstore/pom.xml
Modified: openjpa/trunk/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/pom.xml?view=diff&rev=546768&r1=546767&r2=546768
==============================================================================
--- openjpa/trunk/openjpa-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-jdbc/pom.xml Wed Jun 13 00:50:11 2007
@@ -32,6 +32,26 @@
<artifactId>openjpa-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
+ <profiles>
+ <profile>
+ <id>java14-validate</id>
+ <activation><property><name>java14.jar</name></property></activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArguments>
+ <bootclasspath>${java14.jar}</bootclasspath>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -49,7 +69,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
Modified: openjpa/trunk/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/pom.xml?view=diff&rev=546768&r1=546767&r2=546768
==============================================================================
--- openjpa/trunk/openjpa-kernel/pom.xml (original)
+++ openjpa/trunk/openjpa-kernel/pom.xml Wed Jun 13 00:50:11 2007
@@ -32,6 +32,26 @@
<artifactId>openjpa-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
+ <profiles>
+ <profile>
+ <id>java14-validate</id>
+ <activation><property><name>java14.jar</name></property></activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArguments>
+ <bootclasspath>${java14.jar}</bootclasspath>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -67,7 +87,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
Modified: openjpa/trunk/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/pom.xml?view=diff&rev=546768&r1=546767&r2=546768
==============================================================================
--- openjpa/trunk/openjpa-lib/pom.xml (original)
+++ openjpa/trunk/openjpa-lib/pom.xml Wed Jun 13 00:50:11 2007
@@ -32,6 +32,26 @@
<artifactId>openjpa-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
+ <profiles>
+ <profile>
+ <id>java14-validate</id>
+ <activation><property><name>java14.jar</name></property></activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArguments>
+ <bootclasspath>${java14.jar}</bootclasspath>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
<groupId>jakarta-regexp</groupId>
@@ -79,7 +99,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?view=diff&rev=546768&r1=546767&r2=546768
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Wed Jun 13 00:50:11 2007
@@ -32,12 +32,11 @@
<artifactId>openjpa-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
-
<properties>
<openjpa.loglevel>INFO</openjpa.loglevel>
</properties>
-
<profiles>
+
<!-- Profile for testing with Apache Derby -->
<profile>
<id>test-derby</id>
@@ -374,7 +373,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
Modified: openjpa/trunk/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-xmlstore/pom.xml?view=diff&rev=546768&r1=546767&r2=546768
==============================================================================
--- openjpa/trunk/openjpa-xmlstore/pom.xml (original)
+++ openjpa/trunk/openjpa-xmlstore/pom.xml Wed Jun 13 00:50:11 2007
@@ -32,6 +32,26 @@
<artifactId>openjpa-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
+ <profiles>
+ <profile>
+ <id>java14-validate</id>
+ <activation><property><name>java14.jar</name></property></activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArguments>
+ <bootclasspath>${java14.jar}</bootclasspath>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -43,7 +63,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>