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 2020/06/29 15:36:02 UTC

[sling-feature-launcher-maven-plugin] 03/12: SLING-9526 - Allow launching feature model applications in external processes, non-blocking

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-feature-launcher-maven-plugin.git

commit ef30c6a30403f55c70fdeac407c72a45b194f267
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Jun 24 23:18:56 2020 +0200

    SLING-9526 - Allow launching feature model applications in external processes, non-blocking
    
    Switch to Java 8 as we still need to run the Sling ITs with that version.
---
 pom.xml                                                              | 2 +-
 src/main/java/org/apache/sling/maven/feature/launcher/StartMojo.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1305e2b..3db716f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
     </prerequisites>
 
     <properties>
-        <sling.java.version>11</sling.java.version>
+        <sling.java.version>8</sling.java.version>
         <maven.version>3.3.9</maven.version>
     </properties>
 
diff --git a/src/main/java/org/apache/sling/maven/feature/launcher/StartMojo.java b/src/main/java/org/apache/sling/maven/feature/launcher/StartMojo.java
index 7ec48ab..1c126c8 100644
--- a/src/main/java/org/apache/sling/maven/feature/launcher/StartMojo.java
+++ b/src/main/java/org/apache/sling/maven/feature/launcher/StartMojo.java
@@ -26,6 +26,7 @@ import java.io.InputStreamReader;
 import java.lang.ProcessBuilder.Redirect;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -122,7 +123,7 @@ public class StartMojo
                 args.add("-p");
                 args.add(launch.getId()); // TODO - validate launch id is a valid file name
                 
-                for ( var frameworkProperty : launch.getLauncherArguments().getFrameworkProperties().entrySet() ) {
+                for ( Map.Entry<String, String> frameworkProperty : launch.getLauncherArguments().getFrameworkProperties().entrySet() ) {
                     args.add("-D");
                     args.add(frameworkProperty.getKey()+"="+frameworkProperty.getValue());
                 }