Author: steve.ebersole(a)jboss.com Date: 2009-10-16 10:22:29 -0400 (Fri, 16 Oct 2009) New Revision: 17780 Modified: core/trunk/cache-infinispan/pom.xml core/trunk/jdbc4-testing/pom.xml Log: HHH-4499 : JDK 1.6 and modules Modified: core/trunk/cache-infinispan/pom.xml =================================================================== --- core/trunk/cache-infinispan/pom.xml 2009-10-16 13:22:28 UTC (rev 17779) +++ core/trunk/cache-infinispan/pom.xml 2009-10-16 14:22:29 UTC (rev 17780) @@ -86,16 +86,17 @@ <configuration> <source>1.6</source> <target>1.6</target> + <compilerVersion>1.6</compilerVersion> + <executable>${jdk16_home}/bin/javac</executable> + <fork>true</fork> <verbose>true</verbose> - <fork>true</fork> - <executable>${jdbc4_jdk}/javac</executable> - <compilerVersion>1.6</compilerVersion> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <jvm>${jdk16_home}/bin/java</jvm> <excludes> <!-- Skip a long-running test of a prototype class --> <exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude> Modified: core/trunk/jdbc4-testing/pom.xml =================================================================== --- core/trunk/jdbc4-testing/pom.xml 2009-10-16 13:22:28 UTC (rev 17779) +++ core/trunk/jdbc4-testing/pom.xml 2009-10-16 14:22:29 UTC (rev 17780) @@ -31,11 +31,6 @@ <relativePath>../parent/pom.xml</relativePath> </parent> - <properties> - <!-- TODO : move this to local settings.xml --> - <jdbc4_jdk>/opt/java/jdk-1.6</jdbc4_jdk> - </properties> - <artifactId>hibernate-jdbc4-testing</artifactId> <name>JDBC4-JdbcSupport Testing</name> <description>Test support of JDBC4 through JdbcSupport</description> @@ -48,17 +43,17 @@ <configuration> <source>1.6</source> <target>1.6</target> - <verbose>true</verbose> - <fork>true</fork> - <executable>${jdbc4_jdk}/javac</executable> <compilerVersion>1.6</compilerVersion> + <executable>${jdk16_home}/bin/javac</executable> + <fork>true</fork> + <verbose>true</verbose> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <jvm>${jdbc4_jdk}/bin/java</jvm> + <jvm>${jdk16_home}/bin/java</jvm> </configuration> </plugin> </plugins>