You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/05/19 01:36:21 UTC
svn commit: r945960 - /jakarta/bsf/branches/bsf3.x/pom.xml
Author: sebb
Date: Tue May 18 23:36:20 2010
New Revision: 945960
URL: http://svn.apache.org/viewvc?rev=945960&view=rev
Log:
Add Java 1.7 support
Modified:
jakarta/bsf/branches/bsf3.x/pom.xml
Modified: jakarta/bsf/branches/bsf3.x/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/pom.xml?rev=945960&r1=945959&r2=945960&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/pom.xml (original)
+++ jakarta/bsf/branches/bsf3.x/pom.xml Tue May 18 23:36:20 2010
@@ -271,13 +271,13 @@
</properties>
</profile>
<!--
- | Stop the JDK1.6 ScriptManager failing when it cannot find
+ | Stop the JDK1.6+ ScriptManager failing when it cannot find
| the class org/mozilla/javascript/ContextFactory.
-->
<profile>
- <id>JDK16</id>
+ <id>JDK16minimum</id>
<activation>
- <jdk>1.6</jdk>
+ <jdk>[1.6,)</jdk>
</activation>
<dependencies>
<dependency>
@@ -341,6 +341,33 @@
</dependency>
</dependencies>
</profile>
+
+ <!--
+ Profile for running the build using JDK 1.7
+ (JAVA_1_7_HOME needs to be defined, e.g. in settings.xml or an environment variable)
+ -->
+ <profile>
+ <id>java-1.7</id>
+ <properties>
+ <jakarta.compiler.fork>true</jakarta.compiler.fork>
+ <jakarta.compiler.compilerVersion>1.7</jakarta.compiler.compilerVersion>
+ <jakarta.compiler.javac>${JAVA_1_7_HOME}/bin/javac</jakarta.compiler.javac>
+ <jakarta.surefire.java>${JAVA_1_7_HOME}/bin/java</jakarta.surefire.java>
+ </properties>
+ <!--
+ | Stop the JDK1.7 ScriptManager failing when it cannot find
+ | the class org/mozilla/javascript/ContextFactory.
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.6R5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
<!-- The apache-release profile is not suitable (it creates extra artifacts) so provide our own -->
<profile>
<id>release</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org