jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 106,115 ****
--- 106,118 ----
  /**
   * Generates fields and accessors.
   */
  public final class BeanGenerator implements Outline {
  
+     /** JAXB module name. JAXB dependency is mandatory in generated Java module. */
+     private static final String JAXB_PACKAGE = "java.xml.bind";
+ 
      /** Simplifies class/interface creation and collision detection. */
      private final CodeModelClassFactory codeModelClassFactory;
      private final ErrorReceiver errorReceiver;
      /** all {@link PackageOutline}s keyed by their {@link PackageOutline#_package}. */
      private final Map<JPackage, PackageOutlineImpl> packageContexts = new LinkedHashMap<JPackage, PackageOutlineImpl>();
*** 252,261 ****
--- 255,268 ----
          // create factories for the impl-less elements
          for (CElementInfo ei : model.getAllElements()) {
              getPackageContext(ei._package()).objectFactoryGenerator().populate(ei);
          }
  
+         if (model.options.getModuleName() != null) {
+             codeModel._prepareModuleInfo(model.options.getModuleName(), JAXB_PACKAGE);
+         }
+ 
          if (model.options.debugMode) {
              generateClassList();
          }
      }