Added support for Felix 5.6.X, 6.0.0, 6.0.1, 6.0.2 and Java 9

pax-runner-platform-felix/src/main/java/org/ops4j/pax/runner/platform/felix/internal/Activator.java

@@ -85,6 +85,16 @@ protected PlatformBuilder[] createPlatformBuilders( final BundleContext bundleCo
             new FelixPlatformBuilderF160( bundleContext, "5.0.1" ),
             new FelixPlatformBuilderF160( bundleContext, "5.2.0" ),
             new FelixPlatformBuilderF160( bundleContext, "5.4.0" ),
+                new FelixPlatformBuilderF160( bundleContext, "5.6.0" ),
+                new FelixPlatformBuilderF160( bundleContext, "5.6.1" ),
+                new FelixPlatformBuilderF160( bundleContext, "5.6.2" ),
+                new FelixPlatformBuilderF160( bundleContext, "5.6.4" ),
+                new FelixPlatformBuilderF160( bundleContext, "5.6.6" ),
+                new FelixPlatformBuilderF160( bundleContext, "5.6.8" ),
+                new FelixPlatformBuilderF160( bundleContext, "5.6.10" ),
+                new FelixPlatformBuilderF160( bundleContext, "6.0.0" ),
+                new FelixPlatformBuilderF160( bundleContext, "6.0.1" ),
+                new FelixPlatformBuilderF160( bundleContext, "6.0.2" ),
             new FelixPlatformBuilderSnapshot( bundleContext )
         };
     }

pax-runner-platform-felix/src/main/java/org/ops4j/pax/runner/platform/felix/internal/FelixPlatformBuilder.java

@@ -157,7 +157,9 @@ public void prepare( final PlatformContext context )
             this.appendFrameworkStorage( context, writer );
             // execution environments
             {
-                writer.append( Constants.FRAMEWORK_EXECUTIONENVIRONMENT, context.getExecutionEnvironment() );
+                if( context.getExecutionEnvironment() != null && !context.getExecutionEnvironment().isEmpty()) {
+                    writer.append(Constants.FRAMEWORK_EXECUTIONENVIRONMENT, context.getExecutionEnvironment());
+                }
             }
             // boot delegation packages
             {
@@ -169,7 +171,9 @@ public void prepare( final PlatformContext context )
             }
             // system packages
             {
-                writer.append( Constants.FRAMEWORK_SYSTEMPACKAGES, context.getSystemPackages() );
+                if( context.getExecutionEnvironment() != null &&  !context.getExecutionEnvironment().isEmpty()) {
+                    writer.append(Constants.FRAMEWORK_SYSTEMPACKAGES, context.getSystemPackages());
+                }
             }
 
             if( bundles != null && bundles.size() > 0 )

pax-runner-platform-felix/src/main/resources/META-INF/platform-felix/definition-5.6.0.xml

@@ -0,0 +1,46 @@
+<platform>
+
+    <name>Felix 5.6.0</name>
+    <system>link:classpath:runner-links/org.apache.felix.main-5.6.0.link</system>
+
+    <packages>
+        org.osgi.dto;version="1.0",
+        org.osgi.framework;version="1 .8",
+        org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",
+        org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",
+        org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",
+        org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",
+        org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",
+        org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",
+        org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",
+        org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",
+        org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",
+        org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",
+        org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",
+        org.osgi.resource;version="1.0",
+        org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",
+        org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",
+        org.osgi.service.resolver;version="1.0";uses:="org.osgi.resource",
+        org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",
+        org.osgi.service.url;version="1.0",
+        org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.fra mework"
+    </packages>
+
+    <profile name="minimal" default="true"/>
+
+    <profile name="tui" extends="minimal">
+        <bundle>
+            <name>Apache Felix Gogo Command (0.16.0)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.command-0.16.0.link</url>
+        </bundle>
+        <bundle>
+            <name>Apache Felix Gogo Runtime (0.16.2)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.runtime-0.16.2.link</url>
+        </bundle>
+        <bundle>
+            <name>Apache Felix Gogo Shell (0.12.0)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.shell-0.12.0.link</url>
+        </bundle>
+    </profile>
+
+</platform>

