Skip to content

Commit a65450f

Browse files
iils-hwellmanngnodet
authored andcommitted
[MRESOLVER-571] Fix usage of '-noimport' directive on exports
1 parent d4bd991 commit a65450f

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

pom.xml

+4-6
Original file line numberDiff line numberDiff line change
@@ -609,20 +609,18 @@
609609
<bnd><![CDATA[
610610
Bundle-SymbolicName: org.apache.${replacestring;${project.artifactId};-;.}
611611
Automatic-Module-Name: ${Bundle-SymbolicName}
612-
# Export packages not containing the substring 'internal'
612+
# Export packages, but don't re-import own packages
613613
-exportcontents: \
614-
*.impl.*;x-internal:=true, \
615-
*.internal.*;x-internal:=true, \
616-
*
614+
*.impl.*;x-internal:=true;-noimport:=true, \
615+
*.internal.*;x-internal:=true;-noimport:=true, \
616+
*;-noimport:=true
617617
# Ensure all maven-resolver packages of exactly the same version are imported
618618
# and mark optional Maven dependencies as optional.
619619
mavenResolverVersion=${versionmask;===;${version_cleanup;${project.version}}}
620620
Import-Package: \
621621
org.eclipse.aether*;version="${range;[===,===];${mavenResolverVersion}}", \
622622
javax.inject*;resolution:=optional, \
623623
*
624-
# No re-import of exported packages
625-
-noimport:=true
626624
# Reproducible build
627625
-noextraheaders: true
628626
${bnd.instructions.additions}

0 commit comments

Comments
 (0)