diff --git a/platform/core.netigso/src/org/netbeans/core/netigso/Netigso.java b/platform/core.netigso/src/org/netbeans/core/netigso/Netigso.java index 093b76bccb4d..71d81b09476e 100644 --- a/platform/core.netigso/src/org/netbeans/core/netigso/Netigso.java +++ b/platform/core.netigso/src/org/netbeans/core/netigso/Netigso.java @@ -146,7 +146,6 @@ protected void prepare(Lookup lkp, Collection preregister) { } framework = frameworkFactory.newFramework(configMap); try { - System.clearProperty("java.security.manager"); framework.init(); NetigsoServices ns = new NetigsoServices(this, framework); } catch (BundleException ex) { diff --git a/platform/core.osgi/src/org/netbeans/core/osgi/Activator.java b/platform/core.osgi/src/org/netbeans/core/osgi/Activator.java index 7547e7b60abb..8ef34725655c 100644 --- a/platform/core.osgi/src/org/netbeans/core/osgi/Activator.java +++ b/platform/core.osgi/src/org/netbeans/core/osgi/Activator.java @@ -80,7 +80,6 @@ public Activator() {} if (storage != null) { System.setProperty("netbeans.user", storage); } - System.setProperty("TopSecurityManager.disable", "true"); NbBundle.setBranding(System.getProperty("branding.token")); OSGiMainLookup.initialize(context); queue = new DependencyQueue(); diff --git a/platform/libs.felix/external/binaries-list b/platform/libs.felix/external/binaries-list index 8a176ea9dae5..f36e1819072a 100644 --- a/platform/libs.felix/external/binaries-list +++ b/platform/libs.felix/external/binaries-list @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -DD4C6A401EB1B1E86720F01FA3A6BEE3F9C70478 org.apache.felix:org.apache.felix.main:7.0.5 +8104D748B0F1B18FB671DB47172C90ED79DFF9BA org.apache.felix:org.apache.felix.main:8.0.0 diff --git a/platform/libs.felix/external/org.apache.felix.main-7.0.5-license.txt b/platform/libs.felix/external/org.apache.felix.main-8.0.0-license.txt similarity index 99% rename from platform/libs.felix/external/org.apache.felix.main-7.0.5-license.txt rename to platform/libs.felix/external/org.apache.felix.main-8.0.0-license.txt index 103954c46301..2a81b2233496 100644 --- a/platform/libs.felix/external/org.apache.felix.main-7.0.5-license.txt +++ b/platform/libs.felix/external/org.apache.felix.main-8.0.0-license.txt @@ -1,8 +1,8 @@ Name: Felix -Version: 7.0.5 +Version: 8.0.0 Description: Apache Felix OSGi container. License: Apache-2.0 -Files: org.apache.felix.main-7.0.5.jar +Files: org.apache.felix.main-8.0.0.jar Origin: Apache Software Foundation URL: http://archive.apache.org/dist/felix/ diff --git a/platform/libs.felix/external/org.apache.felix.main-7.0.5-notice.txt b/platform/libs.felix/external/org.apache.felix.main-8.0.0-notice.txt similarity index 84% rename from platform/libs.felix/external/org.apache.felix.main-7.0.5-notice.txt rename to platform/libs.felix/external/org.apache.felix.main-8.0.0-notice.txt index f647a8e0e619..a014101cc047 100644 --- a/platform/libs.felix/external/org.apache.felix.main-7.0.5-notice.txt +++ b/platform/libs.felix/external/org.apache.felix.main-8.0.0-notice.txt @@ -1,11 +1,9 @@ - Apache Felix Main -Copyright 2006-2022 The Apache Software Foundation +Copyright 2006-2024 The Apache Software Foundation + This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - - This product includes software developed at The OSGi Alliance (http://www.osgi.org/). Copyright (c) OSGi Alliance (2000, 2020). diff --git a/platform/libs.felix/nbproject/project.properties b/platform/libs.felix/nbproject/project.properties index cb3fd337f1f9..4c87de2cf0ed 100644 --- a/platform/libs.felix/nbproject/project.properties +++ b/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-7.0.5.jar=modules/ext/org.apache.felix.main-7.0.5.jar -javac.release=17 +release.external/org.apache.felix.main-8.0.0.jar=modules/ext/org.apache.felix.main-8.0.0.jar +javac.release=11 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/platform/libs.felix/nbproject/project.xml b/platform/libs.felix/nbproject/project.xml index d7d3c96c2141..b5ea60acc9a7 100644 --- a/platform/libs.felix/nbproject/project.xml +++ b/platform/libs.felix/nbproject/project.xml @@ -36,8 +36,8 @@ - ext/org.apache.felix.main-7.0.5.jar - external/org.apache.felix.main-7.0.5.jar + ext/org.apache.felix.main-8.0.0.jar + external/org.apache.felix.main-8.0.0.jar diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/SetupHid.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/SetupHid.java index 71e296b945c6..d4e14afcdd76 100644 --- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/SetupHid.java +++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/SetupHid.java @@ -313,7 +313,7 @@ private static void compile(List options, Iterable files) throws I JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); StandardJavaFileManager mgr = compiler.getStandardFileManager(null, null, null); List fullOptions = new ArrayList(options); - fullOptions.addAll(Arrays.asList("-source", "8", "-target", "8")); + fullOptions.addAll(Arrays.asList("--release", "8", "-proc:full")); if (!compiler.getTask(null, mgr, null, fullOptions, null, mgr.getJavaFileObjectsFromFiles(files)).call()) { throw new IOException("compilation failed"); }