diff --git a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml
index cd369f3e0..0ad5f203f 100644
--- a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml
+++ b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml
@@ -35,12 +35,21 @@
#1708: add javadoc from xsd documentation tags
+
+ #1724: JAXBContext having defaultNamespaceRemap after release 4.0.3 produces unexpected xml
+
+
+ #1731: Incompatibility with namespace when marshalling WebFault with FaultInfo on call of WebService
+
#1736: xjc: postProcessModel is not called for DTDs
#1737: Add https to special handling in package name derivation
+
+ #1742: Unexpected form=qualified Attribute in XSD Elements
+
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/PropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/PropertyInfoImpl.java
index 0cf3a480c..dd2fb9b37 100644
--- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/PropertyInfoImpl.java
+++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/PropertyInfoImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 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
@@ -350,7 +350,7 @@ private QName calcXmlName(String uri,String local) {
uri = "";
}
} else {
- uri = parent.builder.defaultNsUri;
+ uri = "";
}
}
return new QName(uri.intern(),local.intern());
diff --git a/jaxb-ri/runtime/impl/src/test/java/org/glassfish/jaxb/runtime/v2/NsRemapTest.java b/jaxb-ri/runtime/impl/src/test/java/org/glassfish/jaxb/runtime/v2/NsRemapTest.java
deleted file mode 100644
index 64843580a..000000000
--- a/jaxb-ri/runtime/impl/src/test/java/org/glassfish/jaxb/runtime/v2/NsRemapTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 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
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-package org.glassfish.jaxb.runtime.v2;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-import org.glassfish.jaxb.runtime.api.JAXBRIContext;
-import org.glassfish.jaxb.runtime.api.TypeReference;
-import org.junit.Assert;
-import org.junit.Test;
-
-import javax.xml.namespace.QName;
-import java.io.Serializable;
-import java.io.StringWriter;
-import java.util.Arrays;
-import java.util.Collections;
-
-public class NsRemapTest {
-
- @Test
- public void testNsRemap() throws Exception {
- TypeReference tr1 = new TypeReference(new QName("", "generalAddress"),
- GeneralAddress.class, GeneralAddress.class.getAnnotations());
- TypeReference tr2 = new TypeReference(new QName("", "address"),
- Address.class, Address.class.getAnnotations());
-
- JAXBRIContext c = JAXBRIContext.newInstance(new Class[] {GeneralAddress.class, Address.class},
- Arrays.asList(tr1,tr2), Collections.emptyMap(), "http://test.com/ns",false, null);
-
- Address ai = new Address();
- ai.setList("...list...");
- GeneralAddress ga = new GeneralAddress();
- ga.setAddress(ai);
-
- StringWriter sw = new StringWriter();
- c.createMarshaller().marshal(ga, sw);
- Assert.assertTrue(sw.toString().contains(
- "...list..."));
- }
-
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "")
- @XmlRootElement(name = "generalAddress")
- public static class GeneralAddress implements Serializable {
-
- private final static long serialVersionUID = 1L;
- protected Address address;
-
- public Address getAddress() {
- return address;
- }
-
- public void setAddress(Address value) {
- this.address = value;
- }
-
- }
-
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "")
- @XmlRootElement(name = "address")
- public static class Address implements Serializable {
-
- private final static long serialVersionUID = 1L;
- protected String list;
-
- public String getList() {
- return list;
- }
-
- public void setList(String value) {
- this.list = value;
- }
-
- }
-
-}