This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit f6581c56bf93a85e88ca438dce94468aeb4bae39
Merge: cbb9088283 1e635408e6
Author: Andi Huber <[email protected]>
AuthorDate: Tue Feb 21 07:38:31 2023 +0100

    Merge remote-tracking branch 'origin/master' into spring6

 README.adoc                                        |    6 +-
 .../ROOT/pages/antora-publish-procedure.adoc       |    2 +-
 .../pages/index/mixins/dto/hooks/Dto_see-also.adoc |    2 +-
 .../index/mixins/layout/Object_downloadLayout.adoc |    2 +
 .../applib/dom/AuditTrailEntryRepository.adoc      |    3 +
 ...ntityPropertyChangeSubscriberForAuditTrail.adoc |    2 +-
 .../subscriber/CommandSubscriberForCommandLog.adoc |    1 +
 .../ExecutionSubscriberForExecutionLog.adoc        |    1 +
 .../ExecutionSubscriberForExecutionOutbox.adoc     |   13 -
 ...e_open.adoc => HasUsername_associatedUser.adoc} |    6 +-
 antora/supplemental-ui/doap_causeway.rdf           |    8 +-
 .../applib/layout/component/package-info.java      |    2 +-
 .../causeway/applib/services/command/Command.java  |    2 +-
 .../jaxb/CatalogingSchemaOutputResolver.java       |    8 +-
 .../applib/services/jaxb/CausewaySchemas.java      |    2 +-
 .../src/main/adoc/modules/schema/pages/chg.adoc    |   12 +-
 .../src/main/adoc/modules/schema/pages/cmd.adoc    |   14 +-
 .../src/main/adoc/modules/schema/pages/common.adoc |   12 +-
 .../src/main/adoc/modules/schema/pages/ixn.adoc    |   20 +-
 .../src/main/adoc/modules/schema/pages/mml.adoc    |   20 +-
 .../src/main/resources/schema/chg/chg-2.0.xsd      |    8 +-
 .../src/main/resources/schema/cmd/cmd-2.0.xsd      |    8 +-
 .../main/resources/schema/common/common-2.0.xsd    |    4 +-
 .../src/main/resources/schema/ixn/ixn-2.0.xsd      |   12 +-
 .../resources/schema/metamodel/metamodel-2.0.xsd   |    4 +-
 core/adoc/modules/_overview/pages/about.adoc       | 2034 ++++++++++++--------
 .../metamodel/util/snapshot/CausewaySchema.java    |    4 +-
 .../core/metamodel/util/snapshot/XmlSchema.java    |    6 +-
 .../xmlsnapshot/XmlSnapshotServiceAbstractTest.xml |    2 +-
 .../demo/domain/src/main/resources/application.yml |    2 +-
 .../common/src/main/resources/static/index.html    |   10 +-
 .../MetaModelRegressionTest.verify.approved.xml    |    2 +-
 .../testdomain/value/ValueSemanticsTester.java     |    2 +-
 .../stable/src/main/resources/application.yml      |    2 +-
 .../fakedata/integtests/tests/Smoke_IntegTest.java |    2 +-
 .../ROOT/pages/setup-and-configuration.adoc        |    2 +-
 36 files changed, 1369 insertions(+), 873 deletions(-)

diff --cc 
api/applib/src/main/java/org/apache/causeway/applib/layout/component/package-info.java
index 71d4490c88,b99f91c5fd..d63c134565
--- 
a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/package-info.java
+++ 
b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/package-info.java
@@@ -27,13 -27,13 +27,13 @@@
   * </p>
   *
   */
 [email protected](
 [email protected](
          namespace = "https://causeway.apache.org/applib/layout/component";,
 -        elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
 +        elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED,
          xmlns = {
 -                @javax.xml.bind.annotation.XmlNs(
 +                @jakarta.xml.bind.annotation.XmlNs(
                          namespaceURI = 
"https://causeway.apache.org/applib/layout/component";, prefix = "cpt")
          }        // specifying the location seems to cause 
JaxbService#toXsd() to not generate the schema; not sure why...
-         //, location = 
..."http://causeway.apache.org/schema/metamodel/layout/common/common.xsd";
+         //, location = 
..."https://causeway.apache.org/schema/metamodel/layout/common/common.xsd";
          )
  package org.apache.causeway.applib.layout.component;

Reply via email to