moved the jdk6 based modules into a profile to be able to skip them. Also removed the /bin part of the javac command
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@17774 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
parent
ca85991589
commit
26dce3ac64
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
17
pom.xml
17
pom.xml
|
@ -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>
|
||||
|
@ -73,6 +72,19 @@
|
|||
</build>
|
||||
|
||||
<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>
|
||||
|
@ -87,5 +99,4 @@
|
|||
</modules>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
|
|
Loading…
Reference in New Issue