eclipse-ee4j#1757: txw runtime and compiler should have different mo…

…dule names Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
lukasj · Oct 7, 2023 · 8bcb69a · 8bcb69a
1 parent 7829f4b
commit 8bcb69a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml
@@ -77,6 +77,9 @@
                     <listitem><para>
                         <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1750">#1750</link>: xjc: ElementOutlineImpl omits serialVersionUID
                     </para></listitem>
+                    <listitem><para>
+                        <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1757">#1757</link>: txw runtime and compiler should have different module names
+                    </para></listitem>
                 </itemizedlist>
             </para></listitem>
         </itemizedlist>

diff --git a/jaxb-ri/txw/compiler/pom.xml b/jaxb-ri/txw/compiler/pom.xml
@@ -77,7 +77,7 @@
                         <configuration>
                             <compilerArgs>
                                 <arg>--add-reads</arg>
-                                <arg>com.sun.tools.txw2=ALL-UNNAMED</arg>
+                                <arg>com.sun.tools.txwc2=ALL-UNNAMED</arg>
                             </compilerArgs>
                         </configuration>
                     </execution>
@@ -104,7 +104,7 @@
                 <configuration>
                     <additionalJOptions>
                         <additionalJOption>--add-reads</additionalJOption>
-                        <additionalJOption>com.sun.tools.txw2=ALL-UNNAMED</additionalJOption>
+                        <additionalJOption>com.sun.tools.txwc2=ALL-UNNAMED</additionalJOption>
                     </additionalJOptions>
                 </configuration>
             </plugin>

diff --git a/jaxb-ri/txw/compiler/src/main/java/module-info.java b/jaxb-ri/txw/compiler/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -8,7 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-module com.sun.tools.txw2 {
+@SuppressWarnings({"module"})
+module com.sun.tools.txwc2 {
     requires transitive java.xml;
 
     requires com.sun.xml.txw2;