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

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
(cherry picked from commit 545af03)

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
@@ -386,6 +386,7 @@
                                 <Import-Package>
                                     javax.activation;version=!,
                                     javax.xml.catalog;resolution:=optional,
+                                    javax.lang.model.*;resolution:=optional,
                                     *
                                 </Import-Package>
                             </instructions>

jaxb-ri/bundles/xjc/src/main/java/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 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;
@@ -29,17 +28,21 @@
     exports com.sun.tools.xjc;
     exports com.sun.tools.xjc.api;
     exports com.sun.tools.xjc.generator.bean;
+    exports com.sun.tools.xjc.generator.bean.field;
     exports com.sun.tools.xjc.model;
     exports com.sun.tools.xjc.model.nav;
     exports com.sun.tools.xjc.outline;
     exports com.sun.tools.xjc.reader;
+    exports com.sun.tools.xjc.reader.gbind;
     exports com.sun.tools.xjc.reader.internalizer;
+    exports com.sun.tools.xjc.reader.xmlschema;
     exports com.sun.tools.xjc.reader.xmlschema.bindinfo;
     exports com.sun.tools.xjc.util;
 
     exports com.sun.xml.xsom;
     exports com.sun.xml.xsom.util;
     exports com.sun.xml.xsom.visitor;
+    exports com.sun.xml.xsom.impl;
     exports com.sun.xml.xsom.impl.parser;
     exports com.sun.xml.xsom.impl.util;
     exports com.sun.xml.xsom.parser;

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 java.xml.bind;
-    requires java.compiler;
+    requires transitive java.compiler;
     requires jdk.compiler;
     requires java.logging;
     requires transitive org.glassfish.jaxb.runtime;
@@ -24,6 +24,7 @@
 
     exports com.sun.tools.jxc;
     exports com.sun.tools.jxc.ap;
-    exports com.sun.tools.jxc.model.nav;
     exports com.sun.tools.jxc.api;
+    exports com.sun.tools.jxc.gen.config;
+    exports com.sun.tools.jxc.model.nav;
 }

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

jaxb-ri/xjc/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
@@ -17,19 +17,18 @@
     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 jdk.compiler;
     requires java.desktop;
 
     requires com.sun.tools.rngdatatype;
     requires transitive com.sun.codemodel;
     requires transitive java.xml.bind;
     requires transitive org.glassfish.jaxb.runtime;
     requires com.sun.istack.runtime;
-    requires com.sun.istack.tools;
+    requires transitive com.sun.istack.tools;
     requires transitive com.sun.xml.xsom;
-    requires com.sun.tools.rngom;
+    requires transitive com.sun.tools.rngom;
     requires com.sun.xml.dtdparser;
     requires com.sun.xml.txw2;
 
@@ -39,10 +38,14 @@
     exports com.sun.tools.xjc;
     exports com.sun.tools.xjc.api;
     exports com.sun.tools.xjc.generator.bean;
+    exports com.sun.tools.xjc.generator.bean.field;
     exports com.sun.tools.xjc.model;
+    exports com.sun.tools.xjc.model.nav;
     exports com.sun.tools.xjc.outline;
     exports com.sun.tools.xjc.reader;
+    exports com.sun.tools.xjc.reader.gbind;
     exports com.sun.tools.xjc.reader.internalizer;
+    exports com.sun.tools.xjc.reader.xmlschema;
     exports com.sun.tools.xjc.reader.xmlschema.bindinfo;
     exports com.sun.tools.xjc.util;
 
@@ -57,4 +60,3 @@
             com.sun.tools.xjc.addon.sync.SynchronizedMethodAddOn;
 
 }
-