Author: dwoods
Date: Mon Aug 16 18:17:15 2010
New Revision: 986085
URL: http://svn.apache.org/viewvc?rev=986085&view=rev
Log:
OPENJPA-1712 Move common test-java5 profile to the parent pom
Modified:
openjpa/trunk/openjpa-examples/image-gallery/pom.xml
openjpa/trunk/openjpa-integration/validation/pom.xml
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-examples/image-gallery/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/image-gallery/pom.xml?rev=986085&r1=986084&r2=986085&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/image-gallery/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/image-gallery/pom.xml Mon Aug 16 18:17:15
2010
@@ -45,29 +45,6 @@
<surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
</properties>
- <!-- Test profile for testing with Java SE 5. Apache BVAL requires JAXB deps
-->
- <!-- Note: You have to set -Ptest-java5 and -Djava5.home=path to java5 -->
- <profiles>
- <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>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
Modified: openjpa/trunk/openjpa-integration/validation/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/pom.xml?rev=986085&r1=986084&r2=986085&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/validation/pom.xml Mon Aug 16 18:17:15
2010
@@ -57,27 +57,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/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=986085&r1=986084&r2=986085&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Mon Aug 16 18:17:15 2010
@@ -461,6 +461,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>
