From 0091bcabe301f0264765729b418d30a10523d53c Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Wed, 13 Jun 2007 07:50:11 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@546768 13f79535-47bb-0310-9956-ffa450edef68 --- openjpa-jdbc/pom.xml | 21 ++++++++++++++++++++- openjpa-kernel/pom.xml | 21 ++++++++++++++++++++- openjpa-lib/pom.xml | 21 ++++++++++++++++++++- openjpa-persistence-jdbc/pom.xml | 4 +--- openjpa-xmlstore/pom.xml | 21 ++++++++++++++++++++- 5 files changed, 81 insertions(+), 7 deletions(-) diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml index 983ae8792..86aeb4ff6 100644 --- a/openjpa-jdbc/pom.xml +++ b/openjpa-jdbc/pom.xml @@ -32,6 +32,26 @@ openjpa-parent 1.0.0-SNAPSHOT + + + java14-validate + java14.jar + + + + + maven-compiler-plugin + + + ${java14.jar} + + + + + + + + org.apache.openjpa @@ -49,7 +69,6 @@ - org.apache.maven.plugins maven-compiler-plugin 1.4 diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml index 17afda170..46302e0eb 100644 --- a/openjpa-kernel/pom.xml +++ b/openjpa-kernel/pom.xml @@ -32,6 +32,26 @@ openjpa-parent 1.0.0-SNAPSHOT + + + java14-validate + java14.jar + + + + + maven-compiler-plugin + + + ${java14.jar} + + + + + + + + org.apache.openjpa @@ -67,7 +87,6 @@ - org.apache.maven.plugins maven-compiler-plugin 1.4 diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml index d5f47b1c7..2c9d0d383 100644 --- a/openjpa-lib/pom.xml +++ b/openjpa-lib/pom.xml @@ -32,6 +32,26 @@ openjpa-parent 1.0.0-SNAPSHOT + + + java14-validate + java14.jar + + + + + maven-compiler-plugin + + + ${java14.jar} + + + + + + + + jakarta-regexp @@ -79,7 +99,6 @@ - org.apache.maven.plugins maven-compiler-plugin 1.4 diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml index 2f5415e45..6e4dcf523 100644 --- a/openjpa-persistence-jdbc/pom.xml +++ b/openjpa-persistence-jdbc/pom.xml @@ -32,12 +32,11 @@ openjpa-parent 1.0.0-SNAPSHOT - INFO - + test-derby @@ -374,7 +373,6 @@ - org.apache.maven.plugins maven-compiler-plugin 1.5 diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml index fa4848e7b..077f7d881 100644 --- a/openjpa-xmlstore/pom.xml +++ b/openjpa-xmlstore/pom.xml @@ -32,6 +32,26 @@ openjpa-parent 1.0.0-SNAPSHOT + + + java14-validate + java14.jar + + + + + maven-compiler-plugin + + + ${java14.jar} + + + + + + + + org.apache.openjpa @@ -43,7 +63,6 @@ - org.apache.maven.plugins maven-compiler-plugin 1.4