[hibernate-commits] Hibernate SVN: r17774 - in core/trunk: cache-infinispan and 1 other directories.

Author: hardy.ferentschik Date: 2009-10-16 08:10:32 -0400 (Fri, 16 Oct 2009) New Revision: 17774 Modified: core/trunk/cache-infinispan/pom.xml core/trunk/jdbc4-testing/pom.xml core/trunk/pom.xml Log: moved the jdk6 based modules into a profile to be able to skip them. Also removed the /bin part of the javac command Modified: core/trunk/cache-infinispan/pom.xml =================================================================== --- core/trunk/cache-infinispan/pom.xml 2009-10-16 01:02:14 UTC (rev 17773) +++ core/trunk/cache-infinispan/pom.xml 2009-10-16 12:10:32 UTC (rev 17774) @@ -84,8 +84,12 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.6</source> + <target>1.6</target> + <verbose>true</verbose> + <fork>true</fork> + <executable>${jdbc4_jdk}/javac</executable> + <compilerVersion>1.6</compilerVersion> </configuration> </plugin> <plugin> Modified: core/trunk/jdbc4-testing/pom.xml =================================================================== --- core/trunk/jdbc4-testing/pom.xml 2009-10-16 01:02:14 UTC (rev 17773) +++ core/trunk/jdbc4-testing/pom.xml 2009-10-16 12:10:32 UTC (rev 17774) @@ -50,7 +50,7 @@ <target>1.6</target> <verbose>true</verbose> <fork>true</fork> - <executable>${jdbc4_jdk}/bin/javac</executable> + <executable>${jdbc4_jdk}/javac</executable> <compilerVersion>1.6</compilerVersion> </configuration> </plugin> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-10-16 01:02:14 UTC (rev 17773) +++ core/trunk/pom.xml 2009-10-16 12:10:32 UTC (rev 17774) @@ -21,7 +21,6 @@ <module>core</module> <module>cache-ehcache</module> <module>cache-jbosscache</module> - <module>cache-infinispan</module> <module>cache-oscache</module> <module>cache-swarmcache</module> <module>connection-c3p0</module> @@ -33,7 +32,6 @@ <module>testing</module> <module>testsuite</module> <module>jdbc3-testing</module> - <module>jdbc4-testing</module> <module>tutorials</module> <!-- Need to scope bytecode providers first... @@ -43,6 +41,7 @@ </modules> <build> + <defaultGoal>install</defaultGoal> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -72,8 +71,21 @@ </pluginManagement> </build> - <profiles> + <profiles> <profile> + <id>jdk6-modules</id> + <activation> + <property> + <name>disableJDK6Modules</name> + <value>!true</value> + </property> + </activation> + <modules> + <module>cache-infinispan</module> + <module>jdbc4-testing</module> + </modules> + </profile> + <profile> <id>docs</id> <activation> <property> @@ -87,5 +99,4 @@ </modules> </profile> </profiles> - </project>