From a65450f2a4509fe289c10b2a7cf6a7f76ff500c2 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <hannes.wellmann@iils.de>
Date: Mon, 1 Jul 2024 11:20:30 +0200
Subject: [PATCH] [MRESOLVER-571] Fix usage of '-noimport' directive on exports

---
 pom.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 98d5758d6..911b0b84c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -609,11 +609,11 @@
             <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}}}
@@ -621,8 +621,6 @@
                 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}