This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new aa4ec76 Fix org.osgi.framework.BundleException when run
core/osgi/ActivatorTest
new b0f9ea2 Merge pull request #1600 from
blackleg/fix_testClassPathExtensions
aa4ec76 is described below
commit aa4ec76f8b2e347342c684f27519fd3fa6c49db8
Author: Hector Espert <[email protected]>
AuthorDate: Sun Oct 27 16:15:03 2019 +0100
Fix org.osgi.framework.BundleException when run core/osgi/ActivatorTest
---
platform/core.osgi/nbproject/project.properties | 2 +-
platform/core.osgi/src/org/netbeans/core/osgi/OSGiClassLoader.java | 2 +-
.../core.osgi/test/unit/src/org/netbeans/core/osgi/ActivatorTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/platform/core.osgi/nbproject/project.properties
b/platform/core.osgi/nbproject/project.properties
index 22014f7..66e9067 100644
--- 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
index fc5895f..054b5a3 100644
--- 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 @@ class OSGiClassLoader extends ClassLoader {
// 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
index b133bea..bfc1060 100644
--- 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 class ActivatorTest extends NbTestCase {
.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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
