Fix org.osgi.framework.BundleException when run core/osgi/ActivatorTest

felipe29 · Nov 1, 2019 · aa4ec76 · aa4ec76
1 parent c67e1b6
commit aa4ec76
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/platform/core.osgi/nbproject/project.properties b/platform/core.osgi/nbproject/project.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 is.autoload=true
-javac.source=1.6
+javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 cp.extra=\
     ${nb_all}/platform/libs.osgi/external/osgi.core-7.0.0.jar:\

diff --git a/platform/core.osgi/src/org/netbeans/core/osgi/OSGiClassLoader.java b/platform/core.osgi/src/org/netbeans/core/osgi/OSGiClassLoader.java
@@ -67,7 +67,7 @@ private Iterable<Bundle> bundles() {
             // Sort framework last so since in Felix 4 its loadClass will search app classpath, causing test failures.
             // (Tried to disable this using various framework config properties without success.)
             return NbCollections.iterable(Enumerations.concat(Enumerations.filter(Enumerations.array(bundles), new Enumerations.Processor<Bundle,Bundle>() {
-                public @Override Bundle process(Bundle b, Collection<Bundle> _) {
+                public @Override Bundle process(Bundle b, Collection<Bundle> c) {
                     if (b.getBundleId() == 0) {
                         return null;
                     }

diff --git a/platform/core.osgi/test/unit/src/org/netbeans/core/osgi/ActivatorTest.java b/platform/core.osgi/test/unit/src/org/netbeans/core/osgi/ActivatorTest.java
@@ -237,7 +237,7 @@ public void testClassPathExtensions() throws Exception {
                 .manifest(
                     "OpenIDE-Module: custom",
                     "OpenIDE-Module-Install: custom.Install",
-                    "OpenIDE-Module-Module-Dependencies: org.openide.modules, org.netbeans.libs.jna/1")
+                    "OpenIDE-Module-Module-Dependencies: org.openide.modules, org.netbeans.libs.jna/2")
                 .done()
                 .module("org.netbeans.libs.jna")
                 .run(false);