From 21f14465d2c663dd0747e4f529435bcbffc92771 Mon Sep 17 00:00:00 2001
From: Andy McCright <j.andrew.mccright@gmail.com>
Date: Mon, 21 Sep 2020 16:00:39 -0500
Subject: [PATCH 1/2] [#907] Make XML Bind pkgs optional for JPMS/OSGi

Signed-off-by: Andy McCright <j.andrew.mccright@gmail.com>
---
 jaxrs-api/pom.xml                        | 3 ++-
 jaxrs-api/src/main/java/module-info.java | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jaxrs-api/pom.xml b/jaxrs-api/pom.xml
index 892551485..e179160e0 100644
--- a/jaxrs-api/pom.xml
+++ b/jaxrs-api/pom.xml
@@ -134,7 +134,7 @@
                         <plugin>
                             <artifactId>maven-surefire-plugin</artifactId>
                             <configuration>
-                                <argLine>--add-opens jakarta.ws.rs/jakarta.ws.rs.core=java.xml.bind</argLine>
+                                <argLine>--add-modules jakarta.xml.bind</argLine>
                             </configuration>
                         </plugin>
                     </plugins>
@@ -497,6 +497,7 @@
             <artifactId>jakarta.xml.bind-api</artifactId>
             <version>${jaxb.api.version}</version>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
diff --git a/jaxrs-api/src/main/java/module-info.java b/jaxrs-api/src/main/java/module-info.java
index fb58a2599..0cae632ea 100644
--- a/jaxrs-api/src/main/java/module-info.java
+++ b/jaxrs-api/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,7 +16,7 @@
 
 module jakarta.ws.rs {
 
-    requires transitive jakarta.xml.bind;
+    requires static jakarta.xml.bind;
 
     requires java.logging;
 

From d973660e3fc42830ee2020eb227f3e2518f5b5a8 Mon Sep 17 00:00:00 2001
From: Andy McCright <j.andrew.mccright@gmail.com>
Date: Tue, 22 Sep 2020 09:05:04 -0500
Subject: [PATCH 2/2] Use add-modules in JDK 9 and 10 unit tests

Signed-off-by: Andy McCright <j.andrew.mccright@gmail.com>
---
 jaxrs-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jaxrs-api/pom.xml b/jaxrs-api/pom.xml
index e179160e0..48a06698f 100644
--- a/jaxrs-api/pom.xml
+++ b/jaxrs-api/pom.xml
@@ -183,7 +183,7 @@
                         <plugin>
                             <artifactId>maven-surefire-plugin</artifactId>
                             <configuration>
-                                <argLine>--add-opens jakarta.ws.rs/jakarta.ws.rs.core=java.xml.bind</argLine>
+                                <argLine>--add-modules jakarta.xml.bind</argLine>
                             </configuration>
                         </plugin>
                     </plugins>