Netbinox: Enable loading of bundles importing java.* packages

Newer bouncy castle JARs declare an import of the java.io package. This
is rejected by the manifest verification in the equinox version NetBeans
uses wrapped into Netbinox.

This change deactivates the check in equinox that rejects that entry.

Closes: #8894

Author: matthiasblaesing

platform/netbinox/external/M20140115-0800.patch

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
-index 617db7f..1851f4a 100644
+index 617db7f49..1851f4ade 100644
 --- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
 +++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
 @@ -563,11 +563,19 @@ public class Framework implements EventPublisher, Runnable {
@@ -42,3 +42,16 @@ index 617db7f..1851f4a 100644
  		return result;
  	}
 
+diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
+index b6964980a..d9d2f996d 100644
+--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
++++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java
+@@ -819,7 +819,7 @@ public class StateBuilder {
+ 					throw new BundleException(message + " : " + NLS.bind(StateMsg.HEADER_PACKAGE_DUPLICATES, packageNames[j]), BundleException.MANIFEST_ERROR); //$NON-NLS-1$
+ 				}
+ 				// check for java.*
+-				if (!jreBundle && packageNames[j].startsWith("java.")) { //$NON-NLS-1$
++				if (false && !jreBundle && packageNames[j].startsWith("java.")) { //$NON-NLS-1$
+ 					String message = NLS.bind(Msg.MANIFEST_INVALID_HEADER_EXCEPTION, headerKey, elements[i].toString());
+ 					throw new BundleException(message + " : " + NLS.bind(StateMsg.HEADER_PACKAGE_JAVA, packageNames[j]), BundleException.MANIFEST_ERROR); //$NON-NLS-1$
+ 				}

platform/netbinox/external/binaries-list

@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-CB97D80CEDF7963313E1B1EADC0F1E49F62570DD org.eclipse.osgi_3.9.1.nb9.jar
+FAE5455278493B0125564195DB3F3B92F4169A6E https://doppel-helix.eu/org.eclipse.osgi_3.9.1.nb10.jar org.eclipse.osgi_3.9.1.nb10.jar

platform/netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610-license.txt

@@ -2,7 +2,7 @@ Name: Equinox
 Version: 3.9.1
 Description: Eclipse OSGi container
 License: OSGi
-Files: org.eclipse.osgi_3.9.1.nb9.jar
+Files: org.eclipse.osgi_3.9.1.nb10.jar
 Origin: Eclipse
 URL: http://www.eclipse.org/equinox/
 

platform/netbinox/external/rebuild-equinox.sh

@@ -20,19 +20,20 @@ BASE=`dirname $0`
 cd $BASE
 BASE=`pwd`
 
-git clone https://git.eclipse.org/r/equinox/rt.equinox.framework
-cd rt.equinox.framework
+git clone https://github.com/eclipse-equinox/equinox.framework
+cd equinox.framework
 git checkout M20140115-0800
 git show M20140115-0800:bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java  >Framework.java
+git show M20140115-0800:bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java  >StateBuilder.java
 patch <../M20140115-0800.patch
 if ! [ -e org.eclipse.osgi-3.9.1.v20140110-1610.jar ]; then
   wget https://repo.eclipse.org/content/repositories/releases/org/eclipse/core/org.eclipse.osgi/3.9.1.v20140110-1610/org.eclipse.osgi-3.9.1.v20140110-1610.jar
 fi
 mkdir -p out
-javac -cp org.eclipse.osgi-3.9.1.v20140110-1610.jar Framework.java -d out || exit 1
+javac --release 17 -cp org.eclipse.osgi-3.9.1.v20140110-1610.jar Framework.java StateBuilder.java -d out || exit 1
 cd out
 zip -d ../org.eclipse.osgi-3.9.1.v20140110-1610.jar META-INF/ECLIPSE_.SF META-INF/ECLIPSE_.RSA
 zip -r ../org.eclipse.osgi-3.9.1.v20140110-1610.jar .
 
 cd "$BASE"
-mv rt.equinox.framework/org.eclipse.osgi-3.9.1.v20140110-1610.jar org.eclipse.osgi_3.9.1.nb9.jar
+mv equinox.framework/org.eclipse.osgi-3.9.1.v20140110-1610.jar org.eclipse.osgi_3.9.1.nb10.jar

platform/netbinox/nbproject/project.properties

@@ -16,7 +16,7 @@
 # under the License.
 
 is.autoload=true
-release.external/org.eclipse.osgi_3.9.1.nb9.jar=modules/ext/org.eclipse.osgi_3.9.1.nb9.jar
+release.external/org.eclipse.osgi_3.9.1.nb10.jar=modules/ext/org.eclipse.osgi_3.9.1.nb10.jar
 javac.release=17
 
 javac.compilerargs=-Xlint -Xlint:-serial

platform/netbinox/nbproject/project.xml

@@ -127,8 +127,8 @@
                 <package>org.eclipse.osgi.util</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.osgi_3.9.1.nb9.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.osgi_3.9.1.nb9.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.osgi_3.9.1.nb10.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.osgi_3.9.1.nb10.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>