Author: rombert
Date: Fri Sep 1 09:38:55 2017
New Revision: 1806913
URL: http://svn.apache.org/viewvc?rev=1806913&view=rev
Log:
SLING-7072 - Build failure with Java 9 - unable to create javax script
engine for javascript
Further tweaks to the Java Version Maven Plugin.
Modified:
sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java
Modified: sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml?rev=1806913&r1=1806912&r2=1806913&view=diff
==============================================================================
--- sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml Fri Sep 1
09:38:55 2017
@@ -31,14 +31,20 @@
<artifactId>javaversion-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>0.0.1-SNAPSHOT</version>
- <name>Java version Maven plugin</name>
+ <name>Apache Sling Java Version Maven Plugin</name>
+ <description>Helper Maven plugin that sets various project properties
based on the configured Java version.</description>
<properties>
<maven.version>3.0.5</maven.version>
<!-- should be set to the lowest version supported by the plugin -->
<sling.java.version>6</sling.java.version>
</properties>
-
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/javaversion-maven-plugin</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/javaversion-maven-plugin</developerConnection>
+
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/javaversion-maven-plugin</url>
+ </scm>
<dependencies>
<dependency>
Modified:
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java?rev=1806913&r1=1806912&r2=1806913&view=diff
==============================================================================
---
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java
(original)
+++
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java
Fri Sep 1 09:38:55 2017
@@ -31,8 +31,8 @@ import org.apache.maven.project.MavenPro
*
* <p>The following versions are set:
* <ol>
- * <li><tt>sling.bree</tt> - the value of the OSGi
Bundle-RequiredExecutionEnvironment header.
- * <li><tt>sling.animalSignatures.version</tt> - the value
+ * <li><tt>sling.bree</tt> - the value of the OSGi
Bundle-RequiredExecutionEnvironment header, e.g. <tt>JavaSE-1.8</tt>
+ * <li><tt>sling.animalSignatures.version</tt> - the value to be appended
appended to the artifactId following <tt>java1</tt>, e.g. <tt>8</tt>
* </ol>
* </p>
*
