You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2016/02/27 12:00:22 UTC
svn commit: r1732621 - /sling/trunk/parent/pom.xml
Author: rombert
Date: Sat Feb 27 11:00:22 2016
New Revision: 1732621
URL: http://svn.apache.org/viewvc?rev=1732621&view=rev
Log:
SLING-5566 - Use animal sniffer signatures for Java 8
Modified:
sling/trunk/parent/pom.xml
Modified: sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1732621&r1=1732620&r2=1732621&view=diff
==============================================================================
--- sling/trunk/parent/pom.xml (original)
+++ sling/trunk/parent/pom.xml Sat Feb 27 11:00:22 2016
@@ -192,7 +192,6 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
<script language="javascript"> <![CDATA[
var System = java.lang.System;
var bree = "JavaSE-1.6";
- var skipAnimalSniffer = false;
var animalSnifferSignaturesVersion = "6";
var slingJavaVersion = System.getProperty("sling.java.version");
if (!slingJavaVersion) {
@@ -203,18 +202,14 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
bree = "JavaSE-1.7";
System.out.println("Setting Bundle-RequiredExecutionEnvironment=" + bree + " from sling.java.version=" + slingJavaVersion);
} else if ( slingJavaVersion == "8") {
- // there are no published signatures for Java 1.8, so skip execution. However, we also need a valid
- // artifact in the signature, so fallback to the 1.6 signatures and skip checking entirely
- // see also https://github.com/mojohaus/animal-sniffer/issues/1
- skipAnimalSniffer = true;
- bree = "JavaSE-1.8";
+ animalSnifferSignaturesVersion = "8";
+ bree = "JavaSE-1.8";
System.out.println("Setting Bundle-RequiredExecutionEnvironment=" + bree + " from sling.java.version=" + slingJavaVersion);
} else if (slingJavaVersion != "6") {
System.out.println("Unsupported sling.java.version=" + slingJavaVersion + "; must be 6, 7 or 8.");
throw "sling.java.version must be 6, 7 or 8";
}
project.setProperty("sling.bree", bree);
- project.setProperty("animal.sniffer.skip", skipAnimalSniffer);
project.setProperty("sling.animalSignatures.version", animalSnifferSignaturesVersion);
]]></script>
</target>