Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Hardy Ferentschik 2009-10-16 12:10:32 +00:00
parent ca85991589
commit 26dce3ac64
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cache-infinispan/pom.xml
View File

@ -84,8 +84,12 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.5</source> <source>1.6</source>
<target>1.5</target> <target>1.6</target>
<verbose>true</verbose>
<fork>true</fork>
<executable>${jdbc4_jdk}/javac</executable>
<compilerVersion>1.6</compilerVersion>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

2
jdbc4-testing/pom.xml
View File

@ -50,7 +50,7 @@
<target>1.6</target> <target>1.6</target>
<verbose>true</verbose> <verbose>true</verbose>
<fork>true</fork> <fork>true</fork>
<executable>${jdbc4_jdk}/bin/javac</executable> <executable>${jdbc4_jdk}/javac</executable>
<compilerVersion>1.6</compilerVersion> <compilerVersion>1.6</compilerVersion>
</configuration> </configuration>
</plugin> </plugin>

19
pom.xml
View File

@ -21,7 +21,6 @@
<module>core</module> <module>core</module>
<module>cache-ehcache</module> <module>cache-ehcache</module>
<module>cache-jbosscache</module> <module>cache-jbosscache</module>
<module>cache-infinispan</module>
<module>cache-oscache</module> <module>cache-oscache</module>
<module>cache-swarmcache</module> <module>cache-swarmcache</module>
<module>connection-c3p0</module> <module>connection-c3p0</module>
@ -33,7 +32,6 @@
<module>testing</module> <module>testing</module>
<module>testsuite</module> <module>testsuite</module>
<module>jdbc3-testing</module> <module>jdbc3-testing</module>
<module>jdbc4-testing</module>
<module>tutorials</module> <module>tutorials</module>
<!-- <!--
Need to scope bytecode providers first... Need to scope bytecode providers first...
@ -43,6 +41,7 @@
</modules> </modules>
<build> <build>
<defaultGoal>install</defaultGoal>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -72,7 +71,20 @@
</pluginManagement> </pluginManagement>
</build> </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> <profile>
<id>docs</id> <id>docs</id>
<activation> <activation>
@ -87,5 +99,4 @@
</modules> </modules>
</profile> </profile>
</profiles> </profiles>
</project> </project>