Merge pull request #301 from xmlunit/java-jaxb-optional-osgi

bodewig · web-flow · commit 68cac23b2299 · 2025-06-19T13:49:30.000Z
make javax.xml.bind.* OSGi imports optional
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -2,6 +2,11 @@
 
 ## XMLUnit for Java 2.10.3 - /not released, yet/
 
+* marked OSGi `Import-Package` optional for javax.xml.bind packages in xmlunit-core.
+  Also fixed the `Export-Package` header of the legacy module.
+  Issue [#300](https://github.com/xmlunit/xmlunit/issues/300)
+  PR [#301](https://github.com/xmlunit/xmlunit/pull/301)
+
 ## XMLUnit for Java 2.10.2 - /Released 2025-05-23/
 
 * the published POM of xmlunit-legacy lacked the dependency on xmlunit-core.
diff --git a/xmlunit-core/pom.xml b/xmlunit-core/pom.xml
@@ -55,6 +55,20 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Import-Package>javax.xml.bind.*;resolution:=optional,*</Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>java9+</id>
diff --git a/xmlunit-legacy/pom.xml b/xmlunit-legacy/pom.xml
@@ -96,6 +96,15 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>org.custommonkey.xmlunit.*;version=${project.version};-noimport:=true</Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