pax-runner-platform-felix/src/main/resources/META-INF/platform-felix/definition-5.6.1.xml

@@ -0,0 +1,46 @@
+<platform>
+
+    <name>Felix 5.6.1</name>
+    <system>link:classpath:runner-links/org.apache.felix.main-5.6.1.link</system>
+
+    <packages>
+        org.osgi.dto;version="1.0",
+        org.osgi.framework;version="1.8",
+        org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",
+        org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",
+        org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",
+        org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",
+        org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",
+        org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",
+        org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",
+        org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",
+        org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",
+        org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",
+        org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",
+        org.osgi.resource;version="1.0",
+        org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",
+        org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",
+        org.osgi.service.resolver;version="1.0";uses:="org.osgi.resource",
+        org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",
+        org.osgi.service.url;version="1.0",
+        org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework"
+    </packages>
+
+    <profile name="minimal" default="true"/>
+
+    <profile name="tui" extends="minimal">
+        <bundle>
+            <name>Apache Felix Gogo Command (0.16.0)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.command-0.16.0.link</url>
+        </bundle>
+        <bundle>
+            <name>Apache Felix Gogo Runtime (0.16.2)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.runtime-0.16.2.link</url>
+        </bundle>
+        <bundle>
+            <name>Apache Felix Gogo Shell (0.12.0)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.shell-0.12.0.link</url>
+        </bundle>
+    </profile>
+
+</platform>

pax-runner-platform-felix/src/main/resources/META-INF/platform-felix/definition-5.6.10.xml

@@ -0,0 +1,54 @@
+<platform>
+
+    <name>Felix 5.6.10</name>
+    <system>link:classpath:runner-links/org.apache.felix.main-5.6.10.link</system>
+
+    <packages>
+        org.osgi.dto;version="1.0",
+        org.osgi.framework;version="1.8",
+        org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",
+        org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",
+        org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",
+        org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",
+        org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",
+        org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",
+        org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",
+        org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",
+        org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",
+        org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",
+        org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",
+        org.osgi.resource;version="1.0",
+        org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",
+        org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",
+        org.osgi.service.resolver;version="1.0";uses:="org.osgi.resource",
+        org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",
+        org.osgi.service.url;version="1.0",
+        org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework"
+    </packages>
+
+    <profile name="minimal" default="true"/>
+
+    <profile name="tui" extends="minimal">
+        <bundle>
+            <name>Apache Felix Gogo Command (1.0.2)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.command-1.0.2.link</url>
+        </bundle>
+        <bundle>
+            <name>Apache Felix Gogo Runtime (1.0.10)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.runtime-1.0.10.link</url>
+        </bundle>
+        <bundle>
+            <name>Apache Felix Gogo Jline (1.0.10)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.jline-1.0.10.link</url>
+        </bundle>
+        <bundle>
+            <name>Jline (3.5.1)</name>
+            <url>link:classpath:runner-links/jline-3.5.1.link</url>
+        </bundle>
+        <bundle>
+            <name>JAnsi (1.16)</name>
+            <url>link:classpath:runner-links/jansi-1.16.link</url>
+        </bundle>
+    </profile>
+
+</platform>

pax-runner-platform-felix/src/main/resources/META-INF/platform-felix/definition-5.6.2.xml

@@ -0,0 +1,50 @@
+<platform>
+
+    <name>Felix 5.6.2</name>
+    <system>link:classpath:runner-links/org.apache.felix.main-5.6.2.link</system>
+
+    <packages>
+        org.osgi.dto;version="1.0",
+        org.osgi.framework;version="1.8",
+        org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",
+        org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",
+        org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",
+        org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",
+        org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",
+        org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",
+        org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",
+        org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",
+        org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",
+        org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",
+        org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",
+        org.osgi.resource;version="1.0",
+        org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",
+        org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",
+        org.osgi.service.resolver;version="1.0";uses:="org.osgi.resource",
+        org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",
+        org.osgi.service.url;version="1.0",
+        org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework"
+    </packages>
+
+    <profile name="minimal" default="true"/>
+
+    <profile name="tui" extends="minimal">
+        <bundle>
+            <name>Apache Felix Gogo Command (1.0.2)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.command-1.0.2.link</url>
+        </bundle>
+        <bundle>
+            <name>Apache Felix Gogo Runtime (1.0.2)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.runtime-1.0.2.link</url>
+        </bundle>
+        <bundle>
+            <name>Apache Felix Gogo Jline (1.0.2)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.jline-1.0.2.link</url>
+        </bundle>
+        <bundle>
+            <name>Jline (3.0.1)</name>
+            <url>link:classpath:runner-links/jline-3.0.1.link</url>
+        </bundle>
+    </profile>
+
+</platform>

