Merge branch 'master' into maven-resolver-2.0.x-571

apache · Jun 27, 2024 · 6b7a85a · 6b7a85a
2 parents eb24c24 + d0edd79
commit 6b7a85a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/maven-resolver-api/pom.xml b/maven-resolver-api/pom.xml
@@ -33,7 +33,8 @@
 
   <properties>
     <bnd.instructions.additions><![CDATA[
-      Automatic-Module-Name: org.apache.maven.resolver
+      -jpms-module-info: org.apache.maven.resolver
+      -removeheaders Automatic-Module-Name
     ]]></bnd.instructions.additions>
   </properties>
 

diff --git a/maven-resolver-spi/pom.xml b/maven-resolver-spi/pom.xml
@@ -31,6 +31,13 @@
   <name>Maven Artifact Resolver SPI</name>
   <description>The service provider interface for repository system implementations and repository connectors.</description>
 
+  <properties>
+    <bnd.instructions.additions><![CDATA[
+      -jpms-module-info
+      -removeheaders Automatic-Module-Name
+    ]]></bnd.instructions.additions>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>

diff --git a/maven-resolver-util/pom.xml b/maven-resolver-util/pom.xml
@@ -31,6 +31,13 @@
   <name>Maven Artifact Resolver Utilities</name>
   <description>A collection of utility classes to ease usage of the repository system.</description>
 
+  <properties>
+    <bnd.instructions.additions><![CDATA[
+      -jpms-module-info
+      -removeheaders Automatic-Module-Name
+    ]]></bnd.instructions.additions>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>

diff --git a/pom.xml b/pom.xml
@@ -610,7 +610,10 @@
               Bundle-SymbolicName: org.apache.${replacestring;${project.artifactId};-;.}
               Automatic-Module-Name: ${Bundle-SymbolicName}
               # Export packages not containing the substring 'internal'
-              -exportcontents: ${removeall;${packages};${packages;NAMED;*internal*}}
+              -exportcontents: \
+                *.impl.*;x-internal:=true, \
+                *.internal.*;x-internal:=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}}}