This is an automated email from the ASF dual-hosted git repository. stbischof pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 530ddcbca48a393ecc710b05be2c5c9d00af1fb6 Author: Paul <[email protected]> AuthorDate: Sat May 25 22:14:31 2024 +0200 Remove fixupmessages --- .../apache/felix/bundleplugin/BundlePlugin.java | 30 ---------------------- 1 file changed, 30 deletions(-) diff --git a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java index 1bd7f365b4..7c54ba1b75 100644 --- a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java +++ b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java @@ -708,9 +708,6 @@ public class BundlePlugin extends AbstractMojo // update BND instructions to add included Maven resources includeMavenResources(currentProject, builder, getLog()); - // Fixup error messages - includeJava9Fixups(currentProject, builder); - // calculate default export/private settings based on sources addLocalPackages(outputDirectory, builder); @@ -2224,33 +2221,6 @@ public class BundlePlugin extends AbstractMojo } } - /** - * Downgrade the message "Classes found in the wrong directory" to a warning. This allows the plugin - * to process a multi-release JAR (see JEP 238, http://openjdk.java.net/jeps/238). - * - * Note that the version-specific paths will NOT be visible at runtime nor processed by bnd for - * imported packages etc. This will not be possible until a runtime solution for multi-release - * JARs exists in OSGi. This fix only allows these JARs to be processed at all and to be usable on - * Java 8 (and below), and also on Java 9 where the version-specific customizations are optional. - */ - protected static void includeJava9Fixups(MavenProject currentProject, Analyzer analyzer) - { - final String classesInWrongDirError = "Classes found in the wrong directory"; - final String newFixup = "Classes found in the wrong directory;" - + Analyzer.FIXUPMESSAGES_IS_DIRECTIVE + "=" - + Analyzer.FIXUPMESSAGES_IS_WARNING; - - String fixups = analyzer.getProperty(Analyzer.FIXUPMESSAGES); - if (fixups != null && !fixups.isEmpty()) { - if (!fixups.contains(classesInWrongDirError)) { - fixups += "," + newFixup; - } - } else { - fixups = newFixup; - } - analyzer.setProperty(Analyzer.FIXUPMESSAGES, fixups); - } - static class ClassPathItem { final String id; final File file;
