subject:"\[isis\] 01\/01\: Merge remote\-tracking branch 'origin\/master' into spring6"

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-25 Thread ahuber

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/isis.git

commit 56a9d5d8d3da1f14440438572b3ae9a66ad719a9
Merge: f23fedb00b 350bd2c7da
Author: Andi Huber 
AuthorDate: Wed Jan 25 12:05:17 2023 +0100

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

 bom/pom.xml|  9 +
 .../runtimeservices/src/main/java/module-info.java |  1 -
 .../CausewayModuleCoreRuntimeServices.java |  4 ---
 examples/demo/domain/pom.xml   |  4 +++
 .../main/java/demoapp/dom/DemoModuleCommon.java|  2 ++
 .../src/main/java/demoapp/dom/menubars.layout.xml  |  2 +-
 extensions/core/docgen/pom.xml | 40 ++
 .../extensions/docgen/CausewayModuleExtDocgen.java | 26 --
 .../extensions/docgen/help}/DefaultHelpVm.java |  6 ++--
 .../docgen/help}/DefaultHelpVm.layout.xml  |  0
 .../docgen/help}/DocumentationService.java |  4 ++-
 .../docgen/help}/DocumentationServiceDefault.java  |  6 ++--
 .../extensions/docgen/menu}/DocumentationMenu.java |  7 ++--
 extensions/pom.xml |  1 +
 14 files changed, 86 insertions(+), 26 deletions(-)

diff --cc bom/pom.xml
index 7dc247973d,1720305b1d..174e6039d4
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -798,6 -790,15 +798,15 @@@ It is therefore a copy of org.apache:ap
jar
compile

+   
+   
+   
+   
org.apache.causeway.extensions
+   
causeway-extensions-docgen
 -  2.0.0-SNAPSHOT
++  3.0.0-SNAPSHOT
+   jar
+   compile
+   
  


diff --cc extensions/core/docgen/pom.xml
index 00,7a5316d456..de03b3aee5
mode 00,100644..100644
--- a/extensions/core/docgen/pom.xml
+++ b/extensions/core/docgen/pom.xml
@@@ -1,0 -1,40 +1,40 @@@
+ 
+ 
+ http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+ 4.0.0
+ 
+ 
+ org.apache.causeway.extensions
+ causeway-extensions
 -2.0.0-SNAPSHOT
++3.0.0-SNAPSHOT
+ ../../pom.xml
+ 
+ 
+ causeway-extensions-docgen
+ Apache Causeway Ext - Docgen
+ 
+ 
+ Provides a set of code mining features that can help building 
documentation for your application.  
+ 
+ 
+ 
+   
+   org.apache.causeway.core
+   causeway-core-metamodel
+   
+ 
+   org.apache.causeway.valuetypes
+   
causeway-valuetypes-asciidoc-applib
+   
+ 
+ 
+ 
diff --cc 
extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/help/DefaultHelpVm.java
index 15860043b9,7294b520a0..512ee6885b
--- 
a/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/help/DefaultHelpVm.java
+++ 
b/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/help/DefaultHelpVm.java
@@@ -16,10 -16,10 +16,10 @@@
   *  specific language governing permissions and limitations
   *  under the License.
   */
- package org.apache.causeway.core.runtimeservices.helpui;
+ package org.apache.causeway.extensions.docgen.help;
  
 -import javax.inject.Inject;
 -import javax.inject.Named;
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.ViewModel;
  import org.apache.causeway.applib.annotation.DomainObject;
diff --cc 
extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/menu/DocumentationMenu.java
index b72d8d056f,83b92a5719..06eff442bc
--- 
a/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/menu/DocumentationMenu.java
+++ 
b/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/menu/DocumentationMenu.java
@@@ -16,10 -16,10 +16,10 @@@
   *  specific language governing permissions and limitations
   *  under the License.
   */
- package org.apache.causeway.core.runtimeservices.helpui;
+ package org.apache.causeway.extensions.docgen.menu;
  
 -import javax.inject.Inject;
 -import javax.inject.Named;
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.CausewayModuleApplib;
  import org.apache.causeway.applib.annotation.Action;

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-24 Thread ahuber

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/isis.git

commit f23fedb00bda128e422889ffac7b9bcf96d04338
Merge: eccda1da92 3775a77333
Author: Andi Huber 
AuthorDate: Tue Jan 24 11:08:14 2023 +0100

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

 .../causeway/core/metamodel/services/menubars/menubars.layout.xml | 4 ++--
 .../testing/fixtures/applib/fixturescripts/FixtureResult.layout.xml   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-24 Thread ahuber

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/isis.git

commit eccda1da92bcf09770257f2f0719a837719a53e5
Merge: a6a9575faa 49cf3dc02b
Author: Andi Huber 
AuthorDate: Tue Jan 24 10:13:06 2023 +0100

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

 .../extensions/secman/applib/user/dom/ApplicationUser.java | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-23 Thread ahuber

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/isis.git

