Author: dwoods
Date: Mon Aug 16 19:22:06 2010
New Revision: 986101

URL: http://svn.apache.org/viewvc?rev=986101&view=rev
Log:
OPENJPA-1712 Move common test-java5 profile depends to the parent pom

Modified:
    openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml
    openjpa/branches/2.0.x/pom.xml

Modified: openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml?rev=986101&r1=986100&r2=986101&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml Mon Aug 16 
19:22:06 2010
@@ -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>

Modified: openjpa/branches/2.0.x/pom.xml
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/pom.xml?rev=986101&r1=986100&r2=986101&view=diff
==============================================================================
--- openjpa/branches/2.0.x/pom.xml (original)
+++ openjpa/branches/2.0.x/pom.xml Mon Aug 16 19:22:06 2010
@@ -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>


Reply via email to