jaxb-ri/bundles packaging update. (#1318)

* jaxb-ri/bundles packaging update. Signed-off-by: Roman Grigoriadi <roman.grigoriadi@oracle.com>
eclipse-ee4j · Jun 20, 2019 · b8e7f2a · b8e7f2a
1 parent 0a92c0c
commit b8e7f2a
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 13 deletions.
diff --git a/jaxb-ri/boms/bom/pom.xml b/jaxb-ri/boms/bom/pom.xml
@@ -156,6 +156,12 @@
             <dependency> <!--JAXB-API-->
                 <groupId>jakarta.xml.bind</groupId>
                 <artifactId>jakarta.xml.bind-api</artifactId>
+                <exclusions>
+                    <exclusion>
+                        <groupId>jakarta.activation</groupId>
+                        <artifactId>jakarta.activation-api</artifactId>
+                    </exclusion>
+                </exclusions>
                 <version>${jaxb-api.version}</version>
             </dependency>
             <dependency>

diff --git a/jaxb-ri/bundles/jxc/pom.xml b/jaxb-ri/bundles/jxc/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -138,6 +138,11 @@
                         <configuration>
                             <instructions>
                                 <Export-Package>*</Export-Package>
+                                <Import-Package>
+                                    com.sun.source.tree;resolution:="optional",
+                                    com.sun.source.util;resolution:="optional",
+                                    *
+                                </Import-Package>
                             </instructions>
                         </configuration>
                     </execution>

diff --git a/jaxb-ri/bundles/osgi/osgi/pom.xml b/jaxb-ri/bundles/osgi/osgi/pom.xml
@@ -342,8 +342,8 @@
                                     org.xml.sax.helpers,
                                     com.sun.org.apache.xml.internal.resolver;resolution:=optional,
                                     com.sun.org.apache.xml.internal.resolver.tools;resolution:=optional,
-                                    com.sun.source.tree,
-                                    com.sun.source.util,
+                                    com.sun.source.tree;resolution:=optional,
+                                    com.sun.source.util;resolution:=optional,
                                     org.apache.tools.ant;resolution:=optional,
                                     org.apache.tools.ant.taskdefs;resolution:=optional,
                                     org.apache.tools.ant.taskdefs.compilers;resolution:=optional,

diff --git a/jaxb-ri/bundles/ri/src/main/assembly/assembly.xml b/jaxb-ri/bundles/ri/src/main/assembly/assembly.xml
@@ -79,11 +79,12 @@
                 <include>org.jvnet.staxex:stax-ex</include>
                 <include>com.sun.xml.fastinfoset:FastInfoset</include>
                 <include>org.glassfish.jaxb:txw2</include>
-                <include>jakarta.activation:jakarta.activation</include>
+                <include>com.sun.activation:jakarta.activation</include>
                 <include>com.sun.xml.bind.external:relaxng-datatype</include>
             </includes>
             <excludes>
                 <exclude>org.apache.ant:ant</exclude>
+                <exclude>jakarta.activation:jakarta.activation-api</exclude>
             </excludes>
         </dependencySet>
         <dependencySet>

diff --git a/jaxb-ri/bundles/runtime/pom.xml b/jaxb-ri/bundles/runtime/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -250,6 +250,8 @@
                             <artifactSet>
                                 <includes>
                                     <include>org.glassfish.jaxb:jaxb-runtime</include>
+                                    <include>org.glassfish.jaxb:txw2</include>
+                                    <include>com.sun.istack:istack-commons-runtime</include>
                                 </includes>
                                 <excludes>
                                     <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
@@ -258,8 +260,6 @@
                                     <exclude>com.sun.xml.fastinfoset:FastInfoset</exclude>
                                     <exclude>org.jvnet.staxex:stax-ex</exclude>
                                     <exclude>javax.activation:activation</exclude>
-                                    <exclude>org.glassfish.jaxb:txw2</exclude>
-                                    <exclude>com.sun.istack:istack-commons-runtime</exclude>
                                 </excludes>
                             </artifactSet>
                         </configuration>

diff --git a/jaxb-ri/bundles/xjc/pom.xml b/jaxb-ri/bundles/xjc/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at

diff --git a/jaxb-ri/pom.xml b/jaxb-ri/pom.xml
@@ -200,10 +200,10 @@
                                 <Build-Version>JAXB RI ${project.version}</Build-Version>
                                 <Major-Version>${jaxb.majorVersion}.${jaxb.minorVersion}.${jaxb.incrementalVersion}</Major-Version>
                             </manifestEntries>
-                            <manifest>
-                                <addClasspath>true</addClasspath>
-                            </manifest>
                         </archive>
+                        <excludes>
+                            <exclude>META-INF/jpms.args</exclude>
+                        </excludes>
                     </configuration>
                 </plugin>
                 <plugin>

diff --git a/jaxb-ri/runtime/impl/pom.xml b/jaxb-ri/runtime/impl/pom.xml
@@ -54,6 +54,7 @@
         <dependency>
             <groupId>com.sun.xml.fastinfoset</groupId>
             <artifactId>FastInfoset</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/jaxb-ri/runtime/impl/src/main/java/module-info.java b/jaxb-ri/runtime/impl/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -24,7 +24,7 @@
     requires transitive java.xml;
 
     requires com.sun.xml.txw2;
-    requires com.sun.xml.fastinfoset;
+    requires static com.sun.xml.fastinfoset;
     requires org.jvnet.staxex;
     requires com.sun.istack.runtime;
 

diff --git a/jaxb-ri/xjc/pom.xml b/jaxb-ri/xjc/pom.xml
@@ -98,6 +98,8 @@
             <groupId>com.sun.org.apache.xml.internal</groupId>
             <artifactId>resolver</artifactId>
             <scope>provided</scope>
+            <!--Not needed starting from JavaSE 11-->
+            <optional>true</optional>
         </dependency>
     </dependencies>