commit a6a9575faaae19ce297f027c5a60a30402d3c94f
Merge: 553550a3e6 9310225b82
Author: Andi Huber 
AuthorDate: Tue Jan 24 08:41:04 2023 +0100

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

 .../models/EntityCollectionModelParented.java  | 32 ++
 .../viewer/wicket/model/models/UiObjectWkt.java|  4 --
 .../entity/collection/EntityCollectionPanel.java   | 10 +++--
 .../collection/EntityCollectionPanelFactory.java   | 33 +-
 .../wicket/ui/components/layout/bs/col/Col.java| 51 +-
 5 files changed, 70 insertions(+), 60 deletions(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-23 Thread ahuber

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/isis.git

commit 553550a3e6162a0107e27433808eedd4f7e4213a
Merge: f284f8668d cd1a4e02b8
Author: andi-huber 
AuthorDate: Mon Jan 23 16:16:20 2023 +0100

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

 .../tree/CausewayToWicketTreeAdapter.java  | 452 +++--
 .../ui/components/tree/_TreeExpansionModel.java|  83 
 .../ui/components/tree/_TreeModelTreeAdapter.java  | 133 ++
 .../ui/components/tree/_TreeModelTreeProvider.java |  71 
 .../ui/components/tree/_TreeNodeMemento.java   |  87 
 5 files changed, 437 insertions(+), 389 deletions(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-20 Thread ahuber

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/isis.git

commit f284f8668d31d418951ee1a367f638a39b03dadb
Merge: 479cec8893 6246ac231e
Author: Andi Huber 
AuthorDate: Fri Jan 20 10:02:14 2023 +0100

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

 .../main/java/org/apache/causeway/commons/io/JaxbUtils.java|  2 +-
 .../components/entity/icontitle/EntityIconAndTitlePanel.java   | 10 --
 .../org/apache/causeway/viewer/wicket/ui/util/WktTooltips.java |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-20 Thread ahuber

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/isis.git

commit 479cec8893ab82ddeea612f0964a9c3b56326258
Merge: 71a0918086 25c35caaaf
Author: Andi Huber 
AuthorDate: Fri Jan 20 09:03:47 2023 +0100

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

 api/applib/src/main/java/module-info.java  |  1 -
 .../runtimeservices/src/main/java/module-info.java |  2 +-
 .../CausewayModuleCoreRuntimeServices.java |  4 ++
 .../core/runtimeservices/helpui/DefaultHelpVm.java | 63 ++
 .../helpui/DefaultHelpVm.layout.xml| 37 +
 .../runtimeservices/helpui/DocumentationMenu.java  | 50 +
 .../helpui}/DocumentationService.java  | 10 ++--
 .../DocumentationServiceDefault.java   | 16 +++---
 .../src/main/java/demoapp/dom/menubars.layout.xml  |  5 ++
 .../bookmarkedpages/BookmarkedPagesPanel.java  |  3 +-
 .../CollectionPresentationSelectorPanel.java   |  3 +-
 .../CollectionContentsMultipleViewsPanel.java  |  3 +-
 .../entity/collection/EntityCollectionPanel.java   |  2 +-
 .../entity/header/EntityHeaderPanel.java   |  3 +-
 .../scalars/image/JavaAwtImagePanel.java   |  3 +-
 .../viewer/wicket/ui/panels/PanelAbstract.java | 15 --
 16 files changed, 162 insertions(+), 58 deletions(-)

diff --cc 
core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DefaultHelpVm.java
index 00,648e5ae940..15860043b9
mode 00,100644..100644
--- 
a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DefaultHelpVm.java
+++ 
b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DefaultHelpVm.java
@@@ -1,0 -1,63 +1,63 @@@
+ /*
+  *  Licensed to the Apache Software Foundation (ASF) under one
+  *  or more contributor license agreements.  See the NOTICE file
+  *  distributed with this work for additional information
+  *  regarding copyright ownership.  The ASF licenses this file
+  *  to you under the Apache License, Version 2.0 (the
+  *  "License"); you may not use this file except in compliance
+  *  with the License.  You may obtain a copy of the License at
+  *
+  *http://www.apache.org/licenses/LICENSE-2.0
+  *
+  *  Unless required by applicable law or agreed to in writing,
+  *  software distributed under the License is distributed on an
+  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  *  KIND, either express or implied.  See the License for the
+  *  specific language governing permissions and limitations
+  *  under the License.
+  */
+ package org.apache.causeway.core.runtimeservices.helpui;
+ 
 -import javax.inject.Inject;
 -import javax.inject.Named;
++import jakarta.inject.Inject;
++import jakarta.inject.Named;
+ 
+ import org.apache.causeway.applib.ViewModel;
+ import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.annotation.DomainObjectLayout;
+ import org.apache.causeway.applib.annotation.LabelPosition;
+ import org.apache.causeway.applib.annotation.Nature;
+ import org.apache.causeway.applib.annotation.ObjectSupport;
+ import org.apache.causeway.applib.annotation.Property;
+ import org.apache.causeway.applib.annotation.PropertyLayout;
+ import org.apache.causeway.applib.value.Markup;
+ import 
org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
+ 
+ import lombok.Getter;
+ import lombok.RequiredArgsConstructor;
+ 
+ @Named(CausewayModuleCoreRuntimeServices.NAMESPACE + ".DefaultHelpVm")
+ @DomainObject(nature = Nature.VIEW_MODEL)
+ @DomainObjectLayout(
+ named = "Application Help",
+ cssClassFa = "fa-regular fa-circle-question")
+ @RequiredArgsConstructor(onConstructor_ = {@Inject})
+ public class DefaultHelpVm implements ViewModel {
+ 
+ private final DocumentationServiceDefault documentationServiceDefault;
+ private final String title;
+ 
+ @ObjectSupport
+ public String title() {
+ return title;
+ }
+ 
+ @Property
+ @PropertyLayout(labelPosition = LabelPosition.NONE)
+ @Getter(lazy = true)
+ private final Markup helpContent = new 
Markup(documentationServiceDefault.getDocumentationAsHtml());
+ 
+ @Override
+ public String viewModelMemento() {
+ return title;
+ }
+ }
diff --cc 
core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DocumentationMenu.java
index a718c4552d,cfb27dae56..b72d8d056f
--- 
a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DocumentationMenu.java
+++ 
b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui/DocumentationMenu.java
@@@ -16,9 -16,10 +16,10 @@@
   *  specific language governing permissions and limitations
   *  under the License.
   */
- package

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-19 Thread ahuber

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/isis.git

commit 4f0357c2ea0831d006228eabb6f9fc6a38999e05
Merge: 9a54f2fe7d 0ab8dbf129
Author: Andi Huber 
AuthorDate: Thu Jan 19 16:42:19 2023 +0100

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

 .../commons/internal/reflection/_ClassCache.java   | 33 ++
 1 file changed, 21 insertions(+), 12 deletions(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-19 Thread ahuber

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/isis.git

commit 9a54f2fe7d6c3112e7637baefc9e4fe3eda88c55
Merge: 62ea3ce739 6d03ff13d5
Author: Andi Huber 
AuthorDate: Thu Jan 19 12:01:48 2023 +0100

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

 api/applib/src/main/java/module-info.java  |1 +
 .../applib/annotation/CollectionLayout.java|6 +-
 .../applib/annotation/DomainObjectLayout.java  |7 +-
 .../applib/annotation/TableDecoration.java |   60 -
 .../causeway/applib/annotation/TableDecorator.java |   89 ++
 .../layout/component/CollectionLayoutData.java |   19 +-
 .../layout/component/DomainObjectLayoutData.java   |   13 +-
 .../applib/layout/component/TableDecoration.java   |   31 -
 .../documentation/DocumentationService.java|   16 +-
 .../documentation/DocumentationServiceMenu.java|   78 ++
 .../commons/internal/reflection/_ClassCache.java   |   15 +-
 .../commons/internal/reflection/_Reflect.java  |   24 +
 .../core/config/CausewayConfiguration.java |   51 +-
 .../facets/CollectionLayoutConfigOptions.java  |   39 -
 .../facets/DomainObjectLayoutConfigOptions.java|   53 -
 core/metamodel/src/main/java/module-info.java  |1 +
 .../layout/CollectionLayoutFacetFactory.java   |4 +-
 .../PagedFacetForCollectionLayoutAnnotation.java   |7 +-
 ...va => CollectionLayoutTableDecoratorFacet.java} |   33 +-
 ...llectionLayoutTableDecoratorFacetAbstract.java} |   18 +-
 ...coratorFacetForCollectionLayoutAnnotation.java} |   10 +-
 ...ForCollectionLayoutAnnotationAsConfigured.java} |   10 +-
 ...TableDecoratorFacetForCollectionLayoutXml.java} |   34 +-
 ...ayoutTableDecoratorFacetFromConfiguration.java} |   10 +-
 .../DomainObjectLayoutFacetFactory.java|4 +-
 .../PagedFacetForDomainObjectLayoutAnnotation.java |7 +-
 ... => DomainObjectLayoutTableDecoratorFacet.java} |   35 +-
 ...inObjectLayoutTableDecoratorFacetAbstract.java} |   18 +-
 ...ratorFacetForDomainObjectLayoutAnnotation.java} |   10 +-
 ...rDomainObjectLayoutAnnotationAsConfigured.java} |   10 +-
 ...bleDecoratorFacetForDomainObjectLayoutXml.java} |   33 +-
 ...ayoutTableDecoratorFacetFromConfiguration.java} |   10 +-
 .../services/grid/GridSystemServiceAbstract.java   |8 +-
 .../core/metamodel/spec/feature/ObjectMember.java  |3 +-
 .../causeway/core/metamodel/util/Facets.java   |   26 +-
 .../runtimeservices/src/main/java/module-info.java |1 +
 .../documentation/DocumentationServiceDefault.java |  270 
 .../DomainObjectLayout/DomainObjectLayoutMenu.java |8 +
 .../plural/DomainObjectLayoutPluralVm.java |2 -
 ...inObjectLayoutTableDecoratorVm-description.adoc |4 +
 .../DomainObjectLayoutTableDecoratorVm.java}   |   35 +-
 .../DomainObjectLayoutTableDecoratorVm.layout.xml  |   49 +
 .../src/main/java/demoapp/dom/menubars.layout.xml  |1 +
 .../MetaModelRegressionTest.verify.approved.xml| 1374 ++--
 .../entity/collection/EntityCollectionPanel.java   |   31 +-
 .../StandaloneCollectionPanel.java |   31 +-
 .../viewer/wicket/ui/pages/PageAbstract.java   |   11 -
 .../DatatablesJavaScriptResourceReferenceInit.java |   77 --
 .../viewer/wicket/ui/panels/PanelAbstract.java |   15 +
 .../apache/causeway/viewer/wicket/ui/util/Wkt.java |6 +
 .../viewer/CausewayModuleViewerWicketViewer.java   |2 +
 .../wicketapp/config/DatatablesNetInitWkt.java |   50 +
 52 files changed, 1547 insertions(+), 1213 deletions(-)

diff --cc 
api/applib/src/main/java/org/apache/causeway/applib/layout/component/CollectionLayoutData.java
index 90cbbfa7a1,f291719f4d..a6c11998ed
--- 
a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CollectionLayoutData.java
+++ 
b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CollectionLayoutData.java
@@@ -22,15 -22,16 +22,16 @@@ import java.io.Serializable
  import java.util.ArrayList;
  import java.util.List;
  
- import org.apache.causeway.applib.annotation.Where;
- import org.apache.causeway.applib.layout.links.Link;
- 
 -import javax.xml.bind.annotation.XmlAttribute;
 -import javax.xml.bind.annotation.XmlElement;
 -import javax.xml.bind.annotation.XmlRootElement;
 -import javax.xml.bind.annotation.XmlTransient;
 -import javax.xml.bind.annotation.XmlType;
 +import jakarta.xml.bind.annotation.XmlAttribute;
 +import jakarta.xml.bind.annotation.XmlElement;
 +import jakarta.xml.bind.annotation.XmlRootElement;
 +import jakarta.xml.bind.annotation.XmlTransient;
 +import jakarta.xml.bind.annotation.XmlType;
  
