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/08/18 20:14:20 UTC

svn commit: r986829 - in /openjpa/branches/2.0.x: openjpa-integration/validation/pom.xml pom.xml

Author: dwoods
Date: Wed Aug 18 18:14:19 2010
New Revision: 986829

URL: http://svn.apache.org/viewvc?rev=986829&view=rev
Log:
OPENJPA-1712 revert to original test-java5 profile setup

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=986829&r1=986828&r2=986829&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml Wed Aug 18 18:14:19 2010
@@ -81,6 +81,27 @@
             </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=986829&r1=986828&r2=986829&view=diff
==============================================================================
--- openjpa/branches/2.0.x/pom.xml (original)
+++ openjpa/branches/2.0.x/pom.xml Wed Aug 18 18:14:19 2010
@@ -308,16 +308,6 @@
             <properties>
                 <java5.home>"java5.home - Must be user supplied"</java5.home>
             </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                </dependency>
-            </dependencies>
             <build>
                 <pluginManagement>
                     <plugins>