Skip to content

Changes

Summary

  1. Prepare release com.sun.xml.bind.mvn:jaxb-ri:2.3.5 (commit: a427215) (details)
  2. Prepare next development cycle for 2.3.6-SNAPSHOT (commit: 5291158) (details)
  3. Fix equality on BISerializable (commit: 7499eea) (details)
  4. JCodeModel.parseType(String) silently ignores type params in specific scenarios (#1517) (commit: 88e484a) (details)
  5. use resources the maven way (3.8.2) (commit: ae4f3f6) (details)
  6. fix bug - Marshalling an object that overrides the parent's method, the XML that created contains both child's and parent's tag, the problem was in serializeBody method in the reflection section. the condition should check if the super class contains the declared field that the child overrides. (#1590) (commit: 7eea0bd) (details)
  7. add a test for #1590 (commit: 6996828) (details)
  8. Include default namespace in DOMScanner (commit: b07e757) (details)
  9. prepare poms for the release (commit: 9348d6d) (details)
  10. fix gh action build (commit: 2d48c8b) (details)
Commit a427215893ed65ca63c19bce5b1d3980426e3058 by Lukas Jungmann
Prepare release com.sun.xml.bind.mvn:jaxb-ri:2.3.5
(commit: a427215)
The file was modified jaxb-ri/docs/www/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/pom.xml (diff)
The file was modified jaxb-ri/boms/bom/pom.xml (diff)
The file was modified jaxb-ri/bundles/osgi/pom.xml (diff)
The file was modified jaxb-ri/bundles/xjc/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/core/pom.xml (diff)
The file was modified jaxb-ri/txw/pom.xml (diff)
The file was modified jaxb-ri/external/relaxng-datatype/pom.xml (diff)
The file was modified jaxb-ri/txw/runtime/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/jxc/pom.xml (diff)
The file was modified jaxb-ri/boms/bom-ext/pom.xml (diff)
The file was modified jaxb-ri/codemodel/codemodel-annotation-compiler/pom.xml (diff)
The file was modified jaxb-ri/bundles/osgi/osgi/pom.xml (diff)
The file was modified jaxb-ri/bundles/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/parent/pom.xml (diff)
The file was modified jaxb-ri/bundles/jxc/pom.xml (diff)
The file was modified jaxb-ri/codemodel/codemodel/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/osgi/pom.xml (diff)
The file was modified jaxb-ri/docs/release-documentation/pom.xml (diff)
The file was modified jaxb-ri/bundles/runtime/pom.xml (diff)
The file was modified jaxb-ri/runtime/impl/pom.xml (diff)
The file was modified jaxb-ri/jxc/pom.xml (diff)
The file was modified jaxb-ri/external/rngom/pom.xml (diff)
The file was modified jaxb-ri/xjc/pom.xml (diff)
The file was modified jaxb-ri/docs/pom.xml (diff)
The file was modified jaxb-ri/txw/compiler/pom.xml (diff)
The file was modified jaxb-ri/xsom/pom.xml (diff)
The file was modified jaxb-ri/codemodel/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/runtime/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/xjc/pom.xml (diff)
The file was modified jaxb-ri/bundles/ri/pom.xml (diff)
The file was modified jaxb-ri/samples/pom.xml (diff)
The file was modified jaxb-ri/external/pom.xml (diff)
The file was modified jaxb-ri/pom.xml (diff)
The file was modified jaxb-ri/runtime/pom.xml (diff)
The file was modified jaxb-ri/bundles/osgi/tests/pom.xml (diff)
Commit 529115851e5f190a9b80012fe5ac4397a0e4f8ca by Lukas Jungmann
Prepare next development cycle for 2.3.6-SNAPSHOT
(commit: 5291158)
The file was modified jaxb-ri/codemodel/codemodel-annotation-compiler/pom.xml (diff)
The file was modified jaxb-ri/runtime/pom.xml (diff)
The file was modified jaxb-ri/bundles/osgi/tests/pom.xml (diff)
The file was modified jaxb-ri/bundles/osgi/pom.xml (diff)
The file was modified jaxb-ri/bundles/runtime/pom.xml (diff)
The file was modified jaxb-ri/codemodel/pom.xml (diff)
The file was modified jaxb-ri/external/relaxng-datatype/pom.xml (diff)
The file was modified jaxb-ri/external/rngom/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/parent/pom.xml (diff)
The file was modified jaxb-ri/boms/bom/pom.xml (diff)
The file was modified jaxb-ri/bundles/jxc/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/jxc/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/runtime/pom.xml (diff)
The file was modified jaxb-ri/external/pom.xml (diff)
The file was modified jaxb-ri/xsom/pom.xml (diff)
The file was modified jaxb-ri/bundles/ri/pom.xml (diff)
The file was modified jaxb-ri/jxc/pom.xml (diff)
The file was modified jaxb-ri/bundles/xjc/pom.xml (diff)
The file was modified jaxb-ri/samples/pom.xml (diff)
The file was modified jaxb-ri/xjc/pom.xml (diff)
The file was modified jaxb-ri/runtime/impl/pom.xml (diff)
The file was modified jaxb-ri/docs/www/pom.xml (diff)
The file was modified jaxb-ri/codemodel/codemodel/pom.xml (diff)
The file was modified jaxb-ri/docs/pom.xml (diff)
The file was modified jaxb-ri/txw/compiler/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/pom.xml (diff)
The file was modified jaxb-ri/txw/runtime/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/osgi/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/xjc/pom.xml (diff)
The file was modified jaxb-ri/bundles/osgi/osgi/pom.xml (diff)
The file was modified jaxb-ri/docs/release-documentation/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/core/pom.xml (diff)
The file was modified jaxb-ri/pom.xml (diff)
The file was modified jaxb-ri/txw/pom.xml (diff)
The file was modified jaxb-ri/bundles/pom.xml (diff)
The file was modified jaxb-ri/boms/bom-ext/pom.xml (diff)
Commit 7499eeafcfbe61f647160944c25bd4b6ae6660d2 by Lukas Jungmann
Fix equality on BISerializable

If used in a GlobalBindings in multiple schema files, it might lead to an error caused by XJC thinking there are multiple different GlobalBinding definitions.

See Github issue 687.

Signed-off-by: Bjørn Mølgård Vester <bjornvester@gmail.com>
(commit: 7499eea)
The file was modified jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java (diff)
The file was modified jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/bindinfo/BISerializable.java (diff)
Commit 88e484a561a17baf77555ab81b9499a8f08cab32 by Lukas Jungmann
JCodeModel.parseType(String) silently ignores type params in specific scenarios (#1517)

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
(cherry picked from commit f6586dd2f11a6bb846b2b06b750ff3ea93559a36)
(commit: 88e484a)
The file was modified jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JCodeModel.java (diff)
The file was addedjaxb-ri/codemodel/codemodel/src/test/java/com/sun/codemodel/Issue1505Test.java
Commit ae4f3f6722436a7e3a1e6567bb39566f5b50fbe0 by Lukas Jungmann
use resources the maven way (3.8.2)
...to avoid depending on maven internals

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
(cherry picked from commit c60c3d853277cb4c73a9303a7f56eb8d78124803)
(commit: ae4f3f6)
The file was addedjaxb-ri/src/main/assembly/resources.xml
The file was modified jaxb-ri/external/pom.xml (diff)
The file was addedjaxb-ri/external/src/main/assembly/resources.xml
The file was modified jaxb-ri/pom.xml (diff)
The file was removedjaxb-ri/LICENSE.md
The file was addedjaxb-ri/codemodel/src/main/assembly/resources.xml
The file was modified jaxb-ri/codemodel/pom.xml (diff)
The file was removedjaxb-ri/License.html
Commit 7eea0bd2bb09283d65ebe2720afc3012ab78e79e by Lukas Jungmann
fix bug - Marshalling an object that overrides the parent's method, the XML that created contains both child's and parent's tag, the problem was in serializeBody method in the reflection section. the condition should check if the super class contains the declared field that the child overrides. (#1590)

* fix bug - Marshalling an object that overrides the parent's method, the XML that created contains both child's and parent's tag, the problem was in serializeBody method in the reflection section. the condition should check if the super class contains the declared field that the child overrides.

DTOs:
@XmlRootElement(name = "parent")
public class ParentDTO {
Protected String name;

@XmlElement(name= “parentName”)
getName) {
        return name;
    }
setName(String name) {
        this.name = name;
    }
}

@XmlRootElement(name = "child")
public class ChildDTO extends ParentDTO {

   @Override
   @XmlElement(name="childName")
    public String getName() {
        return name;
    }
}

Program:
Child child = new Child();
child.setName("aaa");

final Marshaller marshaller = JAXBContext.newInstance(ChildDTO.class).createMarshaller();
        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
        StringWriter stringWriter = new StringWriter();
        marshaller.marshal(ChildDTO, stringWriter);
        String xmlAsString = stringWriter.toString();

XML after Marshall:
<child>
<parentName> aa </parentName >
<childName> aa </ childName >
</child>

(cherry picked from commit be6d4fdf013290f96184063a48bc45ba6c3b2e40)
(commit: 7eea0bd)
The file was modified jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java (diff)
Commit 6996828e70dd11e45d16638f65ce1ecec0193bf6 by Lukas Jungmann
add a test for #1590

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
(cherry picked from commit db536c9957f23202c47b2bca8e171e382b891fb8)
(commit: 6996828)
The file was modified jaxb-ri/runtime/impl/pom.xml (diff)
The file was addedjaxb-ri/runtime/impl/src/test/java/com/sun/xml/bind/v2/runtime/ParentDTO.java
The file was addedjaxb-ri/runtime/impl/src/test/java/com/sun/xml/bind/v2/runtime/ChildDTO.java
The file was addedjaxb-ri/runtime/impl/src/test/java/com/sun/xml/bind/v2/runtime/InheritanceTest.java
Commit b07e757b225c2b008e29ac0cff336d69f890ac93 by Lukas Jungmann
Include default namespace in DOMScanner

(cherry picked from commit a0872e1e711240477d2c1af4f5748d4f4c061b02)
(commit: b07e757)
The file was addedjaxb-ri/core/src/test/java/org/glassfish/jaxb/core/unmarshaller/DOMScannerTest.java
The file was modified jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/unmarshaller/DOMScanner.java (diff)
The file was addedjaxb-ri/core/src/test/resources/parentDefaultNs.xml
Commit 9348d6d095170aebb243a182ed7ad25219d014d7 by Lukas Jungmann
prepare poms for the release

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
(commit: 9348d6d)
The file was modified jaxb-ri/bundles/runtime/pom.xml (diff)
The file was modified .gitignore (diff)
The file was modified jaxb-ri/external/relaxng-datatype/pom.xml (diff)
The file was modified jaxb-ri/bundles/ri/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/jxc/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/xjc/pom.xml (diff)
The file was modified jaxb-ri/boms/bom-ext/pom.xml (diff)
The file was modified jaxb-ri/xjc/pom.xml (diff)
The file was modified jaxb-ri/jxc/pom.xml (diff)
The file was modified jaxb-ri/docs/www/pom.xml (diff)
The file was modified jaxb-ri/bundles/jxc/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/pom.xml (diff)
The file was modified jaxb-ri/bundles/osgi/tests/pom.xml (diff)
The file was modified jaxb-ri/pom.xml (diff)
The file was modified jaxb-ri/txw/compiler/pom.xml (diff)
The file was modified jaxb-ri/txw/runtime/pom.xml (diff)
The file was modified jaxb-ri/boms/bom/pom.xml (diff)
The file was modified jaxb-ri/codemodel/pom.xml (diff)
The file was modified jaxb-ri/tools/config/copyright-exclude (diff)
The file was modified jaxb-ri/tools/osgi_tests/core/pom.xml (diff)
The file was modified jaxb-ri/runtime/impl/pom.xml (diff)
The file was modified jaxb-ri/txw/pom.xml (diff)
The file was modified jaxb-ri/docs/release-documentation/pom.xml (diff)
The file was modified jaxb-ri/bundles/osgi/pom.xml (diff)
The file was modified jaxb-ri/codemodel/codemodel/pom.xml (diff)
The file was modified jaxb-ri/bundles/xjc/pom.xml (diff)
The file was modified jaxb-ri/xsom/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/parent/pom.xml (diff)
The file was modified jaxb-ri/bundles/pom.xml (diff)
The file was modified jaxb-ri/codemodel/codemodel-annotation-compiler/pom.xml (diff)
The file was modified jaxb-ri/runtime/pom.xml (diff)
The file was modified jaxb-ri/samples/pom.xml (diff)
The file was modified jaxb-ri/external/rngom/pom.xml (diff)
The file was modified jaxb-ri/bundles/osgi/osgi/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/osgi/pom.xml (diff)
The file was modified jaxb-ri/external/pom.xml (diff)
The file was modified jaxb-ri/tools/osgi_tests/runtime/pom.xml (diff)
The file was modified jaxb-ri/docs/pom.xml (diff)
Commit 2d48c8b0838a863b5070a7c9161df3adcfee031f by Lukas Jungmann
fix gh action build

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
(commit: 2d48c8b)
The file was modified .github/workflows/maven.yml (diff)