diff --git a/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java b/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java index a169332e78..e14f8371f6 100644 --- a/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java +++ b/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java @@ -214,21 +214,6 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl @Parameter private Set excludeResources = new HashSet<>(); - /** - * Whether a bundle is required to explicitly import non-java.* packages from the JDK. This is - * the design-time equivalent to the equinox runtime option - * osgi.compatibility.bootdelegation. - * - * @deprecated OSGI requires all packages to be imported and support for - * osgi.compatibility.bootdelegation will be removed in one of the next Tycho - * releases. - * @see #requireJavaPackageImports - */ - @Parameter() - @Deprecated - private Boolean requireJREPackageImports; - /** * Since OSGi R7 it is * allowed to @@ -819,28 +804,10 @@ private void configureCompilerLog(CompilerConfiguration compilerConfiguration) t private void configureBootclasspathAccessRules(CompilerConfiguration compilerConfiguration, Collection classpathEntries) throws MojoExecutionException { List accessRules = new ArrayList<>(); - - if (requireJREPackageImports != null) { - logger.warn( - "Configuration option requireJREPackageImports is deprecated and will be removed in a future Tycho version!"); - } - if (requireJREPackageImports == null || requireJREPackageImports) { - if (!requireJavaPackageImports) { - accessRules.add(new DefaultAccessRule("java/**", false)); - } - accessRules.addAll(getStrictBootClasspathAccessRules()); - } else { + if (!requireJavaPackageImports) { accessRules.add(new DefaultAccessRule("java/**", false)); - getTargetExecutionEnvironment().getSystemPackages().stream() // - .map(systemPackage -> systemPackage.packageName) // - .distinct() // - .map(packageName -> packageName.trim().replace('.', '/') + "/*") // - .map(accessRule -> new DefaultAccessRule(accessRule, false)) // - .forEach(accessRules::add); - // now add packages exported by framework extension bundles - accessRules - .addAll(getBundleProject().getBootClasspathExtraAccessRules(DefaultReactorProject.adapt(project))); } + accessRules.addAll(getStrictBootClasspathAccessRules()); if (!accessRules.isEmpty()) { List globalRules = classpathEntries.stream() .filter(JREClasspathEntry.class::isInstance).map(JREClasspathEntry.class::cast)