You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/05/23 13:00:42 UTC
svn commit: r1597059 - /sling/trunk/parent/pom.xml
Author: cziegeler
Date: Fri May 23 11:00:42 2014
New Revision: 1597059
URL: http://svn.apache.org/r1597059
Log:
SLING-3602 : Support modules requiring Java 7
Modified:
sling/trunk/parent/pom.xml
Modified: sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1597059&r1=1597058&r2=1597059&view=diff
==============================================================================
--- sling/trunk/parent/pom.xml (original)
+++ sling/trunk/parent/pom.xml Fri May 23 11:00:42 2014
@@ -53,9 +53,10 @@
<organization.logo>http://sling.apache.org/site/media.data/logo.png</organization.logo>
<!--
Java API and class file compliance. This property supports
- one of two values:
+ one of three values:
- 5: Java 1.5 (default)
- 6: Java 6
+ - 7: Java 7
Using anything else causes the set-bundle-required-execution-environment
to fail the build with an exception
-->
@@ -198,9 +199,12 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
if (slingJavaVersion == "6") {
bree = "JavaSE-1.6";
System.out.println("Setting Bundle-RequiredExecutionEnvironment=" + bree + " from sling.java.version=" + slingJavaVersion);
+ } else if (slingJavaVersion == "7") {
+ bree = "JavaSE-1.7";
+ System.out.println("Setting Bundle-RequiredExecutionEnvironment=" + bree + " from sling.java.version=" + slingJavaVersion);
} else if (slingJavaVersion != "5") {
- System.out.println("Unsupported sling.java.version=" + slingJavaVersion + "; must be 5 or 6.");
- throw "sling.java.version must be 5 or 6";
+ System.out.println("Unsupported sling.java.version=" + slingJavaVersion + "; must be 5, 6 or 7.");
+ throw "sling.java.version must be 5, 6 or 7";
}
project.setProperty("sling.bree", bree);
]]></script>
@@ -385,7 +389,7 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.9</version>
+ <version>1.11</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>