+ import org.apache.causeway.applib.annotation.TableDecorator;
+ import org.apache.causeway.applib.annotation.Where;
+ import org.apache.causeway.applib.layout.links.Link;
+ 
  /**
   * Describes the layout of a single collection, broadly corresponds to the
   * {@link

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-13 Thread ahuber

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/isis.git

commit e5c9fa363239556ab39866b3fbdc5db95fe121d7
Merge: 59f04fcaff b4e1b03f1c
Author: Andi Huber 
AuthorDate: Fri Jan 13 20:11:52 2023 +0100

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

 .../setupguide/modules/eclipse/pages/about.adoc|  197 +--
 .../applib/util/schema/InteractionDtoUtils.java|2 +-
 .../util/schema/MemberExecutionDtoUtils.java   |   22 +-
 .../applib/util/JaxbUtilsDtoCloneTest.java |   83 ++
 bom/current-hierarchy.drawio.png   |  Bin 136479 -> 0 bytes
 bom/pom.xml| 1288 +++-
 .../causeway/commons/internal/base/_Bytes.java |   69 +-
 core/pom.xml   |  286 +
 .../plural/DomainObjectLayoutPluralVm.java |   19 +-
 extensions/pom.xml |  391 --
 extensions/vro/cors/pom.xml|   10 -
 mavendeps/pom.xml  |   50 +-
 .../subscriber/ExecutionSubscriberForTesting.java  |6 +-
 security/shiro/pom.xml |   29 +-
 .../modules/parent-pom/attachments/parent-pom.pptx |  Bin 49485 -> 0 bytes
 .../parent-pom/images/current-hierarchy.drawio.png |  Bin 0 -> 142027 bytes
 .../parent-pom/images/parent-pom.drawio.svg|4 -
 .../parent-pom/images/pom-hierarchy.drawio.png |  Bin 0 -> 184350 bytes
 starters/adoc/modules/parent-pom/pages/about.adoc  |4 +-
 starters/pom.xml   |  129 +-
 testing/pom.xml|  102 --
 valuetypes/markdown/pom.xml|   13 -
 valuetypes/pom.xml |  131 +-
 23 files changed, 1683 insertions(+), 1152 deletions(-)

diff --cc bom/pom.xml
index 0f10daa9af,e8690f7aeb..36f5fd48b1
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -101,11 -100,8 +100,8 @@@ It is therefore a copy of org.apache:ap
  
  7.11.0
  
 -3.5.5
 +4.0.0
  
- 
0.1.0
- 
1.0.0
- 
  6.0.1
  6.0.1
  6.0.3
@@@ -200,10 -187,11 +196,10 @@@
  3.0.6
  3.6.3 

  
 -${wicket.version} 
 -
${wicket.version}
 +9.12.0 
  

-   
+ 
Apache Development Snapshot 
Repository
  
https://repository.apache.org/content/repositories/snapshots
  
https://www.apache.org/images/asf_logo_wide_2016.png
@@@ -234,8 -222,1236 +230,1236 @@@
[6] 
https://github.com/moment/moment/blob/develop/LICENSE
  
  
- 
- 
+ 
+ 
+   
+ 
+   
+ 
+   
+ 
+   
+   org.apache.causeway.commons
+   causeway-commons
 -  2.0.0-SNAPSHOT
++  3.0.0-SNAPSHOT
+   jar
+   compile
+   
+ 
+ 
+   
+ 
+   
+   org.apache.causeway.core
+   causeway-core
 -  2.0.0-SNAPSHOT
++  3.0.0-SNAPSHOT
+   pom
+   compile
+   
+ 
+   
+   org.apache.causeway.core
+   causeway-applib
 -  2.0.0-SNAPSHOT
++  3.0.0-SNAPSHOT
+   jar
+   compile
+   
+   
+   org.apache.causeway.core
+   causeway-schema
 -  2.0.0-SNAPSHOT
++  3.0.0-SNAPSHOT
+   jar
+   compile
+   
+ 
+   
+   org.apache.causeway.core
+   
causeway-core-codegen-bytebuddy
 -  2.0.0-SNAPSHOT
++  3.0.0-SNAPSHOT
+   jar
+   compile
+   
+   
+   org.apache.causeway.core
+   
causeway-core-privileged
 -  2.0.0-SNAPSHOT
++  3.0.0-SNAPSHOT
+   jar
+   compile
+   
+   
+   org.apache.causeway.core
+

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-13 Thread ahuber

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/isis.git

commit 59f04fcaffd136ff41c91724cae9a448af4e7b79
Merge: ebccc8e5f8 bfe63b96aa
Author: Andi Huber 
AuthorDate: Fri Jan 13 10:21:57 2023 +0100

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

 .../modules/eclipse/images/2023-sts/1.png  | Bin 0 -> 42855 bytes
 .../modules/eclipse/images/2023-sts/2.png  | Bin 0 -> 24117 bytes
 .../modules/eclipse/images/2023-sts/3.png  | Bin 0 -> 28246 bytes
 .../modules/eclipse/images/2023-sts/4.png  | Bin 0 -> 21662 bytes
 .../modules/eclipse/images/2023-sts/5.png  | Bin 0 -> 20266 bytes
 .../modules/eclipse/images/2023-sts/6.png  | Bin 0 -> 13505 bytes
 .../modules/eclipse/images/2023-sts/7.png  | Bin 0 -> 29836 bytes
 .../modules/eclipse/images/2023-sts/8.png  | Bin 0 -> 37532 bytes
 .../modules/eclipse/images/2023-sts/9.png  | Bin 0 -> 48520 bytes
 .../modules/eclipse/images/2023-sts/A.png  | Bin 0 -> 73844 bytes
 .../modules/eclipse/images/2023-sts/B.png  | Bin 0 -> 85080 bytes
 .../modules/eclipse/images/2023-sts/C.png  | Bin 0 -> 124190 bytes
 .../modules/eclipse/images/2023-sts/D.png  | Bin 0 -> 46793 bytes
 .../modules/eclipse/images/2023-sts/E.png  | Bin 0 -> 15881 bytes
 bom/current-hierarchy.drawio.png   | Bin 0 -> 136479 bytes
 starters/pom.xml   | 132 +++--
 16 files changed, 46 insertions(+), 86 deletions(-)

diff --cc starters/pom.xml
index 8894fd5a1c,9bea733cd7..f49fd39aeb
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@@ -39,13 -39,13 +39,13 @@@
  

  
 -  11
 +  17
  
 -  2.7.7
 +  3.0.1
18.5.0
  
-   6.0.0.Alpha2 
-   
6.0.0-release
 
+   
 -  5.0.0.Final
++  6.0.0.Alpha2

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-12 Thread ahuber

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/isis.git

commit be5f03dc0f5319c97a1e593ba8becaa8be72b2e6
Merge: d91a40b84e 84bb8172a0
Author: Andi Huber 
AuthorDate: Thu Jan 12 11:16:57 2023 +0100

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

 .../core/metamodel/facetapi/FacetUtil.java | 19 +++
 .../PagedFacetForCollectionLayoutAnnotation.java   |  2 +-
 ...PagedFacetOverriddenByDataTablesDecoration.java |  2 +-
 .../fallback/PagedFacetFromConfiguration.java  |  4 +-
 .../PagedFacetForDomainObjectLayoutAnnotation.java |  4 +-
 ...PagedFacetOverriddenByDataTablesDecoration.java |  2 +-
 .../facets/object/paged/PagedFacetAbstract.java|  5 --
 .../managed/nonscalar/DataTableModel.java  |  6 +-
 .../core/metamodel/layout/LayoutFacetUtil.java |  7 ++-
 .../core/metamodel/spec/feature/ObjectMember.java  | 66 +++---
 ...omainObjectLayoutBookmarkingVm-description.adoc |  6 +-
 .../DomainObjectLayoutCssClassVm-description.adoc  |  8 ++-
 .../cssClass/DomainObjectLayoutCssClassVm.java | 14 +
 ...DomainObjectLayoutCssClassFaVm-description.adoc |  6 +-
 .../cssClassFa/DomainObjectLayoutCssClassFaVm.java | 14 +
 .../DomainObjectLayoutDescribedAsVm.java   | 14 +
 .../named/DomainObjectLayoutNamedVm.java   | 14 +
 .../paged/DomainObjectLayoutPagedVm.java   | 23 +++-
 starters/pom.xml   | 14 -
 .../wicket/model/models/EntityCollectionModel.java |  7 +--
 .../models/EntityCollectionModelAbstract.java  |  6 --
 .../model/models/EntityCollectionModelHidden.java  | 10 
 .../entity/icontitle/EntityIconAndTitlePanel.java  |  8 ++-
 23 files changed, 143 insertions(+), 118 deletions(-)

diff --cc 
examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassVm.java
index c2d9d29e44,170444ef36..b130f4ef30
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassVm.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassVm.java
@@@ -18,22 -18,18 +18,18 @@@
   */
  package demoapp.dom.domain.objects.DomainObjectLayout.cssClass;
  
 -import javax.inject.Named;
 -import javax.xml.bind.annotation.XmlAccessType;
 -import javax.xml.bind.annotation.XmlAccessorType;
 -import javax.xml.bind.annotation.XmlRootElement;
 -import javax.xml.bind.annotation.XmlType;
 +import jakarta.inject.Named;
 +import jakarta.xml.bind.annotation.XmlAccessType;
 +import jakarta.xml.bind.annotation.XmlAccessorType;
- import jakarta.xml.bind.annotation.XmlElement;
 +import jakarta.xml.bind.annotation.XmlRootElement;
 +import jakarta.xml.bind.annotation.XmlType;
  
  import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.annotation.DomainObjectLayout;
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
- import org.apache.causeway.applib.annotation.Optionality;
- import org.apache.causeway.applib.annotation.Property;
  
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- import lombok.Getter;
- import lombok.Setter;
  
  //tag::class[]
  @XmlRootElement(name = "root")
diff --cc 
examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaVm.java
index 0dc2ebbfd2,93c72143ce..b58d395ed2
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaVm.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaVm.java
@@@ -18,22 -18,18 +18,18 @@@
   */
  package demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa;
  
 -import javax.inject.Named;
 -import javax.xml.bind.annotation.XmlAccessType;
 -import javax.xml.bind.annotation.XmlAccessorType;
 -import javax.xml.bind.annotation.XmlRootElement;
 -import javax.xml.bind.annotation.XmlType;
 +import jakarta.inject.Named;
 +import jakarta.xml.bind.annotation.XmlAccessType;
 +import jakarta.xml.bind.annotation.XmlAccessorType;
- import jakarta.xml.bind.annotation.XmlElement;
 +import jakarta.xml.bind.annotation.XmlRootElement;
 +import jakarta.xml.bind.annotation.XmlType;
  
  import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.annotation.DomainObjectLayout;
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
- import org.apache.causeway.applib.annotation.Optionality;
- import org.apache.causeway.applib.annotation.Property;
  
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- import lombok.Getter;
- import lombok.Setter;

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-11 Thread ahuber

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/isis.git

commit 891ac2e2bf42e8a1b871d222a2f6843c121bccf4
Merge: cc1b11c2bf dddf6c89c5
Author: Andi Huber 
AuthorDate: Wed Jan 11 11:07:15 2023 +0100

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

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-10 Thread ahuber

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/isis.git

commit fc643f18ab214b570b3215547866f715e3b2f897
Merge: 8ca18d206b 9f9c8699df
Author: Andi Huber 
AuthorDate: Tue Jan 10 09:10:22 2023 +0100

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

 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc bom/pom.xml
index 3685479f7b,edd20d72f2..8fb22e0731
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -173,22 -169,17 +173,22 @@@ It is therefore a copy of org.apache:ap
  
  2.3.2
  
 -
5.0.0.Final
 -5.0.0.Final 
 +
6.0.0.Alpha2
 +3.0.0.Final
 +6.2.2.Final 
 +
6.2.2.Final
 +
  
  4.0.13
 -1.10.1
 +2.0.0-SNAPSHOT 
  1.4.0
  2.0.6 
 -2.7.7
 +3.0.1
  0.8.20
 --Xmx384m
 +
 +  -Xmx384m 
 +  
- 2.2.7
+ 2.2.8
  
  3.3.3

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-09 Thread ahuber

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/isis.git

commit 3bf2c51f10c10963bc0a236fd1d5bb328eecd83d
Merge: a46ea06fb6 ea9b478328
Author: Andi Huber 
AuthorDate: Mon Jan 9 10:28:11 2023 +0100

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

 .../image-2023-01-03-08-31-58-018.png  | Bin
 .../image-2023-01-03-17-58-33-718.png  | Bin
 .../image-2023-01-03-18-07-57-499.png  | Bin
 .../image-2023-01-03-18-10-33-567.png  | Bin
 .../image-2023-01-03-18-16-01-614.png  | Bin
 .../image-2023-01-03-18-22-59-542.png  | Bin
 .../image-2023-01-03-18-27-32-832.png  | Bin
 .../image-2023-01-03-18-33-23-116.png  | Bin
 .../image-2023-01-04-06-23-41-099.png  | Bin
 .../image-2023-01-04-06-25-56-926.png  | Bin
 .../image-2023-01-04-06-26-42-960.png  | Bin
 .../image-2023-01-04-06-29-02-083.png  | Bin
 .../image-2023-01-04-06-31-36-293.png  | Bin
 .../image-2023-01-05-11-44-09-855.png  | Bin
 antora/components/comguide/modules/ROOT/nav.adoc   |   3 +++
 .../modules/ROOT/pages/nightly-builds.adoc}|  10 +++-
 .../modules/ROOT/pages/nightly-deploys.adoc}   |  26 ++---
 .../ROOT}/partials/az-containerapp-create.adoc |   0
 .../conguide/modules/nightly-deploys/nav.adoc  |   2 +-
 bom/pom.xml|   2 +-
 incubator/viewers/vaadin/model/pom.xml |   8 +++
 starters/pom.xml   |  16 ++---
 .../viewer/wicketapp/config/JQueryInitWkt.java |   4 ++--
 23 files changed, 41 insertions(+), 30 deletions(-)

