You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/03/03 04:51:53 UTC
[causeway] branch spring6 updated (6207f6b124 -> 8e1f6abf30)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
from 6207f6b124 Merge pull request #1470 from apache/dependabot/maven/spring6/resteasy.version-6.2.3.Final
add fa851c7e0d CAUSEWAY-3309: [Demo] flesh out DomainObjectLayoutXxxUiEvent
add b95eea4eb9 CAUSEWAY-3309: [Demo] adding alternative layouts to UIEvent demo
add 01f7fccec3 CAUSEWAY-3365: fixes custom layout not honored via LayoutUiEvent
add 14cd766cab CAUSEWAY-3309: [Demo] renaming the ui-events menu entry
add 1a24d94358 Bump maven-timeline from 1.6 to 1.8
add 6efc9b470a Merge pull request #1468 from apache/dependabot/maven/master/io.takari.maven-maven-timeline-1.8
add 9438580109 Bump checker-qual from 3.31.0 to 3.32.0
add 83693f1fd4 Merge pull request #1469 from apache/dependabot/maven/master/org.checkerframework-checker-qual-3.32.0
new 8e1f6abf30 CAUSEWAY-3275: [Incubating] Migrate from Spring Framework 5.x to 6.x
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../causeway/applib/events/ui/LayoutUiEvent.java | 4 +-
.../facets/object/grid/GridFacetDefault.java | 3 +-
.../DomainObjectLayout/DomainObjectLayoutMenu.java | 13 +---
...omainObjectLayoutDescribedAsVm-description.adoc | 2 +-
.../DomainObjectLayoutNamedVm-description.adoc | 2 +-
.../DomainObjectLayoutPagedVm-description.adoc | 2 +-
.../objects/DomainObjectLayout/plural/.gitkeep | 0
.../DomainObjectLayoutPluralVm-description.adoc | 7 ---
.../plural/DomainObjectLayoutPluralVm.java | 72 ----------------------
.../plural/DomainObjectLayoutPluralVm.layout.xml | 49 ---------------
.../DomainObjectLayoutXxxUiEventService.java | 68 ++++++++++++++++++++
...jectLayoutXxxUiEventVm-alternative1.layout.xml} | 2 +-
...jectLayoutXxxUiEventVm-alternative2.layout.xml} | 2 +-
...DomainObjectLayoutXxxUiEventVm-description.adoc | 2 +-
.../DomainObjectLayoutXxxUiEventVm-signature.svg | 1 +
.../xxxUiEvent/DomainObjectLayoutXxxUiEventVm.java | 18 +++++-
.../src/main/java/demoapp/dom/menubars.layout.xml | 2 +-
17 files changed, 101 insertions(+), 148 deletions(-)
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/.gitkeep
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm-description.adoc
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.java
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.layout.xml
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventService.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/{bookmarking/DomainObjectLayoutBookmarkingVm.layout.xml => xxxUiEvent/DomainObjectLayoutXxxUiEventVm-alternative1.layout.xml} (95%)
copy examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/{bookmarking/DomainObjectLayoutBookmarkingVm.layout.xml => xxxUiEvent/DomainObjectLayoutXxxUiEventVm-alternative2.layout.xml} (95%)
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventVm-signature.svg
[causeway] 01/01: CAUSEWAY-3275: [Incubating] Migrate from Spring Framework 5.x to 6.x
Posted by ah...@apache.org.
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 8e1f6abf302e95d857c3174f621c4634d8f650d1
Merge: 6207f6b124 83693f1fd4
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Mar 3 05:51:48 2023 +0100
CAUSEWAY-3275: [Incubating] Migrate from Spring Framework 5.x to 6.x
.../causeway/applib/events/ui/LayoutUiEvent.java | 4 +-
.../facets/object/grid/GridFacetDefault.java | 3 +-
.../DomainObjectLayout/DomainObjectLayoutMenu.java | 13 +---
...omainObjectLayoutDescribedAsVm-description.adoc | 2 +-
.../DomainObjectLayoutNamedVm-description.adoc | 2 +-
.../DomainObjectLayoutPagedVm-description.adoc | 2 +-
.../objects/DomainObjectLayout/plural/.gitkeep | 0
.../DomainObjectLayoutPluralVm-description.adoc | 7 ---
.../plural/DomainObjectLayoutPluralVm.java | 72 ----------------------
.../DomainObjectLayoutXxxUiEventService.java | 68 ++++++++++++++++++++
...jectLayoutXxxUiEventVm-alternative1.layout.xml} | 2 +-
...jectLayoutXxxUiEventVm-alternative2.layout.xml} | 2 +-
...DomainObjectLayoutXxxUiEventVm-description.adoc | 2 +-
.../DomainObjectLayoutXxxUiEventVm-signature.svg | 1 +
.../xxxUiEvent/DomainObjectLayoutXxxUiEventVm.java | 18 +++++-
.../src/main/java/demoapp/dom/menubars.layout.xml | 2 +-
16 files changed, 101 insertions(+), 99 deletions(-)
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventVm.java
index 33e89ef919,c5eaa3c61a..a711a0e806
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventVm.java
@@@ -18,14 -18,15 +18,15 @@@
*/
package demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent;
-import javax.inject.Named;
-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.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;