From 315a0d0e436654be8ff92c3b0d66521ba7e7faa7 Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Mon, 16 Aug 2010 19:22:06 +0000
Subject: [PATCH] OPENJPA-1712 Move common test-java5 profile depends to the
 parent pom

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986101 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-integration/validation/pom.xml | 21 ---------------------
 pom.xml                                | 12 ++++++++++++
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index b7c14dd5e..4d604cf5a 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -81,27 +81,6 @@
             </dependencies>
         </profile>
 
-        <!-- Test profile for testing with Apache BVAL and Java SE 5 -->
-        <!-- Note:  You have to set -Ptest-java5,bval together -->
-        <profile>
-            <id>test-java5</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                    <version>2.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                    <version>2.1.3</version>
-                </dependency>
-            </dependencies>
-        </profile>
-
         <!-- Profile for testing with Hibernate Bean Validation RI -->
         <profile>
             <id>hibernate</id>
diff --git a/pom.xml b/pom.xml
index a8e8f60a6..0c55b518e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -459,6 +459,18 @@
             <properties>
                 <java5.home>"java5.home - Must be user supplied"</java5.home>
             </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <version>2.1</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>2.1.3</version>
+                </dependency>
+            </dependencies>
             <build>
                 <pluginManagement>
                     <plugins>