diff --cc bom/pom.xml
index ac2313e14c,46170e417c..ea4d02faaa
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -192,15 -183,15 +192,15 @@@ It is therefore a copy of org.apache:ap
  
  3.3.3
  
 -23.3.2
 +24.0.0.alpha5
  
 -9.12.0 
 +936167650a 
 +
  6.0.0 
  3.0.6
- 3.6.1 

+ 3.6.3 

  
 -${wicket.version} 
 -
${wicket.version}
 +9.12.0 
  


diff --cc starters/pom.xml
index 20b168e022,9cfc54a64a..26d63c6561
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@@ -39,12 -39,13 +39,13 @@@
  

  
 -  11
 +  17
  
 -  2.7.7
 +  3.0.1
18.5.0
  
 -  5.0.0.Final 
 +  6.0.0.Alpha2 
+   
6.0.0-release
 
  

  
@@@ -109,9 -110,9 +110,9 @@@

org.apache.causeway.testing

causeway-testing-fakedata-applib
 -  2.0.0-SNAPSHOT
 +  3.0.0-SNAPSHOT

-   
+ 

org.apache.causeway.testing

causeway-testing-fixtures-applib

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-06 Thread ahuber

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/isis.git

commit 45f8b915cc7f936d2a35a5bb1fa76df1d120186a
Merge: 9efda9a7d6 69e8e1882f
Author: andi-huber 
AuthorDate: Fri Jan 6 09:21:54 2023 +0100

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

 antora/components/conguide/antora.yml  |   1 +
 .../images/image-2023-01-03-08-31-58-018.png   | Bin 0 -> 77018 bytes
 .../images/image-2023-01-03-17-58-33-718.png   | Bin 0 -> 109418 bytes
 .../images/image-2023-01-03-18-07-57-499.png   | Bin 0 -> 172103 bytes
 .../images/image-2023-01-03-18-10-33-567.png   | Bin 0 -> 304198 bytes
 .../images/image-2023-01-03-18-16-01-614.png   | Bin 0 -> 182994 bytes
 .../images/image-2023-01-03-18-22-59-542.png   | Bin 0 -> 196650 bytes
 .../images/image-2023-01-03-18-27-32-832.png   | Bin 0 -> 248437 bytes
 .../images/image-2023-01-03-18-33-23-116.png   | Bin 0 -> 71103 bytes
 .../images/image-2023-01-04-06-23-41-099.png   | Bin 0 -> 100404 bytes
 .../images/image-2023-01-04-06-25-56-926.png   | Bin 0 -> 58685 bytes
 .../images/image-2023-01-04-06-26-42-960.png   | Bin 0 -> 21755 bytes
 .../images/image-2023-01-04-06-29-02-083.png   | Bin 0 -> 106044 bytes
 .../images/image-2023-01-04-06-31-36-293.png   | Bin 0 -> 199485 bytes
 .../images/image-2023-01-05-11-44-09-855.png   | Bin 0 -> 98140 bytes
 .../conguide/modules/nightly-deploys/nav.adoc  |   4 +
 .../modules/nightly-deploys/pages/about.adoc   | 641 +
 .../partials/az-containerapp-create.adoc   |  12 +
 antora/supplemental-ui/index.html  |  68 +--
 build.sh   |   2 +-
 examples/vanilla/pom.xml   |  41 --
 gitcommit.sh   |  33 +-
 latest-nightly.sh  |  22 -
 .../modules/ROOT/pages/features/where-am-i.adoc|   2 +-
 24 files changed, 694 insertions(+), 132 deletions(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2023-01-03 Thread ahuber

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/isis.git

commit 47b2b6c781b94882b097d475efbdc896ad57871f
Merge: 7c55b05b80 c99038bbb5
Author: andi-huber 
AuthorDate: Tue Jan 3 10:31:17 2023 +0100

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

 .../ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css| 3 +--
 .../ui/pages/common/bootstrap/css/bootstrap-overrides-flatly.css| 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-12-22 Thread ahuber

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/isis.git

commit d6421b925a8661516f491f4198c8865462946667
Merge: 17d6b7e79e 47f222c335
Author: Andi Huber 
AuthorDate: Thu Dec 22 12:10:22 2022 +0100

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

 .../causeway/applib/services/jaxb/JaxbService.java | 15 +---
 commons/src/main/java/module-info.java |  1 +
 .../org/apache/causeway/commons/io/JaxbUtils.java  | 42 +++
 .../apache/causeway/commons/io/JaxbUtilsTest.java  | 88 ++
 .../runtimeservices/jaxb/JaxbServiceDefault.java   | 22 +++---
 5 files changed, 128 insertions(+), 40 deletions(-)

diff --cc commons/src/main/java/module-info.java
index 9f46f0e78a,64d6499f39..f6b422e3ba
--- a/commons/src/main/java/module-info.java
+++ b/commons/src/main/java/module-info.java
@@@ -71,11 -72,12 +71,12 @@@ module org.apache.causeway.commons 
  requires transitive spring.beans;
  requires transitive spring.context;
  requires transitive spring.core;
 -requires java.inject;
 -requires java.annotation;
 -requires org.eclipse.persistence.moxy;
 +requires transitive jakarta.xml.bind;
 +requires transitive jakarta.inject;
 +requires jakarta.annotation;
  
  // JAXB JUnit test
 -opens org.apache.causeway.commons.internal.resources to java.xml.bind;
 -opens org.apache.causeway.commons.io to java.xml.bind;
 +opens org.apache.causeway.commons.internal.resources to jakarta.xml.bind;
++opens org.apache.causeway.commons.io to jakarta.xml.bind;
  
  }
diff --cc 
commons/src/test/java/org/apache/causeway/commons/io/JaxbUtilsTest.java
index 00,7243412394..d441b37a68
mode 00,100644..100644
--- a/commons/src/test/java/org/apache/causeway/commons/io/JaxbUtilsTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/io/JaxbUtilsTest.java
@@@ -1,0 -1,88 +1,88 @@@
+ /*
+  *  Licensed to the Apache Software Foundation (ASF) under one
+  *  or more contributor license agreements.  See the NOTICE file
+  *  distributed with this work for additional information
+  *  regarding copyright ownership.  The ASF licenses this file
+  *  to you under the Apache License, Version 2.0 (the
+  *  "License"); you may not use this file except in compliance
+  *  with the License.  You may obtain a copy of the License at
+  *
+  *http://www.apache.org/licenses/LICENSE-2.0
+  *
+  *  Unless required by applicable law or agreed to in writing,
+  *  software distributed under the License is distributed on an
+  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  *  KIND, either express or implied.  See the License for the
+  *  specific language governing permissions and limitations
+  *  under the License.
+  */
+ package org.apache.causeway.commons.io;
+ 
 -import javax.xml.bind.JAXBContext;
 -import javax.xml.bind.annotation.XmlAccessType;
 -import javax.xml.bind.annotation.XmlAccessorType;
 -import javax.xml.bind.annotation.XmlElement;
 -import javax.xml.bind.annotation.XmlRootElement;
 -import javax.xml.bind.annotation.XmlType;
