Author: sebb
Date: Fri May 14 23:59:55 2010
New Revision: 944522
URL: http://svn.apache.org/viewvc?rev=944522&view=rev
Log:
Apache Parent v7 uses version 1.1 of remote resources plugin which requires
Java 1.5
Use jdk14 profile to revert to 1.0 when using Java 1.4
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=944522&r1=944521&r2=944522&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/pom.xml (original)
+++ jakarta/bsf/branches/bsf3.x/pom.xml Fri May 14 23:59:55 2010
@@ -51,6 +51,8 @@
<jakarta.compiler.compilerVersion />
<jakarta.compiler.javac />
<jakarta.surefire.java />
+ <!-- default to same version as Apache Parent V7 -->
+
<jakarta.remote-resources.version>1.1</jakarta.remote-resources.version>
</properties>
<issueManagement>
@@ -117,6 +119,11 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${jakarta.remote-resources.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -211,6 +218,18 @@
</modules>
<profiles>
+ <!--
+ | Remote resources 1.1 (defined in Apache Parent V7) requires Java 1.5+
+ -->
+ <profile>
+ <id>JDK14</id>
+ <activation>
+ <jdk>1.4</jdk>
+ </activation>
+ <properties>
+
<jakarta.remote-resources.version>1.0</jakarta.remote-resources.version>
+ </properties>
+ </profile>
<!--
| Stop the JDK1.6 ScriptManager failing when it cannot find
| the class org/mozilla/javascript/ContextFactory.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
