[MRESOLVER-571] Fix usage of '-noimport' directive on exports

apache · Jul 1, 2024 · a65450f · a65450f
1 parent d4bd991
commit a65450f
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -609,20 +609,18 @@
             <bnd><![CDATA[
               Bundle-SymbolicName: org.apache.${replacestring;${project.artifactId};-;.}
               Automatic-Module-Name: ${Bundle-SymbolicName}
-              # Export packages not containing the substring 'internal'
+              # Export packages, but don't re-import own packages
               -exportcontents: \
-                *.impl.*;x-internal:=true, \
-                *.internal.*;x-internal:=true, \
-                *
+                *.impl.*;x-internal:=true;-noimport:=true, \
+                *.internal.*;x-internal:=true;-noimport:=true, \
+                *;-noimport:=true
               # Ensure all maven-resolver packages of exactly the same version are imported
               # and mark optional Maven dependencies as optional.
               mavenResolverVersion=${versionmask;===;${version_cleanup;${project.version}}}
               Import-Package: \
                 org.eclipse.aether*;version="${range;[===,===];${mavenResolverVersion}}", \
                 javax.inject*;resolution:=optional, \
                 *
-              # No re-import of exported packages
-              -noimport:=true
               # Reproducible build
               -noextraheaders: true
               ${bnd.instructions.additions}