Merge pull request apache#1160 from JaroslavTulach/StartOnJDK11.0.2

[NETBEANS-2160] Start on jdk11.0.2

platform/core.netigso/test/unit/src/org/netbeans/core/netigso/JrtUrlTest.java

@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.core.netigso;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ServiceLoader;
+import static org.junit.Assert.assertEquals;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.framework.launch.Framework;
+import org.osgi.framework.launch.FrameworkFactory;
+
+public class JrtUrlTest {
+    @Before
+    public void assumeJDK9andNewer() {
+        try {
+            URL test = new URL("jrt://java.compiler/");
+        } catch (MalformedURLException ex) {
+            Assume.assumeNoException("Only run the test on JDK9+", ex);
+        }
+
+    }
+
+    @Test
+    public void initFrameWorkAndThenCreateTheUrl() throws Exception {
+        Framework framework;
+        for (FrameworkFactory ff : ServiceLoader.load(FrameworkFactory.class)) {
+            Map<String, String> config = new HashMap<String, String>();
+            framework = ff.newFramework(config);
+            framework.init();
+            framework.start();
+            break;
+        }
+
+        URL test = new URL("jrt://java.compiler/");
+        assertEquals("jrt", test.getProtocol());
+    }
+}

platform/libs.felix/external/binaries-list

@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-8D5C405F2BA570684D4B6FE4B3825138B16C05E9 org.apache.felix:org.apache.felix.main:6.0.1
+1EA2666BB8C3F72A4A30843490F19431ABAD73CC org.apache.felix:org.apache.felix.main:6.0.2

platform/libs.felix/external/org.apache.felix.main-6.0.1-license.txt → platform/libs.felix/external/org.apache.felix.main-6.0.2-license.txt

@@ -1,8 +1,8 @@
 Name: Felix
-Version: 6.0.1
+Version: 6.0.2
 Description: Apache Felix OSGi container.
 License: Apache-2.0
-Files: org.apache.felix.main-6.0.1.jar
+Files: org.apache.felix.main-6.0.2.jar
 Origin: Apache Software Foundation
 URL: http://archive.apache.org/dist/felix/
 

platform/libs.felix/nbproject/project.properties

@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-release.external/org.apache.felix.main-6.0.1.jar=modules/ext/org.apache.felix.main-6.0.1.jar
+release.external/org.apache.felix.main-6.0.2.jar=modules/ext/org.apache.felix.main-6.0.2.jar
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial

platform/libs.felix/nbproject/project.xml

@@ -36,8 +36,8 @@
             </module-dependencies>
             <public-packages/>
             <class-path-extension>
-                <runtime-relative-path>ext/org.apache.felix.main-6.0.1.jar</runtime-relative-path>
-                <binary-origin>external/org.apache.felix.main-6.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/org.apache.felix.main-6.0.2.jar</runtime-relative-path>
+                <binary-origin>external/org.apache.felix.main-6.0.2.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>