++import jakarta.xml.bind.JAXBContext;
++import jakarta.xml.bind.annotation.XmlAccessType;
++import jakarta.xml.bind.annotation.XmlAccessorType;
++import jakarta.xml.bind.annotation.XmlElement;
++import jakarta.xml.bind.annotation.XmlRootElement;
++import jakarta.xml.bind.annotation.XmlType;
+ 
+ import org.junit.jupiter.api.Test;
+ 
+ import static org.junit.jupiter.api.Assertions.assertEquals;
+ 
+ import lombok.EqualsAndHashCode;
+ import lombok.Getter;
+ import lombok.Setter;
+ import lombok.val;
+ 
+ class JaxbUtilsTest {
+ 
+ @XmlRootElement(name = "type-a")
+ @XmlType
+ @XmlAccessorType(XmlAccessType.FIELD)
+ @EqualsAndHashCode
+ static class A {
+ 
+ @XmlElement(required = false)
+ @Getter @Setter private B nested;
+ }
+ 
+ @XmlRootElement(name = "type-b")
+ @XmlType
+ @XmlAccessorType(XmlAccessType.FIELD)
+ @EqualsAndHashCode
+ static class B {
+ 
+ @XmlElement(required = false)
+ @Getter @Setter private String string;
+ }
+ 
+ /**
+  * Works for arbitrary {@link XmlRootElement#name()} combinations,
+  * except you cannot use the same {@code name="root"} say on both {@link 
A} and {@link B}.
+  * 
+  * As {@link A} contains {@link B}, the {@link JAXBContext} for {@link A} 
should also bind type {@link B}.
+  * We are testing whether type-safe recovery especially for type {@link 
A} works as desired.
+  */
+ @Test
+ void typesafeUnmarshallingFromAmbiguousContext() {
+ 
+ // given
+ val b = new B();
+ b.setString("b-string");
+ val a = new A();
+ a.setNested(b);
+ 
+ // when ... doing a round trip
+ val aXml = JaxbUtils.toStringUtf8(a);
+ val bXml = JaxbUtils.toStringUtf8(b);
+ 
+ val

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-12-22 Thread ahuber

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/isis.git

commit 17d6b7e79e9f6b7a95895936abbab75a2ba8a58e
Merge: 1ab265d1f3 c3a663e87e
Author: Andi Huber 
AuthorDate: Thu Dec 22 10:30:39 2022 +0100

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

 bom/pom.xml | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --cc bom/pom.xml
index f80ba18497,49158fdf4c..7e2d1a5ae3
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -125,14 -124,14 +125,17 @@@ It is therefore a copy of org.apache:ap
  31.1-jre
  
  2.1
--
- 10.0.0
++
  1.0.2
  3.29.2-GA
- 6.0.0
 -
 -8.0.0
 -1.0.5 
 -4.0.4 
 -2.3.3 

++
 +4.0.1
 +4.0.0
++
++10.0.0
++6.0.0
++2.0.1
 +4.0.1
  
  0.4
  
2.0.2.Final

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-12-21 Thread ahuber

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/isis.git

commit 5a519fca58e8559c4774d28ba76652251d462f90
Merge: 0a55a90bf6 8a5af84c41
Author: Andi Huber 
AuthorDate: Wed Dec 21 15:56:00 2022 +0100

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

 .../causeway/applib/services/jaxb/JaxbService.java | 142 ++---
 .../commons/internal/reflection/_ClassCache.java   |  21 ++-
 .../org/apache/causeway/commons/io/JaxbUtils.java  |  49 ---
 .../beans/CausewayBeanTypeClassifierDefault.java   |   5 +-
 .../object/viewmodel/ViewModelFacetFactory.java|   6 +-
 .../ViewModelFacetForXmlRootElementAnnotation.java |  10 +-
 .../bootstrap/GridMarshallerServiceBootstrap.java  |  32 ++---
 .../runtimeservices/jaxb/JaxbServiceDefault.java   |  55 +++-
 .../conneg/ContentNegotiationServiceAbstract.java  |   4 +-
 9 files changed, 126 insertions(+), 198 deletions(-)

diff --cc 
api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java
index 9176eb46e3,f0f29ee976..6abb3b050a
--- 
a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java
+++ 
b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java
@@@ -18,13 -18,16 +18,16 @@@
   */
  package org.apache.causeway.applib.services.jaxb;
  
- import java.io.StringReader;
- import java.io.StringWriter;
  import java.util.Map;
  
 -import javax.xml.bind.JAXBContext;
 -import javax.xml.bind.Marshaller;
 -import javax.xml.bind.Unmarshaller;
++import jakarta.xml.bind.JAXBContext;
++import jakarta.xml.bind.Marshaller;
++import jakarta.xml.bind.Unmarshaller;
+ 
  import org.springframework.lang.Nullable;
  
- import org.apache.causeway.commons.internal.base._Casts;
+ import org.apache.causeway.applib.domain.DomainObjectList;
+ import org.apache.causeway.commons.functional.Try;
  import org.apache.causeway.commons.internal.base._NullSafe;
  import org.apache.causeway.commons.io.JaxbUtils;
  
diff --cc 
commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
index 17d877dd32,7d310367dc..445e1917a6
--- 
a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
+++ 
b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
@@@ -28,8 -28,9 +28,9 @@@ import java.util.Optional
  import java.util.function.Predicate;
  import java.util.stream.Stream;
  
 -import javax.annotation.PostConstruct;
 -import javax.inject.Inject;
 -import javax.xml.bind.annotation.XmlRootElement;
 +import jakarta.annotation.PostConstruct;
 +import jakarta.inject.Inject;
++import jakarta.xml.bind.annotation.XmlRootElement;
  
  import org.springframework.beans.factory.annotation.Autowired;
  import org.springframework.lang.Nullable;
diff --cc commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java
index 27c00b6c4a,da513d9471..dfad7ad267
--- a/commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java
+++ b/commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java
@@@ -27,14 -27,12 +27,13 @@@ import java.util.function.Consumer
  import java.util.function.UnaryOperator;
  import java.util.stream.Collectors;
  
 -import javax.xml.bind.JAXBContext;
 -import javax.xml.bind.JAXBElement;
 -import javax.xml.bind.Marshaller;
 -import javax.xml.bind.Unmarshaller;
  import javax.xml.namespace.QName;
  
 +import jakarta.xml.bind.JAXBContext;
 +import jakarta.xml.bind.JAXBElement;
 +import jakarta.xml.bind.Marshaller;
 +import jakarta.xml.bind.Unmarshaller;
- import jakarta.xml.bind.annotation.XmlRootElement;
 +
  import org.springframework.lang.Nullable;
  
  import org.apache.causeway.commons.functional.Try;
@@@ -75,9 -74,10 +75,10 @@@ public class JaxbUtils 
  
  /** uses MOXy */
  public void useMoxy() {
 -
setDefaultJAXBContextFactory(org.eclipse.persistence.jaxb.JAXBContextFactory.class,
 true);
 +
//setDefaultJAXBContextFactory(org.eclipse.persistence.jaxb.JAXBContextFactory.class,
 true);
  }
  
+ /** clears the system property override */
  public static void usePlatformDefault() {
  setDefaultJAXBContextFactory(null, true);
  }
diff --cc 
core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java
index c984fe1135,7ae4302e2a..295d3c07a4
--- 
a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java
+++ 
b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java
@@@ -21,8 -21,7 +21,7 @@@ package org.apache.causeway.core.config
  import java.io.Serializable;
  import java.lang.reflect.Modifier;
  
 -import javax.persistence.Entity;
 +import jakarta.persistence.Entity;
- import jakarta.xml.bind.annotation.XmlRootElement;
  
  import org.springframework.context.annotation.Profile;
  import

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-12-16 Thread ahuber

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/isis.git

commit f21465a753cb72b38e526544e94153cd2aaa8b32
Merge: f12c389f58 a27ea37b4d
Author: Andi Huber 
AuthorDate: Fri Dec 16 14:36:08 2022 +0100

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

 .github/workflows/ci-build-artifacts-no-push-maven.yml | 2 ++
 1 file changed, 2 insertions(+)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-12-16 Thread ahuber

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/isis.git

commit f12c389f587f844c1b5282526bca2586cf40727a
Merge: 651e8dd003 8220894066
Author: Andi Huber 
AuthorDate: Fri Dec 16 13:21:11 2022 +0100

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

 api/applib/pom.xml |7 -
 api/applib/src/main/java/module-info.java  |2 +-
 api/schema/pom.xml |   16 +-
 api/schema/src/main/java/module-info.java  |1 -
 bom/pom.xml|  702 ++-
 commons/pom.xml|   49 +-
 commons/src/main/java/module-info.java |1 +
 .../org/apache/causeway/commons/io/JaxbUtils.java  |   22 +-
 .../internal/resources/XmlRoundTripTest.java   |   25 +-
 core/config/pom.xml|   10 +-
 .../environment/CausewaySystemEnvironment.java |   20 +-
 core/jdk-supplemental/pom.xml  |  222 -
 core/pom.xml   |  688 +--
 core/runtimeservices/pom.xml   |5 +
 .../domainmodel/MetaModelRegressionTest.java   |   77 +-
 .../MetaModelRegressionTest.verify.approved.xml| 6466 ++--
 testing/archtestsupport/applib/pom.xml |5 +-
 testing/unittestsupport/applib/pom.xml |   14 +-
 viewers/restfulobjects/jaxrs-resteasy/pom.xml  |2 +-
 viewers/wicket/applib/pom.xml  |6 +
 20 files changed, 4137 insertions(+), 4203 deletions(-)

diff --cc api/applib/src/main/java/module-info.java
index 5bb86b67b4,e1af9f8a4a..3c71005697
--- a/api/applib/src/main/java/module-info.java
+++ b/api/applib/src/main/java/module-info.java
@@@ -138,8 -141,10 +138,9 @@@ module org.apache.causeway.applib 
  requires transitive spring.beans;
  requires transitive spring.context;
  requires transitive spring.core;
 -requires spring.tx;
  
  // JAXB viewmodels
+ opens org.apache.causeway.applib.annotation;
  opens org.apache.causeway.applib.layout.component;
  opens org.apache.causeway.applib.layout.grid.bootstrap;
  opens org.apache.causeway.applib.layout.grid;
diff --cc api/schema/pom.xml
index ad3cc6313c,09a61eefbc..dfc48d2d59
--- a/api/schema/pom.xml
+++ b/api/schema/pom.xml
@@@ -33,21 -29,21 +33,23 @@@

org.apache.causeway.schema

org/apache/causeway/schema

 +

-   
-   org.apache.causeway.core
-   causeway-jdk-supplemental
-   pom
-   

org.springframework
spring-context

+   
+   jakarta.xml.bind
+   jakarta.xml.bind-api
+   
+   
+   jakarta.inject
+   jakarta.inject-api
+   

- 

 +

xsd-to-java

diff --cc api/schema/src/main/java/module-info.java
index d4757b35d6,13e529690f..309ae906b4
--- a/api/schema/src/main/java/module-info.java
+++ b/api/schema/src/main/java/module-info.java
@@@ -24,10 -24,9 +24,9 @@@ module org.apache.causeway.schema 
  exports org.apache.causeway.schema.ixn.v2;
  exports org.apache.causeway.schema.chg.v2;
  
- requires java.xml;
 -requires java.xml.bind;
 +requires jakarta.xml.bind;
  requires spring.context;
 -requires java.inject;
 +requires jakarta.inject;
  
  opens org.apache.causeway.schema.metamodel.v2;
  opens org.apache.causeway.schema.common.v2;
diff --cc bom/pom.xml
index 3eba07b002,25427824ca..770bf8c520
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -126,12 -125,11 +126,13 @@@ It is therefore a copy of org.apache:ap
  
  2.1
  
- 10.0.0
+ 8.0.0
  1.0.2
  3.29.2-GA
 -4.0.1
 -2.3.3 

 +6.0.0
 +4.0.1
 +4.0.0
++4.0.1
  
  0.4
  
2.0.2.Final
@@@ -236,6 -229,691 +237,705 @@@
  maven-plugin-annotations
  ${maven.plugin.tools.version}
  
+ 
+ 
+ 
+   
+   com.fasterxml.woodstox
+   woodstox-core
+   6.4.0
+   
+   
+   org.codehaus.woodstox
+   stax2-api
+   4.2.1
+   
+   
+   org.eclipse.persistence
+   
org.eclipse.persistence.moxy
 -  2.7.11 
++

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-12-12 Thread ahuber

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/isis.git

commit d1b9b39f5380b7c433c31c1eaebbac10bc8e7bea
Merge: 66eda88297 9055c3e0d4
Author: Andi Huber 
AuthorDate: Mon Dec 12 14:49:35 2022 +0100

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

 .../services/appfeatui/ApplicationFeatureViewModel.java   |  2 +-
 .../ui/components/CollectionContentsAsExcelFactory.java   |  4 ++--
 .../selector/CollectionPresentationSelectorPanel.html |  6 +++---
 .../selector/CollectionPresentationSelectorPanel.java | 15 +++
 4 files changed, 13 insertions(+), 14 deletions(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-12-07 Thread ahuber

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/isis.git

commit 1c6de6c40614660ab8a66ee62a8c27426ef66e59
Merge: 755e7c99bb 3eda7f0463
Author: Andi Huber 
AuthorDate: Thu Dec 8 04:07:01 2022 +0100

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

 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc bom/pom.xml
index 1ade49b916,2a1d486ff7..f9a93f8bd0
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -190,10 -182,9 +190,10 @@@ It is therefore a copy of org.apache:ap
  
  3.3.2
  
- 23.2.10
+ 23.2.11
  
 -9.12.0 
 +936167650a 
 +
  6.0.0-M8 
  3.0.6
  3.6.1

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-12-07 Thread ahuber

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/isis.git

commit 755e7c99bbc3c58b961d7bec2dca7d8cb6bc6e08
Merge: bff66a253b 4ed4a347e1
Author: Andi Huber 
AuthorDate: Thu Dec 8 04:05:01 2022 +0100

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

 .../services/metamodel/MetaModelServiceMenu.java   | 121 +++--
 .../applib/services/metamodel/_CsvExport2.java | 115 
 .../causeway/commons/internal/base/_Text.java  |  20 +++-
 .../src/main/java/demoapp/dom/menubars.layout.xml  |   3 +-
 .../domainmodel/MetaModelRegressionTest.java   |   6 +-
 .../tooling/javamodel/test/AnalyzerTest.java   |  18 +--
 .../tooling/javamodel/test/ProjectSamples.java |  59 --
 7 files changed, 229 insertions(+), 113 deletions(-)

diff --cc 
api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
index 1329a51213,3ec270f50e..689d481ab7
--- 
a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
+++ 
b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
@@@ -42,17 -45,12 +42,14 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.services.jaxb.JaxbService;
  import org.apache.causeway.applib.value.Blob;
  import org.apache.causeway.applib.value.Clob;
- import org.apache.causeway.applib.value.NamedWithMimeType;
  import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
  import org.apache.causeway.commons.internal.collections._Sets;
- import org.apache.causeway.commons.internal.resources._Json;
  import org.apache.causeway.commons.internal.resources._Xml;
  import org.apache.causeway.commons.internal.resources._Xml.WriteOptions;
- import org.apache.causeway.commons.internal.resources._Yaml;
  import org.apache.causeway.schema.metamodel.v2.MetamodelDto;
  
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
  import lombok.val;
  
  /**
diff --cc 
regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
index cfb0d01703,9c697490e6..b134227494
--- 
a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
+++ 
b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
@@@ -18,9 -18,10 +18,10 @@@
   */
  package org.apache.causeway.testdomain.domainmodel;
  
+ import java.nio.charset.StandardCharsets;
  import java.util.List;
  
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
  import org.approvaltests.Approvals;
  import org.approvaltests.core.Options;

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-12-05 Thread ahuber

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/isis.git

commit bff66a253ba7f9f96af2c768750d3e12507235ea
Merge: 8a140409ad b0d74e2d7f
Author: Andi Huber 
AuthorDate: Mon Dec 5 13:50:48 2022 +0100

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

 .../services/metamodel/MetaModelServiceMenu.java   | 130 ++---
 .../domainmodel/MetaModelRegressionTest.java   |  15 +--
 2 files changed, 68 insertions(+), 77 deletions(-)

diff --cc 
api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
index c2d90f27c2,89e7d26dab..1329a51213
--- 
a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
+++ 
b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
@@@ -41,12 -45,15 +42,17 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.services.jaxb.JaxbService;
  import org.apache.causeway.applib.value.Blob;
  import org.apache.causeway.applib.value.Clob;
+ import org.apache.causeway.applib.value.NamedWithMimeType;
  import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
  import org.apache.causeway.commons.internal.collections._Sets;
+ import org.apache.causeway.commons.internal.resources._Json;
+ import org.apache.causeway.commons.internal.resources._Xml;
+ import org.apache.causeway.commons.internal.resources._Xml.WriteOptions;
+ import org.apache.causeway.commons.internal.resources._Yaml;
  import org.apache.causeway.schema.metamodel.v2.MetamodelDto;
  
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
  import lombok.val;
  
  /**
diff --cc 
regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
index 4526d07d23,24b356d071..cfb0d01703
--- 
a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
+++ 
b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
@@@ -18,10 -18,9 +18,9 @@@
   */
  package org.apache.causeway.testdomain.domainmodel;
  
- import java.nio.charset.StandardCharsets;
  import java.util.List;
  
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
  import org.approvaltests.Approvals;
  import org.approvaltests.core.Options;

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-12-04 Thread ahuber

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/isis.git

commit 91b9c12b6bd1bd19dd762012d2fdee7192a68a35
Merge: 9e154a8dd9 bd6a878946
Author: andi-huber 
AuthorDate: Sun Dec 4 10:57:37 2022 +0100

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

 .gitignore |3 +
 .../modules/applib/pages/index/ViewModel.adoc  |   20 +-
 .../pages/index/annotation/DomainObject.adoc   |2 +
 .../applib/pages/index/annotation/HomePage.adoc|2 +
 .../applib/pages/index/client/SuppressionType.adoc |1 +
 ...adLayoutXml.adoc => Object_downloadLayout.adoc} |   14 +-
 .../services/appfeatui/ApplicationTypeMember.adoc  |2 -
 .../services/command/CommandExecutorService.adoc   |8 +-
 .../services/command/CommandOutcomeHandler.adoc|6 +-
 .../index/services/factory/FactoryService.adoc |   30 +-
 .../index/services/grid/GridLoaderService.adoc |   34 +-
 .../services/grid/GridMarshallerService.adoc}  |9 +-
 .../pages/index/services/grid/GridService.adoc |1 +
 .../pages/index/services/layout/LayoutService.adoc |   60 +-
 .../index/services/marshal/MarshallerService.adoc  |   44 +
 .../index/services/menu/MenuBarsLoaderService.adoc |   16 +-
 .../menu/MenuBarsMarshallerService.adoc}   |   11 +-
 .../pages/index/services/menu/MenuBarsService.adoc |1 +
 .../services/repository/RepositoryService.adoc |2 +-
 .../modules/applib/pages/index/value/Blob.adoc |   40 +-
 .../modules/applib/pages/index/value/Clob.adoc |   73 +-
 .../HasInteractionId_commandLogEntry.adoc  |4 +
 .../HasUsername_recentCommandsByUser.adoc  |4 +
 .../contributions/Object_recentCommands.adoc   |2 +-
 ...ByUser.adoc => T_recentBackgroundCommands.adoc} |   12 +-
 .../applib/dom/CommandLogEntryRepository.adoc  |1 +
 .../dom/mixins/CommandLogEntry_childCommands.adoc  |2 +
 .../mixins/CommandLogEntry_openResultObject.adoc   |2 +
 .../mixins/CommandLogEntry_siblingCommands.adoc|2 +
 .../subscriber/CommandSubscriberForCommandLog.adoc |2 +
 .../CausewayModuleExtCommandReplaySecondary.adoc   |3 -
 .../secondary/job/JobExecutionData.adoc}   |   31 +-
 .../pages/index/excel/applib/ExcelService.adoc |2 +
 .../ExcelServiceDefault.adoc}  |   40 +-
 .../HasInteractionId_executionLogEntries.adoc  |4 +
 .../HasUsername_recentExecutionsByUser.adoc|4 +
 .../contributions/Object_recentExecutions.adoc |2 +-
 .../applib/dom/ExecutionLogEntryType.adoc  |2 +
 .../ExecutionLogEntry_siblingExecutions.adoc   |2 +
 .../applib/dom/ExecutionOutboxEntryType.adoc   |2 +
 .../applib/restapi/OutboxEvents.adoc   |4 +
 .../applib/restapi/OutboxRestApi.adoc  |2 +
 .../ContentMappingServiceForOutboxEvents.adoc  |2 +
 .../index/restfulobjects/client/RestfulClient.adoc |   43 +-
 ...ayModuleViewerRestfulObjectsJaxrsResteasy.adoc} |7 +-
 .../conneg/RestfulObjectsJaxbWriterForXml.adoc |0
 .../webmodule/WebModuleJaxrsResteasy.adoc} |8 +-
 ...ayModuleViewerRestfulObjectsJaxrsResteasy4.adoc |   12 -
 core/adoc/modules/_overview/pages/about.adoc   | 1236 
 scripts/ci/_print-environment.sh   |2 -
 scripts/ci/rename-all-published-sources.jsh|5 +-
 51 files changed, 1124 insertions(+), 699 deletions(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-12-01 Thread ahuber

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/isis.git

commit 9e154a8dd9b6d994ee3802158d9f080a697b2436
Merge: 613c6ea1c9 e4c07d0107
Author: Andi Huber 
AuthorDate: Fri Dec 2 07:19:46 2022 +0100

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

 bom/pom.xml | 2 +-
 tooling/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-11-29 Thread ahuber

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/isis.git

commit b3b7df4b4679d15cfdf2fa04153bb69d59406024
Merge: b016572340 d9422697a7
Author: Andi Huber 
AuthorDate: Wed Nov 30 06:07:32 2022 +0100

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

 bom/pom.xml|  6 +++---
 .../HasInteractionId_commandLogEntry.java  | 11 +++
 .../HasUsername_recentCommandsByUser.java  |  6 ++
 .../contributions/Object_recentCommands.java   |  2 +-
 .../dom/mixins/CommandLogEntry_childCommands.java  |  2 ++
 .../mixins/CommandLogEntry_openResultObject.java   |  3 +++
 .../mixins/CommandLogEntry_siblingCommands.java|  3 +++
 .../subscriber/CommandSubscriberForCommandLog.java |  3 +++
 .../extensions/excel/applib/ExcelService.java  | 22 --
 .../excel/applib/service/ExcelServiceDefault.java  | 10 +++---
 .../excel/applib/service/_ExcelServiceHelper.java  |  2 --
 .../HasInteractionId_executionLogEntries.java  | 10 ++
 .../HasUsername_recentExecutionsByUser.java|  5 +
 .../contributions/Object_recentExecutions.java |  2 +-
 .../applib/dom/ExecutionLogEntryType.java  |  3 +++
 .../ExecutionLogEntry_siblingExecutions.java   |  2 ++
 .../applib/dom/ExecutionOutboxEntryType.java   |  4 
 .../applib/restapi/OutboxEvents.java   | 10 ++
 .../applib/restapi/OutboxRestApi.java  |  4 
 .../ContentMappingServiceForOutboxEvents.java  |  1 +
 20 files changed, 91 insertions(+), 20 deletions(-)

diff --cc bom/pom.xml
index 1698fea67e,74d46d9126..63f3e5dab4
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -190,10 -182,9 +190,10 @@@ It is therefore a copy of org.apache:ap
  
  3.3.2
  
- 23.2.9
+ 23.2.10
  
 -9.12.0 
 +936167650a 
 +
  6.0.0-M8 
  3.0.6
  3.6.1

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-11-26 Thread ahuber

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/isis.git

commit ea39424abca82e63e3786673df9e1948ae4dfa82
Merge: 3d477576f9 442b269fe7
Author: Andi Huber 
AuthorDate: Sun Nov 27 06:55:13 2022 +0100

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

 .../attachments/Apache-Causeway.importorder| 15 +++--
 .../attachments/Apache-Causeway-importorder.xml| 16 ++---
 .../ROOT/pages/2022/2.0.0-RC1/mignotes.adoc| 22 +++
 .../applib/services/factory/FactoryService.java| 52 ---
 commons/src/main/java/module-info.java |  1 +
 .../commons/internal/reflection/_ClassCache.java   | 65 ---
 .../progmodel/ProgrammingModelConstants.java   | 20 +++---
 .../facets/HasPostConstructMethodCache.java| 58 -
 .../DomainObjectAnnotationFacetFactory.java| 20 +-
 .../facets/object/viewmodel/ViewModelFacet.java|  7 ++
 .../object/viewmodel/ViewModelFacetAbstract.java   | 30 -
 .../object/viewmodel/ViewModelFacetFactory.java| 23 ++-
 .../ViewModelFacetForDomainObjectAnnotation.java   | 12 ++--
 .../ViewModelFacetForSerializableInterface.java| 11 ++--
 .../ViewModelFacetForViewModelInterface.java   | 11 ++--
 .../ViewModelFacetForXmlRootElementAnnotation.java | 11 ++--
 .../core/metamodel/methods/MethodByClassMap.java   | 30 -
 .../dflt/ProgrammingModelFacetsJava11.java |  7 +-
 .../metamodel/facets/MethodFinderUtilsTest.java| 39 +++
 ...oicesFacetFromBoundedAnnotationFactoryTest.java |  3 +-
 .../DomainObjectAnnotationFacetFactoryTest.java|  3 +-
 .../RecreatableObjectFacetFactoryTest.java |  3 +-
 .../factory/FactoryServiceDefault.java | 75 --
 .../testdomain/factory/ViewModelFactoryTest.java   | 30 -
 24 files changed, 256 insertions(+), 308 deletions(-)

diff --cc commons/src/main/java/module-info.java
index de57015e03,51d62347e4..549197845b
--- a/commons/src/main/java/module-info.java
+++ b/commons/src/main/java/module-info.java
@@@ -70,11 -71,10 +70,12 @@@ module org.apache.causeway.commons 
  requires transitive spring.beans;
  requires transitive spring.context;
  requires transitive spring.core;
 -requires java.inject;
 -requires java.annotation;
 +
 +requires transitive jakarta.xml.bind;
 +requires transitive jakarta.inject;
++requires jakarta.annotation;
  
  // JAXB JUnit test
 -opens org.apache.causeway.commons.internal.resources to java.xml.bind;
 +opens org.apache.causeway.commons.internal.resources to jakarta.xml.bind;
  
  }
