Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ protected void prepare(Lookup lkp, Collection<? extends Module> preregister) {
}
framework = frameworkFactory.newFramework(configMap);
try {
System.clearProperty("java.security.manager");
framework.init();
NetigsoServices ns = new NetigsoServices(this, framework);
} catch (BundleException ex) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String,Bundle>();
Expand Down
2 changes: 1 addition & 1 deletion platform/libs.felix/external/binaries-list
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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/

Expand Down
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
4 changes: 2 additions & 2 deletions platform/libs.felix/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions platform/libs.felix/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
</module-dependencies>
<public-packages/>
<class-path-extension>
<runtime-relative-path>ext/org.apache.felix.main-7.0.5.jar</runtime-relative-path>
<binary-origin>external/org.apache.felix.main-7.0.5.jar</binary-origin>
<runtime-relative-path>ext/org.apache.felix.main-8.0.0.jar</runtime-relative-path>
<binary-origin>external/org.apache.felix.main-8.0.0.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ private static void compile(List<String> options, Iterable<File> files) throws I
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
StandardJavaFileManager mgr = compiler.getStandardFileManager(null, null, null);
List<String> fullOptions = new ArrayList<String>(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");
}
Expand Down
Loading