pax-runner-platform-felix/src/main/resources/META-INF/platform-felix/definition-5.6.4.xml

@@ -0,0 +1,54 @@
+<platform>
+
+    <name>Felix 5.6.4</name>
+    <system>link:classpath:runner-links/org.apache.felix.main-5.6.4.link</system>
+
+    <packages>
+        org.osgi.dto;version="1.0",
+        org.osgi.framework;version="1.8",
+        org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",
+        org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",
+        org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",
+        org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",
+        org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",
+        org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",
+        org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",
+        org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",
+        org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",
+        org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",
+        org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",
+        org.osgi.resource;version="1.0",
+        org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",
+        org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",
+        org.osgi.service.resolver;version="1.0";uses:="org.osgi.resource",
+        org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",
+        org.osgi.service.url;version="1.0",
+        org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework"
+    </packages>
+
+    <profile name="minimal" default="true"/>
+
+    <profile name="tui" extends="minimal">
+        <bundle>
+            <name>Apache Felix Gogo Command (1.0.2)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.command-1.0.2.link</url>
+        </bundle>
+        <bundle>
+            <name>Apache Felix Gogo Runtime (1.0.6)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.runtime-1.0.6.link</url>
+        </bundle>
+        <bundle>
+            <name>Apache Felix Gogo Jline (1.0.6)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.jline-1.0.6.link</url>
+        </bundle>
+        <bundle>
+            <name>Jline (3.3.0)</name>
+            <url>link:classpath:runner-links/jline-3.3.0.link</url>
+        </bundle>
+        <bundle>
+            <name>JAnsi (1.16)</name>
+            <url>link:classpath:runner-links/jansi-1.16.link</url>
+        </bundle>
+    </profile>
+
+</platform>

pax-runner-platform-felix/src/main/resources/META-INF/platform-felix/definition-5.6.6.xml

@@ -0,0 +1,54 @@
+<platform>
+
+    <name>Felix 5.6.6</name>
+    <system>link:classpath:runner-links/org.apache.felix.main-5.6.6.link</system>
+
+    <packages>
+        org.osgi.dto;version="1.0",
+        org.osgi.framework;version="1.8",
+        org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",
+        org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",
+        org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",
+        org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",
+        org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",
+        org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",
+        org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",
+        org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",
+        org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",
+        org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",
+        org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",
+        org.osgi.resource;version="1.0",
+        org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",
+        org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",
+        org.osgi.service.resolver;version="1.0";uses:="org.osgi.resource",
+        org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",
+        org.osgi.service.url;version="1.0",
+        org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework"
+    </packages>
+
+    <profile name="minimal" default="true"/>
+
+    <profile name="tui" extends="minimal">
+        <bundle>
+            <name>Apache Felix Gogo Command (1.0.2)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.command-1.0.2.link</url>
+        </bundle>
+        <bundle>
+            <name>Apache Felix Gogo Runtime (1.0.6)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.runtime-1.0.6.link</url>
+        </bundle>
+        <bundle>
+            <name>Apache Felix Gogo Jline (1.0.6)</name>
+            <url>link:classpath:runner-links/org.apache.felix.gogo.jline-1.0.6.link</url>
+        </bundle>
+        <bundle>
+            <name>Jline (3.3.0)</name>
+            <url>link:classpath:runner-links/jline-3.3.0.link</url>
+        </bundle>
+        <bundle>
+            <name>JAnsi (1.16)</name>
+            <url>link:classpath:runner-links/jansi-1.16.link</url>
+        </bundle>
+    </profile>
+
+</platform>