diff --cc 
commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
index 5227b1731e,375311e2bc..17d877dd32
--- 
a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
+++ 
b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
@@@ -27,6 -28,9 +28,9 @@@ import java.util.Optional
  import java.util.function.Predicate;
  import java.util.stream.Stream;
  
 -import javax.annotation.PostConstruct;
 -import javax.inject.Inject;
++import jakarta.annotation.PostConstruct;
++import jakarta.inject.Inject;
+ 
  import org.springframework.beans.factory.annotation.Autowired;
  import org.springframework.lang.Nullable;
  import org.springframework.util.ReflectionUtils;
diff --cc 
regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
index caf80bd1c5,81dc49a1de..fcb8625d10
--- 
a/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
+++ 
b/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
@@@ -18,7 -18,8 +18,8 @@@
   */
  package org.apache.causeway.testdomain.factory;
  
 -import javax.annotation.PostConstruct;
 -import javax.inject.Inject;
++import jakarta.annotation.PostConstruct;
 +import jakarta.inject.Inject;
  
  import org.junit.jupiter.api.Test;
  import org.springframework.boot.test.context.SpringBootTest;

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-11-24 Thread ahuber

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/isis.git

commit 19e048c046a377a6bbfbacac7b92d2e396d685dd
Merge: a95503b3bb 3881ffa078
Author: Andi Huber 
AuthorDate: Fri Nov 25 07:11:04 2022 +0100

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

 .github/dependabot.yml |  9 +-
 .../java/org/apache/causeway/applib/ViewModel.java | 38 +++--
 .../services/appfeatui/ApplicationNamespace.java   |  2 +
 .../applib/services/appfeatui/ApplicationType.java |  2 +
 .../services/appfeatui/ApplicationTypeAction.java  |  2 +
 .../appfeatui/ApplicationTypeCollection.java   |  2 +
 .../services/appfeatui/ApplicationTypeMember.java  | 14 +--
 .../appfeatui/ApplicationTypeProperty.java |  2 +
 bom/pom.xml|  2 +-
 commons/src/main/java/module-info.java |  2 +
 .../commons/internal/reflection/_ClassCache.java   | 14 +++
 core/config/pom.xml|  4 +-
 .../progmodel/ProgrammingModelConstants.java   | 45 +++---
 .../ViewModelSemanticCheckingFacetFactory.java | 22 +++--
 .../ViewModelFacetForViewModelInterface.java   | 99 +++---
 .../dom/domain/_interactions/InteractionDtoVm.java |  2 +
 .../feature/api/ApplicationFeatureChoices.java |  1 +
 .../dom/mixins/perms/UserPermissionViewModel.java  |  1 +
 .../testdomain/factory/ViewModelFactoryTest.java   | 70 +++
 starters/pom.xml   |  4 +-
 viewers/commons/prism/pom.xml  |  2 +-
 21 files changed, 263 insertions(+), 76 deletions(-)

