XJC requires runtime module to be explicitly set
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/jaxb-ri/bundles/ri/src/main/resources/bin/schemagen.bat b/jaxb-ri/bundles/ri/src/main/resources/bin/schemagen.bat
index dae7768..5f78b14 100644
--- a/jaxb-ri/bundles/ri/src/main/resources/bin/schemagen.bat
+++ b/jaxb-ri/bundles/ri/src/main/resources/bin/schemagen.bat
@@ -1,7 +1,7 @@
@echo off
REM
-REM Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+REM Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
REM
REM This program and the accompanying materials are made available under the
REM terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -87,7 +87,7 @@
:JDK11_OR_GREATER
rem module path only
-%JAVA% %SCHEMAGEN_OPTS% --module-path %LOCALCLASSPATH% -m com.sun.tools.jxc %*
+%JAVA% %SCHEMAGEN_OPTS% --module-path %LOCALCLASSPATH% --add-modules com.sun.xml.bind -m com.sun.tools.jxc %*
goto END
:END
diff --git a/jaxb-ri/bundles/ri/src/main/resources/bin/schemagen.sh b/jaxb-ri/bundles/ri/src/main/resources/bin/schemagen.sh
index 936cd7f..302e82d 100755
--- a/jaxb-ri/bundles/ri/src/main/resources/bin/schemagen.sh
+++ b/jaxb-ri/bundles/ri/src/main/resources/bin/schemagen.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2021 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
@@ -105,5 +105,5 @@
exec "${JAVA}" ${SCHEMAGEN_OPTS} -cp "${LOCALPATH}" com.sun.tools.jxc.SchemaGeneratorFacade "$@"
else
#module path
- exec "${JAVA}" ${SCHEMAGEN_OPTS} --module-path "${LOCALPATH}" -m com.sun.tools.jxc "$@"
+ exec "${JAVA}" ${SCHEMAGEN_OPTS} --module-path "${LOCALPATH}" --add-modules com.sun.xml.bind -m com.sun.tools.jxc "$@"
fi
diff --git a/jaxb-ri/bundles/ri/src/main/resources/bin/xjc.bat b/jaxb-ri/bundles/ri/src/main/resources/bin/xjc.bat
index 02481af..c8e8797 100644
--- a/jaxb-ri/bundles/ri/src/main/resources/bin/xjc.bat
+++ b/jaxb-ri/bundles/ri/src/main/resources/bin/xjc.bat
@@ -1,7 +1,7 @@
@echo off
REM
-REM Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+REM Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
REM
REM This program and the accompanying materials are made available under the
REM terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -70,7 +70,7 @@
:JDK11_OR_GREATER
rem module path
-%JAVA% --module-path %JAXB_PATH% %XJC_OPTS% -m com.sun.tools.xjc %*
+%JAVA% --module-path %JAXB_PATH% --add-modules com.sun.xml.bind %XJC_OPTS% -m com.sun.tools.xjc %*
GOTO END
:END
diff --git a/jaxb-ri/bundles/ri/src/main/resources/bin/xjc.sh b/jaxb-ri/bundles/ri/src/main/resources/bin/xjc.sh
index e9daed7..fbceb23 100755
--- a/jaxb-ri/bundles/ri/src/main/resources/bin/xjc.sh
+++ b/jaxb-ri/bundles/ri/src/main/resources/bin/xjc.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2021 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
@@ -82,5 +82,5 @@
exec "${JAVA}" -cp "${JAXB_PATH}" ${XJC_OPTS} com.sun.tools.xjc.XJCFacade "$@"
else
#module path
- exec "${JAVA}" --module-path "${JAXB_PATH}" ${XJC_OPTS} -m com.sun.tools.xjc "$@"
+ exec "${JAVA}" --module-path "${JAXB_PATH}" --add-modules com.sun.xml.bind ${XJC_OPTS} -m com.sun.tools.xjc "$@"
fi
