eclipse-ee4j#1674: com.sun.tools.xjc should run on JRE

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
lukasj · Jan 24, 2023 · a869ad3 · a869ad3
1 parent fb2b221
commit a869ad3
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
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, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2023 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
@@ -314,6 +314,7 @@
                                 </Export-Package>
                                 <Import-Package>
                                     javax.xml.bind.annotation;resolution:=optional,
+                                    javax.lang.model.*;resolution:=optional,
                                     *
                                 </Import-Package>
                             </instructions>

diff --git a/jaxb-ri/bundles/xjc/src/main/java/module-info.java b/jaxb-ri/bundles/xjc/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023 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
@@ -15,8 +15,7 @@
 module com.sun.tools.xjc {
 
     requires java.logging;
-    requires transitive java.compiler;
-    requires jdk.compiler;
+    requires static java.compiler; // required by com.sun.tools.xjc.api.Reference used by jxc
     requires transitive java.desktop;
 
     requires transitive jakarta.activation;

diff --git a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml
@@ -33,6 +33,9 @@
                     <listitem><para>
                         <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/pull/1669">#1669</link>: [codemodel] Support Object and overridden JAnnotationWriter methods
                     </para></listitem>
+                    <listitem><para>
+                        <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1674">#1674</link>: com.sun.tools.xjc should run on JRE
+                    </para></listitem>
                     <listitem><para>
                         <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1676">#1676</link>: Impossible to build with non-english system
                     </para></listitem>

diff --git a/jaxb-ri/jxc/src/main/java/module-info.java b/jaxb-ri/jxc/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023 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
@@ -14,7 +14,7 @@
 module org.glassfish.jaxb.jxc {
 
     requires transitive jakarta.xml.bind;
-    requires java.compiler;
+    requires transitive java.compiler;
     requires jdk.compiler;
     requires java.logging;
     requires transitive org.glassfish.jaxb.runtime;

diff --git a/jaxb-ri/xjc/pom.xml b/jaxb-ri/xjc/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2023 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
@@ -41,7 +41,6 @@
             --add-exports org.glassfish.jaxb.xjc/com.sun.tools.xjc.outline=ALL-UNNAMED
             --add-exports org.glassfish.jaxb.xjc/com.sun.tools.xjc.generator.bean=ALL-UNNAMED
             --add-opens org.glassfish.jaxb.xjc/com.sun.tools.xjc.addon.code_injector=ALL-UNNAMED
-            --add-opens org.glassfish.jaxb.xjc/com.sun.tools.xjc.reader.xmlschema.bindinfo=org.glassfish.jaxb.core
             --add-opens org.glassfish.jaxb.core/org.glassfish.jaxb.core.v2.model.nav=ALL-UNNAMED
             -Djdk.attach.allowAttachSelf
         </argLine>
@@ -160,6 +159,7 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>

diff --git a/jaxb-ri/xjc/src/main/java/module-info.java b/jaxb-ri/xjc/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023 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
@@ -17,7 +17,7 @@
     requires transitive jakarta.activation;
 
     requires java.logging;
-    requires transitive java.compiler;
+    requires static java.compiler; // required by com.sun.tools.xjc.api.Reference used by jxc
     requires transitive java.xml;
     requires java.desktop;