diff --cc 
api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java
index 4519e702ec,ef2588d797..9787920f95
--- 
a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java
+++ 
b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java
@@@ -34,8 -37,6 +34,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
  import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
  
++import jakarta.inject.Inject;
 +import jakarta.inject.Named;
 +
  /**
   * @since 2.x  {@index}
   */
diff --cc 
api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java
index 2fa344e8f9,a528b2ba52..89b77c8868
--- 
a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java
+++ 
b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java
@@@ -33,8 -36,6 +33,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.DomainObjectLayout;
  import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
  
++import jakarta.inject.Inject;
 +import jakarta.inject.Named;
 +
  /**
   * @since 2.x  {@index}
   */
diff --cc 
api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java
index 4328914177,6949732a87..d516d75510
--- 
a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java
+++ 
b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java
@@@ -31,8 -34,6 +31,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.SemanticsOf;
  import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
  
++import jakarta.inject.Inject;
 +import jakarta.inject.Named;
 +
  /**
   * @since 2.x  {@index}
   */
diff --cc 
api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java
index c6f7d0d497,85eaf3a5b1..432ab59db5
--- 
a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java
+++ 
b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java
@@@ -29,8 -32,6 +29,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
  
++import jakarta.inject.Inject;
 +import jakarta.inject.Named;
 +
  /**
   * @since 2.x  {@index}
   */
diff --cc 
api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java
index 57ed3f440e,b80605b23e..bff7e144ec
--- 
a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java
+++ 
b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java
@@@ -32,7 -35,6 +32,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-11-23 Thread ahuber

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/isis.git

commit 2f728fecd96f22e174996fcac426524f63de31cb
Merge: e2b5fa7283 93fa6a21b8
Author: Andi Huber 
AuthorDate: Wed Nov 23 15:30:07 2022 +0100

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

 bom/pom.xml|   2 +-
 core/metamodel/pom.xml |   4 +-
 core/pom.xml   |   4 +-
 .../rendering/src/main/java/module-info.java   |   4 +-
 .../CausewayModuleRestfulObjectsRendering.java |   8 +-
 .../service/swagger/SwaggerServiceDefault.java |   6 +-
 .../service/swagger/internal/Caching.java  |  35 +-
 .../service/swagger/internal/Generation.java   | 844 -
 ...pecGenerator.java => OpenApiSpecGenerator.java} |  29 +-
 .../rendering/service/swagger/internal/RoSpec.java |  68 ++
 .../internal/ValuePropertyFactoryDefault.java  | 149 
 .../swagger/internal/ValuePropertyPlugin.java  |  75 --
 ...ropertyFactory.java => ValueSchemaFactory.java} |  21 +-
 .../internal/ValueSchemaFactoryDefault.java| 127 
 .../service/swagger/internal/_OpenApi.java | 117 +++
 .../swagger/internal/_OpenApiModelFactory.java | 813 
 .../rendering/service/swagger/internal/_Util.java  |  19 +-
 ...ationTest.java => OpenApiModelFactoryTest.java} |   8 +-
 .../viewer/resources/SwaggerSpecResource.java  |   5 +
 19 files changed, 1202 insertions(+), 1136 deletions(-)

diff --cc bom/pom.xml
index 2e41c14f48,78833db1fa..f6bca5dbbd
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -405,24 -405,17 +405,24 @@@ It is therefore a copy of org.apache:ap
  
  2.3.2
  
 -
5.0.0.Final
 -5.0.0.Final 
 +
6.0.0.Alpha2
 +3.0.0.Final
 +6.2.1.Final 
 +
6.2.1.Final
 +
  
  4.0.13
 -1.10.1
 +2.0.0-SNAPSHOT 
  1.4.0
  2.0.4 
 -2.7.5
 +3.0.0-RC2
  0.8.20
 --Xmx384m
 +
 +  -Xmx384m 
 +  --add-modules com.sun.tools.xjc 
 +  --add-reads 
org.eclipse.persistence.moxy=com.sun.tools.xjc
 +  
- 1.6.9
+ 2.2.7
  
  3.3.2
  
diff --cc 
viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/OpenApiSpecGenerator.java
index 51e6a6c78d,c785a587e6..7eb42b6d11
--- 
a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/OpenApiSpecGenerator.java
+++ 
b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/OpenApiSpecGenerator.java
@@@ -18,9 -18,9 +18,6 @@@
   */
  package 
org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal;
  
- import jakarta.inject.Inject;
- import jakarta.inject.Named;
 -import javax.inject.Inject;
 -import javax.inject.Named;
