Author: jrbauer
Date: Thu Aug 12 22:00:38 2010
New Revision: 985007
URL: http://svn.apache.org/viewvc?rev=985007&view=rev
Log:
OPENJPA-1681 Remove Java 1.6 dependency and add deps required to run jUnits on
Java 1.5
Modified:
openjpa/trunk/openjpa-examples/image-gallery/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=985007&r1=985006&r2=985007&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/image-gallery/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/image-gallery/pom.xml Thu Aug 12 22:00:38
2010
@@ -45,6 +45,29 @@
<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>
<!-- When using bval, commons-lang must be in the dependency list -->
<dependency>
@@ -87,17 +110,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <!-- Disable the annotation processor for now due to a JDK 6 bug
-->
- <compilerArgument>-proc:none</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
<!-- The jar plugin builds a jar containing the image gallery
classes -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