--
  import com.fasterxml.jackson.core.JsonProcessingException;
  
  import org.springframework.stereotype.Component;
@@@ -30,13 -30,13 +27,15 @@@ import org.apache.causeway.applib.servi
  import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
  import 
org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
  
- import io.swagger.models.Swagger;
- import io.swagger.util.Json;
- import io.swagger.util.Yaml;
+ import io.swagger.v3.core.util.Json;
+ import io.swagger.v3.core.util.Yaml;
+ import io.swagger.v3.oas.models.OpenAPI;
++import jakarta.inject.Inject;
++import jakarta.inject.Named;
  
  @Component
- @Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE + 
".SwaggerSpecGenerator")
- public class SwaggerSpecGenerator {
+ @Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE + 
".OpenApiSpecGenerator")
+ public class OpenApiSpecGenerator {
  
  private final SpecificationLoader specificationLoader;
  private final Tagger tagger;
diff --cc 
viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValueSchemaFactoryDefault.java
index 00,ca7e842c2f..6d4572ff78
mode 00,100644..100644
--- 
a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValueSchemaFactoryDefault.java
+++ 
b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/ValueSchemaFactoryDefault.java
@@@ -1,0 -1,128 +1,127 @@@
+ /*
+  *  Licensed to the Apache Software Foundation (ASF) under one
+  *  or more contributor license agreements.  See the NOTICE file
+  *  distributed with this work for additional information
+  *  regarding copyright ownership.  The

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-11-22 Thread ahuber

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/isis.git

commit e2b5fa7283a2a49ebd37cb8be11e26d94073ac21
Merge: 2fdf9285f0 ae9e97eae0
Author: Andi Huber 
AuthorDate: Wed Nov 23 05:18:30 2022 +0100

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

 bom/pom.xml|   2 +-
 .../domainobjects/ObjectAndActionInvocation.java   |  16 +++
 ...entNegotiationServiceForRestfulObjectsV1_0.java |  34 ++
 .../static/swagger-ui/index-ORIG-3.24.3.html   |  60 -
 .../static/swagger-ui/index-ORIG-4.15.5.html   |  19 +++
 .../src/main/resources/static/swagger-ui/index.css |  16 +++
 .../static/swagger-ui/oauth2-redirect.html |  41 ---
 .../static/swagger-ui/swagger-initializer.js   |  20 +++
 .../static/swagger-ui/swagger-ui-bundle.js | 135 +
 .../static/swagger-ui/swagger-ui-bundle.js.map |   2 +-
 .../static/swagger-ui/swagger-ui-es-bundle-core.js |   3 +
 .../swagger-ui/swagger-ui-es-bundle-core.js.map|   1 +
 .../static/swagger-ui/swagger-ui-es-bundle.js  |   3 +
 .../static/swagger-ui/swagger-ui-es-bundle.js.map  |   1 +
 .../swagger-ui/swagger-ui-standalone-preset.js |  23 +---
 .../swagger-ui/swagger-ui-standalone-preset.js.map |   2 +-
 .../resources/static/swagger-ui/swagger-ui.css |   3 +-
 .../resources/static/swagger-ui/swagger-ui.css.map |   2 +-
 .../main/resources/static/swagger-ui/swagger-ui.js |   9 +-
 .../resources/static/swagger-ui/swagger-ui.js.map  |   2 +-
 .../src/main/resources/swagger-ui/index.thtml  |  25 ++--
 .../pages/common/datatables/DatatablesDotNet.java  |   2 +-
 22 files changed, 144 insertions(+), 277 deletions(-)

diff --cc 
viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index 3bb1cf4958,42fe932d99..0db0a976be
--- 
a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++ 
b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@@ -21,14 -21,13 +21,13 @@@ package org.apache.causeway.viewer.rest
  import java.util.Collection;
  import java.util.List;
  import java.util.Optional;
- import java.util.stream.Collectors;
  
 -import javax.annotation.Priority;
 -import javax.inject.Inject;
 -import javax.inject.Named;
 -import javax.ws.rs.core.MediaType;
 -import javax.ws.rs.core.Response;
 -import javax.ws.rs.core.Response.ResponseBuilder;
 +import jakarta.annotation.Priority;
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
 +import jakarta.ws.rs.core.MediaType;
 +import jakarta.ws.rs.core.Response;
 +import jakarta.ws.rs.core.Response.ResponseBuilder;
  
  import org.springframework.beans.factory.annotation.Qualifier;
  import org.springframework.stereotype.Service;

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-11-21 Thread ahuber

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/isis.git

commit 2fdf9285f0a08d6827761ed03b23923b10363775
Merge: b726694c28 45fb722582
Author: Andi Huber 
AuthorDate: Tue Nov 22 06:14:17 2022 +0100

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

 bom/pom.xml| 4 ++--
 extensions/core/executionoutbox/restclient/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --cc bom/pom.xml
index 046a1ac5f5,8c8957e9b2..8277731253
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -405,26 -405,19 +405,26 @@@ It is therefore a copy of org.apache:ap
  
  2.3.2
  
 -
5.0.0.Final
 -5.0.0.Final 
 +
6.0.0.Alpha2
 +3.0.0.Final
 +6.2.1.Final 
 +
6.2.1.Final
 +
  
  4.0.13
 -1.10.1
 +2.0.0-SNAPSHOT 
  1.4.0
  2.0.4 
 -2.7.5
 +3.0.0-RC2
  0.8.20
 --Xmx384m
 +
 +  -Xmx384m 
 +  --add-modules com.sun.tools.xjc 
 +  --add-reads 
org.eclipse.persistence.moxy=com.sun.tools.xjc
 +  
  1.6.9
  
- 3.3.1
+ 3.3.2
  
  23.2.8

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-11-17 Thread ahuber

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/isis.git

commit 0c47551f07c92798af53455d1aa171e37e307b27
Merge: ac230b4b2a a7d41a2bbc
Author: Andi Huber 
AuthorDate: Fri Nov 18 07:56:48 2022 +0100

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

 bom/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc bom/pom.xml
index 99a31218f8,51a19aad6d..046a1ac5f5
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -405,23 -405,16 +405,23 @@@ It is therefore a copy of org.apache:ap
  
  2.3.2
  
 -
5.0.0.Final
 -5.0.0.Final 
 +
6.0.0.Alpha2
 +3.0.0.Final
 +6.2.1.Final 
 +
6.2.1.Final
 +
  
  4.0.13
 -1.10.0
 +2.0.0-SNAPSHOT 
  1.4.0
  2.0.4 
 -2.7.5
 +3.0.0-RC2
  0.8.20
 --Xmx384m
 +
-   -Xmx512m 
++  -Xmx384m 
 +  --add-modules com.sun.tools.xjc 
 +  --add-reads 
org.eclipse.persistence.moxy=com.sun.tools.xjc
 +  
  1.6.9
  
  3.3.1
@@@ -1422,11 -1351,7 +1422,12 @@@
  
  
  
 -@{argLine} 
-Xmx384m
 +
 +  @{argLine}
++  -Xmx384m
 +  --add-modules com.sun.tools.xjc 
 +  --add-reads 
org.eclipse.persistence.moxy=com.sun.tools.xjc 
 +

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-11-17 Thread ahuber

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/isis.git

commit e77f57aa69c530f395f57a29a458a5816084
Merge: 147d72e186 866057af28
Author: Andi Huber 
AuthorDate: Thu Nov 17 14:29:20 2022 +0100

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

 .../applib/pages/index/annotation/hooks/Property_025-projecting.adoc  | 4 ++--
 .../apache/causeway/applib/services/repository/RepositoryService.java | 4 ++--
 .../core/runtimeservices/repository/RepositoryServiceDefault.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-11-16 Thread ahuber

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/isis.git

commit af74e1d64f2bc3f6d9d0488bee6516514627b899
Merge: d96a832c60 9822f11f08
Author: Andi Huber 
AuthorDate: Wed Nov 16 11:33:02 2022 +0100

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

 testing/specsupport/applib/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-11-15 Thread ahuber

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/isis.git

commit 4e75946980e0b634b52dcdf32f16a56bbf34ff58
Merge: 063583acb1 022801d51f
Author: Andi Huber 
AuthorDate: Wed Nov 16 08:13:13 2022 +0100

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

 incubator/viewers/vaadin/model/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-11-15 Thread ahuber

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/isis.git

commit 063583acb17feee7131e8409a0cf8077f4c08945
Merge: 269226fde7 42901cc780
Author: Andi Huber 
AuthorDate: Wed Nov 16 08:11:06 2022 +0100

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

 .../apache/causeway/tooling/c4/test/C4Test.java| 58 +++---
 .../tooling/c4/test/baeldung-example-v2.puml   | 10 ++--
 tooling/pom.xml|  5 +-
 3 files changed, 37 insertions(+), 36 deletions(-)

diff --cc tooling/pom.xml
index adba8a7a46,a15ee2fbbc..0b103cd508
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@@ -39,10 -39,11 +39,11 @@@
  

org.apache.causeway.tooling

org/apache/causeway/tooling
 -  7.1.1
 +  
7.3-2021082516+
3.8.6
4.7.0
-   1.6.2
+   1.16.1
+   
1.6.3

[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

2022-11-14 Thread ahuber

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/isis.git

commit 4a74042650274bfa7e1a1ccdeb26dc7cadb6e4f6
Merge: ee4dda76b6 0b55c20138
Author: Andi Huber 
AuthorDate: Tue Nov 15 06:16:59 2022 +0100

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

 bom/pom.xml| 2 +-
 testing/specsupport/applib/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc bom/pom.xml
index 95c51b87d4,c9bcf70e5b..c450aba8d2
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -405,25 -405,19 +405,25 @@@ It is therefore a copy of org.apache:ap
  
  2.3.2
  
 -
5.0.0.Final
 -5.0.0.Final 
 +
6.0.0.Alpha2
 +6.2.1.Final 
 +
6.2.1.Final
 +
  
  4.0.13
 -1.10.0
 +2.0.0-SNAPSHOT 
  1.4.0
  2.0.3 
 -2.7.5
 +3.0.0-RC2
  0.8.11
 --Xmx512m
 +
 +  -Xmx512m 
 +  --add-modules com.sun.tools.xjc 
 +  --add-reads 
org.eclipse.persistence.moxy=com.sun.tools.xjc
 +  
  1.6.8
  
- 3.2.1
+ 3.3.0
  
  23.2.8

40 matches

Mail list logo