You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2024/07/05 16:21:35 UTC

(causeway) branch v3 updated (731b705ae5 -> f782abdca9)

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

danhaywood pushed a change to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway.git


    from 731b705ae5 Merge branch 'master' into v3
     add 68bab50ce7 CAUSEWAY-3715: bumps version to 3.1.0
     add a2d99ed9ab CAUSEWAY-3715: resetting version
     new 04eae69450 CAUSEWAY-3715 : makes scripts executable in git
     new 6bfccf6139 CAUSEWAY-3715 : updates relnotes etc
     new d36a4ae670 : updates release notes, STATUS and doap_causeway.rdf
     new 2242d9ba97 CAUSEWAY-3715: updates release notes on updating the website
     add 761cebafea CAUSEWAY-3715: bumps version to 2.1.0
     add a35674369d CAUSEWAY-3715: resetting version
     new cd769bcb09 CAUSEWAY-3715 : makes scripts executable in git
     new 6c6e058984 CAUSEWAY-3715 : updates relnotes etc
     new 86935cd4ed : updates release notes, STATUS and doap_causeway.rdf
     new 1d41ee74d3 CAUSEWAY-3715: updates release notes on updating the website
     new 1f95fe4e8d Merge branch 'release-2.1.0-RC1' into release-3.1.0-RC1
     new d16668aae8 Merge branch 'release-3.1.0-RC1' into v3
     new 2a1142b2d1 Merge branch 'release-2.1.0-RC1'
     new f782abdca9 Merge branch 'master' into v3

The 12 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:
 STATUS                                             |   3 +
 .../ROOT/pages/post-release-successful.adoc        | 155 ++++++++++-------
 antora/components/relnotes/modules/ROOT/nav.adoc   |   2 +
 .../modules/ROOT/pages/2024/2.1.0/mignotes.adoc}   |   4 +-
 .../modules/ROOT/pages/2024/2.1.0/relnotes.adoc}   |   5 +-
 .../modules/ROOT/pages/2024/3.1.0/mignotes.adoc}   |   4 +-
 .../2024/3.1.0/relnotes.adoc}                      |  25 ++-
 .../relnotes/modules/ROOT/pages/about.adoc         |  79 ++++++---
 .../ROOT/partials/2024/2.0.0/_relnotes.adoc        |   5 +-
 .../ROOT/partials/2024/2.1.0/_relnotes.adoc        | 192 +++++++++++++++++++++
 antora/supplemental-ui/doap_causeway.rdf           |  20 ++-
 bom/pom.xml                                        |   2 +-
 scripts/clean-up-tags-local.sh                     |   0
 scripts/clean-up-tags-remote.sh                    |   0
 scripts/jira-release-notes.sh                      |   0
 scripts/ls-tags-remote.sh                          |   0
 scripts/verify-causeway-release.sh                 |   0
 17 files changed, 382 insertions(+), 114 deletions(-)
 copy antora/components/{refguide/modules/applib-classes/partials/layout/column-order.adoc => relnotes/modules/ROOT/pages/2024/2.1.0/mignotes.adoc} (89%)
 copy antora/components/{userguide/modules/ROOT/pages/meta-annotations.adoc => relnotes/modules/ROOT/pages/2024/2.1.0/relnotes.adoc} (84%)
 copy antora/components/{refguide/modules/applib-classes/partials/layout/column-order.adoc => relnotes/modules/ROOT/pages/2024/3.1.0/mignotes.adoc} (89%)
 copy antora/components/relnotes/modules/ROOT/{partials/2018/2.0.0-M1/mignotes/removed-configuration-properties.adoc => pages/2024/3.1.0/relnotes.adoc} (54%)
 create mode 100644 antora/components/relnotes/modules/ROOT/partials/2024/2.1.0/_relnotes.adoc
 mode change 100644 => 100755 scripts/clean-up-tags-local.sh
 mode change 100644 => 100755 scripts/clean-up-tags-remote.sh
 mode change 100644 => 100755 scripts/jira-release-notes.sh
 mode change 100644 => 100755 scripts/ls-tags-remote.sh
 mode change 100644 => 100755 scripts/verify-causeway-release.sh


(causeway) 01/12: CAUSEWAY-3715 : makes scripts executable in git

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit cd769bcb0925bbc1b97ba3e102aac0c1af4f5e85
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 5 15:18:19 2024 +0100

    CAUSEWAY-3715 : makes scripts executable in git
---
 scripts/clean-up-tags-local.sh     | 0
 scripts/clean-up-tags-remote.sh    | 0
 scripts/jira-release-notes.sh      | 0
 scripts/ls-tags-remote.sh          | 0
 scripts/verify-causeway-release.sh | 0
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/scripts/clean-up-tags-local.sh b/scripts/clean-up-tags-local.sh
old mode 100644
new mode 100755
diff --git a/scripts/clean-up-tags-remote.sh b/scripts/clean-up-tags-remote.sh
old mode 100644
new mode 100755
diff --git a/scripts/jira-release-notes.sh b/scripts/jira-release-notes.sh
old mode 100644
new mode 100755
diff --git a/scripts/ls-tags-remote.sh b/scripts/ls-tags-remote.sh
old mode 100644
new mode 100755
diff --git a/scripts/verify-causeway-release.sh b/scripts/verify-causeway-release.sh
old mode 100644
new mode 100755


(causeway) 04/12: CAUSEWAY-3715: updates release notes on updating the website

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 1d41ee74d3aa57ca852e980ed140e745eab27d29
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 5 16:53:16 2024 +0100

    CAUSEWAY-3715: updates release notes on updating the website
---
 .../ROOT/pages/post-release-successful.adoc        | 129 +++++++++++++--------
 1 file changed, 80 insertions(+), 49 deletions(-)

diff --git a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
index 4dc07bdf04..4efe430e44 100644
--- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
@@ -270,7 +270,7 @@ Apply any remaining documentation updates:
 
 ** copy the new schema(s) from
 +
-`api/schema/src/main/resources/o.a.i.s.xxx`
+`api/schema/src/main/resources/o.a.c.s.xxx`
 +
 to its versioned:
 +
@@ -293,34 +293,66 @@ We are now ready to xref:#generate-website[generate the website].
 [#generate-website]
 == Generate website
 
-We use Antora to generate the site, setting up a document maintenance branch to allow the website to be updated in the future if required.
-The `site.yml` references this documentation branch.
+We use Antora to generate the site, setting up a document maintenance branches `{page-causewayrelv2}` and `{page-causewayrelv3}`.
+These mirror the "rel/causeway-{page-causewayrelv2}" and "rel/causeway-{page-causewayrelv3}" (immutable) release tags, but are branches because they allow us to update the docs outside of formal releases.
 
-We therefore temporarily modify all of the `antora.yml` files (and update `index.html`) file and create a branch for this change; then we update `site.yml` with a reference to that new branch.
-All of this is changed after.
+The `site.yml` (which can be in any branch) references these documentation branches, but uses the link:https://docs.antora.org/antora/latest/playbook/urls-latest-version-segment/[latest version] support of Antora 3.x to reference the `{page-causewayrelv3}` version as "latest":
 
-NOTE: Previously we built a site with the current version and all previous versions.
-For the moment, though, we've simplified to just publish the current version.
-
-We also use the link:https://docs.antora.org/antora/latest/playbook/urls-latest-version-segment/[latest version] support of Antora 3.x so that the most recent version is made available as "latest".
-This has two benefits: first, the top-level `index.html` (in `supplemental-ui`) does not need to be updated, and secondly, this improves search engine results as there will always be a `latest` version.
+[source,yml]
+.site.yml
+----
+urls:
+    latest_version_segment: latest
+----
 
+This approach also means that the top-level `index.html` (from the Antora template) does not need to be modified; it can simply refer to "latest".
+To avoid duplicates in the Algolia search index, we also only index the "latest" directory.
 
-[#create-doc-branch]
-=== Create doc branch
 
-NOTE: At the time of writing we support two branches, `master` (for v2) and `v3`.
-Adjust these instructions if necessary.
+[#create-2.x.0-doc-branch]
+=== Create 2.x.0 doc branch
 
-First, we update all versions in `antora.yml`:
+* We create the `{page-causewayrelv2}` branch, at the rel/causeway-{page-causewayrelv2} release tag.
++
+[source,bash,subs="attributes+"]
+----
+git checkout -b {page-causewayrelv2}
+git reset --hard rel/causeway-{page-causewayrelv2}
+----
 
-* Update all `antora.yml` files to use the latest branch ({page-causewayrelv2}):
+* update all `antora.yml` files to use the latest branch ({page-causewayrelv2}):
 +
 [source,bash,subs="attributes+"]
 ----
 find . -name antora.yml -exec sed -i 's/latest/{page-causewayrelv2}/g' {} \;
 ----
 
+* build framework
++
+[source,bash,subs="attributes+"]
+----
+pushd bom
+mvnd clean install -T1C -DskipTests -Dgithub
+popd
+----
+
+* if necessary, build the module tooling, as per xref:release-process-prereqs.adoc#doc-tooling[doc tooling prereqs] process.
+
+* generate the website:
++
+[source,bash,subs="attributes+"]
+----
+sh preview.sh
+----
+
+* if any files have changed, then commit:
++
+[source,bash,subs="attributes+"]
+----
+git add .
+git commit -m "$CAUSEWAYJIRA: updates docs on new release branch"
+----
+
 * Commit all these changes:
 +
 [source,bash,subs="attributes+"]
@@ -329,26 +361,30 @@ git add .
 git commit -m "$CAUSEWAYJIRA: bumps antora.yml versions to $CAUSEWAYREL"
 ----
 
-We now create a branch which can be referenced in the `site.yml`, later on.
-
-* We create the `{page-causewayrelv2}` branch.
-+
-This mirrors the "rel/causeway-{page-causewayrelv2}" used for the formal (immutable) release tag, but is a branch because it allows us to move it, and must have this simplified name as it is used in the "edit page" link of the site template.
+* Push the documentation branch:
 +
 [source,bash,subs="attributes+"]
 ----
-git branch {page-causewayrelv2}
-git push origin {page-causewayrelv2}
+git push origin {page-causewayrelv2} -u
 ----
 
-Now we make sure that the docs in the new doc branch are actually up-to-date.
-(There is no need to update `site.yml`, because at this stage it continues to refer to the `HEAD` branch):
 
-* checkout the branch:
+[#create-3.x.0-doc-branch]
+=== Create 3.x.0 doc branch
+
+* We create the `{page-causewayrelv3}` branch, at the rel/causeway-{page-causewayrelv3} release tag.
 +
 [source,bash,subs="attributes+"]
 ----
-git checkout {page-causewayrelv2}
+git checkout -b {page-causewayrelv3}
+git reset --hard rel/causeway-{page-causewayrelv3}
+----
+
+* update all `antora.yml` files to use the latest branch ({page-causewayrelv3}):
++
+[source,bash,subs="attributes+"]
+----
+find . -name antora.yml -exec sed -i 's/latest/{page-causewayrelv3}/g' {} \;
 ----
 
 * build framework
@@ -377,33 +413,31 @@ git add .
 git commit -m "$CAUSEWAYJIRA: updates docs on new release branch"
 ----
 
+* Commit all these changes:
++
+[source,bash,subs="attributes+"]
+----
+git add .
+git commit -m "$CAUSEWAYJIRA: bumps antora.yml versions to $CAUSEWAYREL"
+----
 
-* push the updated doc branch:
+* Push the documentation branch:
 +
 [source,bash,subs="attributes+"]
 ----
-git push origin {page-causewayrelv2}
+git push origin {page-causewayrelv3} -u
 ----
 
 
 [#generate-the-site]
 === Generate the site
 
-To build the site , we need to update the `site.yml`.
-This is done in the release branch (`$CAUSEWAYBRANCH`), _not_ in the documentation branch for the current release ({page-causewayrelv2}).
+To build the site, we need to update the `site.yml`.
+
+This can be done from any branch, normally the release branch (`$CAUSEWAYBRANCH`) or `master`.
+
+NOTE: All that will be picked up from this branch is the `supplementary-ui` files (top-level index) and the `site.yml` playbook that identifies which branch(es) to include in the website.
 
-* Recreate the `website` branch off of `master`.
-+
-All that will be picked up from this branch is the `supplementary-ui` files (top-level index) and the `site.yml` playbook that identifies which branch(es) to include in the website.
-+
-[source,bash,subs="attributes+"]
-----
-git checkout master
-git branch -D website     #<.>
-git checkout -b website   #<.>
-----
-<.> delete the branch if necessary
-<.> recreate the branch
 
 * Update `site.yml` using `site.NEXT.yml`:
 
@@ -460,7 +494,6 @@ git commit -m "$CAUSEWAYJIRA: updates site.yml in readiness for website generati
 ----
 
 
-We are ready to actually generate the Antora website.
 
 * generate the website:
 +
@@ -472,11 +505,9 @@ sh preview.sh -AS
 This will write to `antora/target/site`; we'll use the results in the xref:#publish-website[next section].
 
 
-=== Revert site.yml
-
-Optionally, restore the original `site.yml` file.
-However, you might want to leave it as is in case there is a requirement to regenerate the website.
-In any case, when the next release comes around, we will delete this branch anyway.
+* Revert `site.yml`
++
+Restore the original `site.yml` file.
 
 
 include::partial$publish-and-index-website.adoc[]


(causeway) 07/12: : updates release notes, STATUS and doap_causeway.rdf

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit d36a4ae670f781a354735fb6731f1e0f82d681a4
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 5 16:24:58 2024 +0100

    : updates release notes, STATUS and doap_causeway.rdf
---
 STATUS                                               |  3 +++
 .../modules/ROOT/partials/2024/2.0.0/_relnotes.adoc  |  4 +++-
 antora/supplemental-ui/doap_causeway.rdf             | 20 ++++++++++++++++++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/STATUS b/STATUS
index fb6e6e91d4..286dce6ccf 100644
--- a/STATUS
+++ b/STATUS
@@ -25,6 +25,9 @@ Description
 
 TLP releases:
 
+  * causeway-3.1.0                                 :  5 Jul 2024
+  * causeway-2.1.0                                 :  5 Jul 2024
+
   * causeway-3.0.0                                 :  3 Apr 2024
   * causeway-2.0.0                                 :  3 Apr 2024
 
diff --git a/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc b/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc
index 922d03b249..70b11adfe0 100644
--- a/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc
@@ -85,7 +85,9 @@ In particular, "encapsulated" mode mean that the properties and collections of e
 
 ** supported custom scalar value types and composite types
 +
-This includes xref:valuetypes:asciidoc:about.adoc[AsciiDoc], xref:valuetypes:markdown:about.adoc[Markdown], xref:valuetypes:jodatime:about.adoc[] and xref:valuetypes:vega:about.adoc[Vega] (link:https://vega.github.io/vega-lite/[Vega-lite], "a grammar of interactive graphics").
+This includes xref:valuetypes:asciidoc:about.adoc[AsciiDoc], xref:valuetypes:markdown:about.adoc[Markdown], xref:valuetypes:jodatime:about.adoc[Jodatime] and xref:valuetypes:vega:about.adoc[Vega]
+(link:https://vega.github.io/vega-lite/[Vega-lite], "a grammar of interactive graphics").
+
 
 ** mixin classes annotated as `@Action`, `@Property` or `@Collection`
 
diff --git a/antora/supplemental-ui/doap_causeway.rdf b/antora/supplemental-ui/doap_causeway.rdf
index fab6db5cdf..faed38979f 100644
--- a/antora/supplemental-ui/doap_causeway.rdf
+++ b/antora/supplemental-ui/doap_causeway.rdf
@@ -39,8 +39,16 @@
     <release>
       <Version>
         <name>causeway</name>
-        <created>2024-04-03</created>
-        <revision>2.0.0</revision>
+        <created>2024-07-05</created>
+        <revision>3.1.0</revision>
+      </Version>
+    </release>
+
+    <release>
+      <Version>
+        <name>causeway</name>
+        <created>2024-07-05</created>
+        <revision>2.1.0</revision>
       </Version>
     </release>
 
@@ -52,6 +60,14 @@
       </Version>
     </release>
 
+    <release>
+      <Version>
+        <name>causeway</name>
+        <created>2024-04-03</created>
+        <revision>2.0.0</revision>
+      </Version>
+    </release>
+
     <release>
       <Version>
         <name>causeway</name>


(causeway) 12/12: Merge branch 'master' into v3

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f782abdca9bbfcf548310cd9f2ef5962f77b4adf
Merge: d16668aae8 2a1142b2d1
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 5 17:21:11 2024 +0100

    Merge branch 'master' into v3



(causeway) 06/12: CAUSEWAY-3715 : updates relnotes etc

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 6bfccf6139d41e3cc7416d22bdc5439887d8a964
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 5 16:07:25 2024 +0100

    CAUSEWAY-3715 : updates relnotes etc
---
 antora/components/relnotes/modules/ROOT/nav.adoc   |   2 +
 .../modules/ROOT/pages/2024/2.1.0/mignotes.adoc    |   7 +
 .../modules/ROOT/pages/2024/2.1.0/relnotes.adoc    |  10 ++
 .../modules/ROOT/pages/2024/3.1.0/mignotes.adoc    |   7 +
 .../modules/ROOT/pages/2024/3.1.0/relnotes.adoc    |  26 +++
 .../relnotes/modules/ROOT/pages/about.adoc         |  79 ++++++---
 .../ROOT/partials/2024/2.0.0/_relnotes.adoc        |   1 -
 .../ROOT/partials/2024/2.1.0/_relnotes.adoc        | 192 +++++++++++++++++++++
 8 files changed, 295 insertions(+), 29 deletions(-)

diff --git a/antora/components/relnotes/modules/ROOT/nav.adoc b/antora/components/relnotes/modules/ROOT/nav.adoc
index 6b96c69976..97d0f9289f 100644
--- a/antora/components/relnotes/modules/ROOT/nav.adoc
+++ b/antora/components/relnotes/modules/ROOT/nav.adoc
@@ -3,6 +3,8 @@
 
 
 * 2024
+** xref:relnotes:ROOT:2024/2.1.0/relnotes.adoc[2.1.0] and xref:relnotes:ROOT:2024/2.1.0/relnotes.adoc[3.1.0]
+** xref:relnotes:ROOT:2024/2.0.0/relnotes.adoc[2.0.0] and xref:relnotes:ROOT:2024/3.0.0/relnotes.adoc[3.0.0]
 ** xref:relnotes:ROOT:2024/2.0.0-RC4/relnotes.adoc[2.0.0-RC4]
 
 * 2023
diff --git a/antora/components/relnotes/modules/ROOT/pages/2024/2.1.0/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2024/2.1.0/mignotes.adoc
new file mode 100644
index 0000000000..abb5d94e2a
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/pages/2024/2.1.0/mignotes.adoc
@@ -0,0 +1,7 @@
+= Migrating from 2.0.0 to 2.1.0
+
+:Notice: 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 ag [...]
+:page-partial:
+
+
+No specific migration notes have been recorded to date.
diff --git a/antora/components/relnotes/modules/ROOT/pages/2024/2.1.0/relnotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2024/2.1.0/relnotes.adoc
new file mode 100644
index 0000000000..a6183d3823
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/pages/2024/2.1.0/relnotes.adoc
@@ -0,0 +1,10 @@
+[[r2.1.0]]
+= 2.1.0
+
+:Notice: 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 ag [...]
+:page-partial:
+
+
+v2.1.0 and v3.1.0 are being released at the same time, and are broadly equivalent.
+
+include::partial$2024/2.1.0/_relnotes.adoc[]
diff --git a/antora/components/relnotes/modules/ROOT/pages/2024/3.1.0/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2024/3.1.0/mignotes.adoc
new file mode 100644
index 0000000000..eb05a7c3ca
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/pages/2024/3.1.0/mignotes.adoc
@@ -0,0 +1,7 @@
+= Migrating from 3.0.0 to 3.1.0
+
+:Notice: 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 ag [...]
+:page-partial:
+
+
+No specific migration notes have been recorded to date.
diff --git a/antora/components/relnotes/modules/ROOT/pages/2024/3.1.0/relnotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2024/3.1.0/relnotes.adoc
new file mode 100644
index 0000000000..24e4d3a909
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/pages/2024/3.1.0/relnotes.adoc
@@ -0,0 +1,26 @@
+[[r3.1.0]]
+= 3.1.0
+
+:Notice: 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 ag [...]
+:page-partial:
+
+v2.1.0 and v3.1.0 are being released at the same time, and are broadly equivalent in terms of the features.
+However, they have different baseline dependencies:
+
+include::partial$2024/2.1.0/_relnotes.adoc[]
+
+
+
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Version `3.1.0` also has these additional changes not present in the `2.1.0`:
+
+== New Feature (1)
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3690[CAUSEWAY-3690] - [Programming Model] Support for Java Record as ViewModel
+
+
+== Won't Fix
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-2991[CAUSEWAY-2991] - [WON'T DO] Replace Spring's Nullable with Jakarta's
+
diff --git a/antora/components/relnotes/modules/ROOT/pages/about.adoc b/antora/components/relnotes/modules/ROOT/pages/about.adoc
index a32a1bfdfa..6fcba05457 100644
--- a/antora/components/relnotes/modules/ROOT/pages/about.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/about.adoc
@@ -6,36 +6,61 @@
 
 This table summarises all releases of Apache Causeway to date.
 
-[cols="2,2,4a,>1,>1,>1,3a"]
+[cols="3,2,3a,>1,>1,>1,3a"]
 |===
-| Version
 | Date
+| Version
 | Summary
 | Features
 | Improves
 | Bugs
 | Detail
 
+.2+| 5th Jul 2024
+| 3.1.0
+a| Apache Causeway 3.1.0
+|14 +
++1
+| 22
+| 30
+|
+* xref:relnotes:ROOT:2024/3.1.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2024/3.1.0/mignotes.adoc[Migration Notes]
+
+| 2.1.0
+| Apache Causeway 2.1.0
+>| 14
+| 22
+| 30
+<a|
+* xref:relnotes:ROOT:2024/2.1.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2024/2.1.0/mignotes.adoc[Migration Notes]
+
+.2+| 3rd Apr 2024
 | 3.0.0
-| 3rd Apr 2024
-| Release of Apache Causeway 3.0.0
-| 7
-| 28
-| 14
-.2+|
+| Apache Causeway 3.0.0
+|5 +
++2
+| 25 +
++3
+| 12 +
++2
+|
 * xref:relnotes:ROOT:2024/3.0.0/relnotes.adoc[Release Notes]
-* xref:relnotes:ROOT:2024/3.0.0/mignotes.adoc[3.0.0 Migration Notes]
-* xref:relnotes:ROOT:2024/2.0.0/mignotes.adoc[2.0.0 Migration Notes]
+* xref:relnotes:ROOT:2024/3.0.0/mignotes.adoc[Migration Notes]
 
 | 2.0.0
-| 3rd Apr 2024
-| Release of Apache Causeway 2.0.0
-| 5
+| Apache Causeway 2.0.0
+>| 5
 | 25
 | 12
+<a|
+* xref:relnotes:ROOT:2024/2.0.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2024/2.0.0/mignotes.adoc[Migration Notes]
+
 
-| 2.0.0-RC4
 | 2nd Jan 2024
+| 2.0.0-RC4
 | Fourth release candidate for Apache Causeway 2.0.0
 | 4
 | 11
@@ -44,8 +69,8 @@ This table summarises all releases of Apache Causeway to date.
 * xref:relnotes:ROOT:2024/2.0.0-RC4/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2024/2.0.0-RC4/mignotes.adoc[Migration Notes]
 
-| 2.0.0-RC3
 | 9th Oct 2023
+| 2.0.0-RC3
 | Third release candidate for Apache Causeway 2.0.0
 | 19
 | 40
@@ -54,8 +79,8 @@ This table summarises all releases of Apache Causeway to date.
 * xref:relnotes:ROOT:2023/2.0.0-RC3/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2023/2.0.0-RC3/mignotes.adoc[Migration Notes]
 
-| 2.0.0-RC2
 | 13-Jul-2023
+| 2.0.0-RC2
 | Second release candidate for Apache Causeway 2.0.0
 | 6
 | 17
@@ -64,8 +89,8 @@ This table summarises all releases of Apache Causeway to date.
 * xref:relnotes:ROOT:2023/2.0.0-RC2/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2023/2.0.0-RC2/mignotes.adoc[Migration Notes]
 
-| 2.0.0-RC1
 | 25-Mar-2023
+| 2.0.0-RC1
 | First release candidate for Apache Causeway 2.0.0
 Project renamed.
 | 16
@@ -75,8 +100,8 @@ Project renamed.
 * xref:relnotes:ROOT:2023/2.0.0-RC1/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2023/2.0.0-RC1/mignotes.adoc[Migration Notes]
 
-| 2.0.0-M9
 | 18-Oct-2022
+| 2.0.0-M9
 |
 Ninth milestone release +
 Fixes CVE-2022-42466.
@@ -86,8 +111,8 @@ Fixes CVE-2022-42466.
 |
 * xref:relnotes:ROOT:2022/2.0.0-M9/relnotes.adoc[Release Notes]
 
-| 2.0.0-M8
 | 06-Oct-2022
+| 2.0.0-M8
 | Eighth milestone release +
 Fixes CVE-2022-42467.
 | 26
@@ -97,8 +122,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2022/2.0.0-M8/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2022/2.0.0-M8/mignotes.adoc[Migration Notes]
 
-| 2.0.0-M7
 | 28-Feb-2022
+| 2.0.0-M7
 | Seventh milestone release for Apache Causeway 2.0.0
 | 9
 | 17
@@ -107,8 +132,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2022/2.0.0-M7/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2022/2.0.0-M7/mignotes.adoc[Migration Notes]
 
-| 2.0.0-M6
 | 26-Aug-2021
+| 2.0.0-M6
 | Sixth milestone release; now JDK11+
 | 23
 | 92
@@ -117,8 +142,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2021/2.0.0-M6/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2021/2.0.0-M6/mignotes.adoc[Migration Notes]
 
-| 2.0.0-M5
 | 28-Mar-2021
+| 2.0.0-M5
 | Fifth milestone release
 | 4
 | 68
@@ -127,8 +152,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2021/2.0.0-M5/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2021/2.0.0-M5/mignotes.adoc[Migration Notes]
 
-| 2.0.0-M4
 | 17-Oct-2020
+| 2.0.0-M4
 | Fourth milestone release
 | 14
 | 28
@@ -138,8 +163,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2020/2.0.0-M4/mignotes.adoc[Migration Notes]
 * link:https://issues.apache.org/jira/projects/CAUSEWAY/versions/12347808[JIRA Rel Notes]
 
-| 2.0.0-M3
 | 27-Mar-2020
+| 2.0.0-M3
 | Third milestone release; now re-platformed on top of Spring Boot.
 | 24
 | 149
@@ -149,8 +174,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2020/2.0.0-M3/mignotes.adoc[Migration Notes]
 * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12344784[JIRA Rel Notes]
 
-| 2.0.0-M2
 | 22-Jan-2019
+| 2.0.0-M2
 | Second milestone release; tree support, initial work on simplifying bootstrapping and configuration, removing dependencies
 | 2
 | 36
@@ -159,8 +184,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2019/2.0.0-M2/relnotes.adoc[Release Notes]
 * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342393[JIRA Rel Notes]
 
-|2.0.0-M1
 | 31-Jul-2018
+| 2.0.0-M1
 | First milestone release; Java 8 support, DataNucleus 5.1, Wicket 8, meta-annotations, breadcrumbs
 | 6
 | 55
@@ -177,5 +202,3 @@ Fixes CVE-2022-42467.
 
 
 
-
-
diff --git a/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc b/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc
index 379c5212a6..922d03b249 100644
--- a/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc
@@ -4,7 +4,6 @@
 
 
 
-
 .Comparing v2.0.0 and v3.0.0
 [cols=">2a,^1m,^1m,2a", options="header"]
 |===
diff --git a/antora/components/relnotes/modules/ROOT/partials/2024/2.1.0/_relnotes.adoc b/antora/components/relnotes/modules/ROOT/partials/2024/2.1.0/_relnotes.adoc
new file mode 100644
index 0000000000..9a592e391b
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/partials/2024/2.1.0/_relnotes.adoc
@@ -0,0 +1,192 @@
+
+:Notice: 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 ag [...]
+:page-partial:
+
+
+
+
+.Comparing v2.1.0 and v3.1.0
+[cols=">2a,^1m,^1m,2a", options="header"]
+|===
+
+|
+| v2.1.0
+| v3.1.0
+| Notes
+
+| Java
+| 11
+| 17
+|
+
+| Spring Boot
+| v2.7.18
+| v3.3.1
+| Spring Boot 2.7 is EOL.
+
+| Namespace
+| javax.*
+| jakarta.*
+|
+
+| Wicket
+| v9.18.0
+| v10.1.0
+.2+| xref:vw:ROOT:about.adoc[Wicket viewer]
+
+| Bootstrap
+| 5.3.3
+| 5.3.3
+
+| RestEasy
+| 5.0.0.Final
+| 6.2.9.Final
+| xref:vro:ROOT:about.adoc[Restful Objects viewer]
+
+| EclipseLink
+| 2.7.15
+| 4.0.3
+| xref:pjpa::about.adoc[]
+
+| DataNucleus
+| 6.0.7
+| 6.0.7
+| xref:pjdo::about.adoc[]
+
+| Shiro
+| 1.13.0
+a| (dropped)
+| xref:security:shiro:about.adoc[]
+
+|===
+
+
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Features, improvements and bugs made since the previous release, common to both `2.1.0` and `3.1.0`:
+
+== New Feature (14)
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3794[CAUSEWAY-3794] - [Wicket Viewer] With tables, replace 'showAll' link with a page-size select dropdown.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3793[CAUSEWAY-3793] - [Wicket Viewer] Allow Sortable Column Indicator to be turned off
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3788[CAUSEWAY-3788] - Extend metrics provided by MetricsService
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3780[CAUSEWAY-3780] - Make SPI for EntityTrackchangesDefault's configuration
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3778[CAUSEWAY-3778] - secman's ApplicationUserCreationService should be configurable, and specify its precedence.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3774[CAUSEWAY-3774] - Add flag so that in prototype mode, the tooltip of disabled/invisible members indicates which facet did the veto'ing.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3773[CAUSEWAY-3773] - Add flag so that in prototype mode, invisible actions/prop/coll are still shown, but only as disabled. Change the tooltip message to indicate this (or perhaps leverage the little 'T' icon that we see)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3755[CAUSEWAY-3755] - Provide SPI hook for RunBackgroundCommandsJob
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3751[CAUSEWAY-3751] - Extend PageRenderSubscriber API, to include onRendering(...) as a pre-hook.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3745[CAUSEWAY-3745] - Bulk persisting of audit entries
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3743[CAUSEWAY-3743] - TimeZoneChoiceProvider SPI to customize Zone Choices for Wicket Viewer Login
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3705[CAUSEWAY-3705] - [Perf] Introduce a TitleCachingService SPI
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3680[CAUSEWAY-3680] - General purpose graph data structure.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3642[CAUSEWAY-3642] - [Wicket Viewer] Search Field for Tables
+
+
+
+== Improvement (22)
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3785[CAUSEWAY-3785] - Implement getTitle for packed ManagedObjcets (in other words, collections)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3784[CAUSEWAY-3784] - Refactoring: Extract interfaces of the TableDataInteractive model
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3782[CAUSEWAY-3782] - Blob/Clob support for ambiguous file extensions based on MIME type
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3781[CAUSEWAY-3781] - Improve CommandExecutorServiceDefault's logging, show also the target and param/arg values
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3771[CAUSEWAY-3771] - Reduce logging on CommandSubscriberForCommandLog
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3754[CAUSEWAY-3754] - CSS fix for autocomplete dropdowns, use full width of prompt (same as choices)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3748[CAUSEWAY-3748] - [Commons] Json/YamlUtils support for Optional
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3741[CAUSEWAY-3741] - Graphql Viewer to support Namespaces with a Hyphen
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3738[CAUSEWAY-3738] - If RunBackgroundCommandsJob encounters a deadlock,then automatically retry.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3723[CAUSEWAY-3723] - Provide a default impl of PasswordEncoder.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3722[CAUSEWAY-3722] - [Commons] Json/YamlUtils support for XmlAdapter
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3719[CAUSEWAY-3719] - Enable value semantics to be substituted if required.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3718[CAUSEWAY-3718] - Add Blob/Clob support to the RestClient Argument Builder (API)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3711[CAUSEWAY-3711] - [Programming Model] Remove TreeAdapter<T>#parentOf(T)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3710[CAUSEWAY-3710] - Simpifiy MetaModelRefiner Testing
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3668[CAUSEWAY-3668] - Reimplement EmailServiceDefault to use spring boot's JavaMailSender
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3630[CAUSEWAY-3630] - [Wicket Viewer] Simplified Tabular Data Integration
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3567[CAUSEWAY-3567] - UI - for menu, if missing fontawesome annotation, then is mis-aligned.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3548[CAUSEWAY-3548] - More polite error message if bookmark objectType not recognised.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3484[CAUSEWAY-3484] - [Wicket Viewer] Usability checks (and also visibility checks) should be cached.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-2667[CAUSEWAY-2667] - [JUnit] Parameters syntax for dependent params seems to trip MM validation for non-mixins of a domain service.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-2533[CAUSEWAY-2533] - [Wish] Hitting a non-existent end point renders a page that looks like an exception page rather than a 404 page.
+
+
+== Bug (30)
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3799[CAUSEWAY-3799] - Audit trail somehow can write duplicate entries
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3798[CAUSEWAY-3798] - [Wicket Viewer] When table defaultView="hide", page-size resets to 1.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3797[CAUSEWAY-3797] - [Wicket Viewer] Not every table column is sortable, yet always offers sorting.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3795[CAUSEWAY-3795] - Transaction-scoped destroy not being called.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3792[CAUSEWAY-3792] - [Commons] Internal Long Parsing implemented wrong
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3791[CAUSEWAY-3791] - Non-ascii char in the name of variable in class _Images
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3790[CAUSEWAY-3790] - Comparison of incompatible types in ConsentAbstract
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3789[CAUSEWAY-3789] - Array is output as it's memory address and not as it's content
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3775[CAUSEWAY-3775] - Improve background commands job failure handling
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3772[CAUSEWAY-3772] - Sorting on a collection of view models, hitting hollow exception
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3770[CAUSEWAY-3770] - ConcurrentModificationException in EntityChangeTrackerDefault
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3769[CAUSEWAY-3769] - Unable to file upload Blobs due to param validation
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3768[CAUSEWAY-3768] - global property to disable EntityChangeTrackerDefault
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3767[CAUSEWAY-3767] - [Validation] MM logical type name explicity-check is potentially too strict
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3756[CAUSEWAY-3756] - FileUploadModel for clob is not serializable.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3753[CAUSEWAY-3753] - Per-param validation errors show in wrong slot, for all params
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3746[CAUSEWAY-3746] - [Configuration] illformated additional-spring-configuration-metadata.json
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3739[CAUSEWAY-3739] - Fix security perms so that secman-admin can once more add roles to users.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3735[CAUSEWAY-3735] - Global configuration of property executionPublishing is not honoured.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3731[CAUSEWAY-3731] - Parameters as Tuple (PAT) fails when one non-scalar Param is a Collection other than List (e.g. a Set)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3730[CAUSEWAY-3730] - Sporadic Issues initializing AuthorizorSecman
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3727[CAUSEWAY-3727] - [Wicket Viewer] Scalar-Select2 rendered for editing when editing is disabled
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3726[CAUSEWAY-3726] - [Wicket Viewer] Clear-Field-Button is shown even when editing is disabled
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3725[CAUSEWAY-3725] - [Wicket Viewer] Regression: Some Action Dialog Components are not dynamically enabled (for editing)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3724[CAUSEWAY-3724] - [Validation] False Posititves on Choices or AutoComplete Checks (when abstract)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3717[CAUSEWAY-3717] - NPE from null execution if set property via excel import
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3713[CAUSEWAY-3713] - o.a.c.core.config.EclipselinkConfiguration deviates from Specification
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3702[CAUSEWAY-3702] - Blob#md5Hex() format is broken
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3641[CAUSEWAY-3641] - [Wicket Viewer] Cannot simply use Action Mementos to recreate Table Data
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3539[CAUSEWAY-3539] - [Wicket Viewer] Incorrect Rendering of Trees
+
+
+== Duplicate
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3783[CAUSEWAY-3783] - [DUPLICATE] Improved table rendering performance.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3480[CAUSEWAY-3480] - [duplicate] [Wicket Viewer] parameter#mustSatisfy is evaluated when hit OK, rather than when tab out (ie action scoped, not parameter scoped)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3457[CAUSEWAY-3457] - [DUPLICATE] [Wicket Viewer] Extra space in UI between field and warning message.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3438[CAUSEWAY-3438] - [duplicate] [Wicket Viewer] @Property#optionality, when editing, extra space required between field and message.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3436[CAUSEWAY-3436] - [duplicate] [demo app] @Parameter#maxLength seems to be evaluated at the action level rather than param level.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-2556[CAUSEWAY-2556] - [DUPLICATE] Provide an EntityPropertyChangesSubscriber to receive all property changes for an entity in a single callback.
+
+
+== Not a Problem / Won't Do
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3796[CAUSEWAY-3796] - [NOT A PROBLEM] Returned value ignored in ServiceRegistry_forTesting
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3786[CAUSEWAY-3786] - [WON'T DO] Add switch to activate 2.0.0 data table implementation (experimental)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3762[CAUSEWAY-3762] - [Duplicate] Table Quick Search Bar
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3740[CAUSEWAY-3740] - [NOT A PROBLEM] Fix security perms to prevent users from adding themselves to a role just by guessing the role.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3732[CAUSEWAY-3732] - [invalid] Cache CommandLogEntry#findByInteractionId(...)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3728[CAUSEWAY-3728] - [WON'T FIX] Extend eventphase context with viewer name
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3512[CAUSEWAY-3512] - [NOT A PROBLEM] Show whether user has access to each MM feature as per their permissions.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3511[CAUSEWAY-3511] - [not a problem] Secman admin should be able to add roles to user (can add users to role already)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3396[CAUSEWAY-3396] - [won't fix] COMDEV-530 : reporter.apache.org hasn't copied over isis release data; mailing list stats are wrong
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-2654[CAUSEWAY-2654] - [not a problem] ImpersonateMenu's items does not automatically slot onto tertiary menu bar.
+
+
+== Documentation
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3758[CAUSEWAY-3758] - improve docs for EmailService - highlight requirement to include impl of JavaMailSender
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-2873[CAUSEWAY-2873] - petclinic tutorial (documentation)
+
+== Dependency Upgrades
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3766[CAUSEWAY-3766] - Bump Wicket 9.17.0. -> 9.18.0 and 10.0.0 -> 10.1.0
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3733[CAUSEWAY-3733] - Migrate from PDFJS 3.x to 4.x
+
+== Task
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3715[CAUSEWAY-3715] - Release activities for 2.1.0 / 3.1.0
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3712[CAUSEWAY-3712] - Relocate Tooling to Causewaystuff
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3305[CAUSEWAY-3305] - [DISCUSS] Re-platform on top of Spring security.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3439[CAUSEWAY-3439] - WHIMSY-399 whimsy hasn't consolidated isis and causeway meeting minutes into one.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3398[CAUSEWAY-3398] - Further Causeway rename activities
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3145[CAUSEWAY-3145] - Issue press release about name change.
+
+
+
+


(causeway) 10/12: Merge branch 'release-2.1.0-RC1'

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 2a1142b2d1e5be03a5e12641138c63ff1ee9dca4
Merge: 0ebcc4bc37 1d41ee74d3
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 5 17:20:55 2024 +0100

    Merge branch 'release-2.1.0-RC1'

 STATUS                                             |   3 +
 .../ROOT/pages/post-release-successful.adoc        | 129 ++++++++------
 antora/components/relnotes/modules/ROOT/nav.adoc   |   2 +
 .../modules/ROOT/pages/2024/2.1.0/mignotes.adoc    |   7 +
 .../modules/ROOT/pages/2024/2.1.0/relnotes.adoc    |  10 ++
 .../modules/ROOT/pages/2024/3.1.0/mignotes.adoc    |   7 +
 .../modules/ROOT/pages/2024/3.1.0/relnotes.adoc    |  26 +++
 .../relnotes/modules/ROOT/pages/about.adoc         |  79 ++++++---
 .../ROOT/partials/2024/2.0.0/_relnotes.adoc        |   5 +-
 .../ROOT/partials/2024/2.1.0/_relnotes.adoc        | 192 +++++++++++++++++++++
 antora/supplemental-ui/doap_causeway.rdf           |  20 ++-
 bom/pom.xml                                        |   2 +-
 scripts/clean-up-tags-local.sh                     |   0
 scripts/clean-up-tags-remote.sh                    |   0
 scripts/jira-release-notes.sh                      |   0
 scripts/ls-tags-remote.sh                          |   0
 scripts/verify-causeway-release.sh                 |   0
 17 files changed, 400 insertions(+), 82 deletions(-)


(causeway) 05/12: CAUSEWAY-3715 : makes scripts executable in git

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 04eae69450a38ebf697fee14b0a1c1febeebfccf
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 5 15:18:19 2024 +0100

    CAUSEWAY-3715 : makes scripts executable in git
---
 scripts/clean-up-tags-local.sh     | 0
 scripts/clean-up-tags-remote.sh    | 0
 scripts/jira-release-notes.sh      | 0
 scripts/ls-tags-remote.sh          | 0
 scripts/verify-causeway-release.sh | 0
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/scripts/clean-up-tags-local.sh b/scripts/clean-up-tags-local.sh
old mode 100644
new mode 100755
diff --git a/scripts/clean-up-tags-remote.sh b/scripts/clean-up-tags-remote.sh
old mode 100644
new mode 100755
diff --git a/scripts/jira-release-notes.sh b/scripts/jira-release-notes.sh
old mode 100644
new mode 100755
diff --git a/scripts/ls-tags-remote.sh b/scripts/ls-tags-remote.sh
old mode 100644
new mode 100755
diff --git a/scripts/verify-causeway-release.sh b/scripts/verify-causeway-release.sh
old mode 100644
new mode 100755


(causeway) 02/12: CAUSEWAY-3715 : updates relnotes etc

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 6c6e058984bb0344ea7e20e5683b0bdb87b797fa
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 5 16:07:25 2024 +0100

    CAUSEWAY-3715 : updates relnotes etc
---
 antora/components/relnotes/modules/ROOT/nav.adoc   |   2 +
 .../modules/ROOT/pages/2024/2.1.0/mignotes.adoc    |   7 +
 .../modules/ROOT/pages/2024/2.1.0/relnotes.adoc    |  10 ++
 .../modules/ROOT/pages/2024/3.1.0/mignotes.adoc    |   7 +
 .../modules/ROOT/pages/2024/3.1.0/relnotes.adoc    |  26 +++
 .../relnotes/modules/ROOT/pages/about.adoc         |  79 ++++++---
 .../ROOT/partials/2024/2.0.0/_relnotes.adoc        |   1 -
 .../ROOT/partials/2024/2.1.0/_relnotes.adoc        | 192 +++++++++++++++++++++
 8 files changed, 295 insertions(+), 29 deletions(-)

diff --git a/antora/components/relnotes/modules/ROOT/nav.adoc b/antora/components/relnotes/modules/ROOT/nav.adoc
index 6b96c69976..97d0f9289f 100644
--- a/antora/components/relnotes/modules/ROOT/nav.adoc
+++ b/antora/components/relnotes/modules/ROOT/nav.adoc
@@ -3,6 +3,8 @@
 
 
 * 2024
+** xref:relnotes:ROOT:2024/2.1.0/relnotes.adoc[2.1.0] and xref:relnotes:ROOT:2024/2.1.0/relnotes.adoc[3.1.0]
+** xref:relnotes:ROOT:2024/2.0.0/relnotes.adoc[2.0.0] and xref:relnotes:ROOT:2024/3.0.0/relnotes.adoc[3.0.0]
 ** xref:relnotes:ROOT:2024/2.0.0-RC4/relnotes.adoc[2.0.0-RC4]
 
 * 2023
diff --git a/antora/components/relnotes/modules/ROOT/pages/2024/2.1.0/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2024/2.1.0/mignotes.adoc
new file mode 100644
index 0000000000..abb5d94e2a
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/pages/2024/2.1.0/mignotes.adoc
@@ -0,0 +1,7 @@
+= Migrating from 2.0.0 to 2.1.0
+
+:Notice: 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 ag [...]
+:page-partial:
+
+
+No specific migration notes have been recorded to date.
diff --git a/antora/components/relnotes/modules/ROOT/pages/2024/2.1.0/relnotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2024/2.1.0/relnotes.adoc
new file mode 100644
index 0000000000..a6183d3823
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/pages/2024/2.1.0/relnotes.adoc
@@ -0,0 +1,10 @@
+[[r2.1.0]]
+= 2.1.0
+
+:Notice: 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 ag [...]
+:page-partial:
+
+
+v2.1.0 and v3.1.0 are being released at the same time, and are broadly equivalent.
+
+include::partial$2024/2.1.0/_relnotes.adoc[]
diff --git a/antora/components/relnotes/modules/ROOT/pages/2024/3.1.0/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2024/3.1.0/mignotes.adoc
new file mode 100644
index 0000000000..eb05a7c3ca
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/pages/2024/3.1.0/mignotes.adoc
@@ -0,0 +1,7 @@
+= Migrating from 3.0.0 to 3.1.0
+
+:Notice: 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 ag [...]
+:page-partial:
+
+
+No specific migration notes have been recorded to date.
diff --git a/antora/components/relnotes/modules/ROOT/pages/2024/3.1.0/relnotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2024/3.1.0/relnotes.adoc
new file mode 100644
index 0000000000..24e4d3a909
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/pages/2024/3.1.0/relnotes.adoc
@@ -0,0 +1,26 @@
+[[r3.1.0]]
+= 3.1.0
+
+:Notice: 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 ag [...]
+:page-partial:
+
+v2.1.0 and v3.1.0 are being released at the same time, and are broadly equivalent in terms of the features.
+However, they have different baseline dependencies:
+
+include::partial$2024/2.1.0/_relnotes.adoc[]
+
+
+
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Version `3.1.0` also has these additional changes not present in the `2.1.0`:
+
+== New Feature (1)
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3690[CAUSEWAY-3690] - [Programming Model] Support for Java Record as ViewModel
+
+
+== Won't Fix
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-2991[CAUSEWAY-2991] - [WON'T DO] Replace Spring's Nullable with Jakarta's
+
diff --git a/antora/components/relnotes/modules/ROOT/pages/about.adoc b/antora/components/relnotes/modules/ROOT/pages/about.adoc
index a32a1bfdfa..6fcba05457 100644
--- a/antora/components/relnotes/modules/ROOT/pages/about.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/about.adoc
@@ -6,36 +6,61 @@
 
 This table summarises all releases of Apache Causeway to date.
 
-[cols="2,2,4a,>1,>1,>1,3a"]
+[cols="3,2,3a,>1,>1,>1,3a"]
 |===
-| Version
 | Date
+| Version
 | Summary
 | Features
 | Improves
 | Bugs
 | Detail
 
+.2+| 5th Jul 2024
+| 3.1.0
+a| Apache Causeway 3.1.0
+|14 +
++1
+| 22
+| 30
+|
+* xref:relnotes:ROOT:2024/3.1.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2024/3.1.0/mignotes.adoc[Migration Notes]
+
+| 2.1.0
+| Apache Causeway 2.1.0
+>| 14
+| 22
+| 30
+<a|
+* xref:relnotes:ROOT:2024/2.1.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2024/2.1.0/mignotes.adoc[Migration Notes]
+
+.2+| 3rd Apr 2024
 | 3.0.0
-| 3rd Apr 2024
-| Release of Apache Causeway 3.0.0
-| 7
-| 28
-| 14
-.2+|
+| Apache Causeway 3.0.0
+|5 +
++2
+| 25 +
++3
+| 12 +
++2
+|
 * xref:relnotes:ROOT:2024/3.0.0/relnotes.adoc[Release Notes]
-* xref:relnotes:ROOT:2024/3.0.0/mignotes.adoc[3.0.0 Migration Notes]
-* xref:relnotes:ROOT:2024/2.0.0/mignotes.adoc[2.0.0 Migration Notes]
+* xref:relnotes:ROOT:2024/3.0.0/mignotes.adoc[Migration Notes]
 
 | 2.0.0
-| 3rd Apr 2024
-| Release of Apache Causeway 2.0.0
-| 5
+| Apache Causeway 2.0.0
+>| 5
 | 25
 | 12
+<a|
+* xref:relnotes:ROOT:2024/2.0.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2024/2.0.0/mignotes.adoc[Migration Notes]
+
 
-| 2.0.0-RC4
 | 2nd Jan 2024
+| 2.0.0-RC4
 | Fourth release candidate for Apache Causeway 2.0.0
 | 4
 | 11
@@ -44,8 +69,8 @@ This table summarises all releases of Apache Causeway to date.
 * xref:relnotes:ROOT:2024/2.0.0-RC4/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2024/2.0.0-RC4/mignotes.adoc[Migration Notes]
 
-| 2.0.0-RC3
 | 9th Oct 2023
+| 2.0.0-RC3
 | Third release candidate for Apache Causeway 2.0.0
 | 19
 | 40
@@ -54,8 +79,8 @@ This table summarises all releases of Apache Causeway to date.
 * xref:relnotes:ROOT:2023/2.0.0-RC3/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2023/2.0.0-RC3/mignotes.adoc[Migration Notes]
 
-| 2.0.0-RC2
 | 13-Jul-2023
+| 2.0.0-RC2
 | Second release candidate for Apache Causeway 2.0.0
 | 6
 | 17
@@ -64,8 +89,8 @@ This table summarises all releases of Apache Causeway to date.
 * xref:relnotes:ROOT:2023/2.0.0-RC2/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2023/2.0.0-RC2/mignotes.adoc[Migration Notes]
 
-| 2.0.0-RC1
 | 25-Mar-2023
+| 2.0.0-RC1
 | First release candidate for Apache Causeway 2.0.0
 Project renamed.
 | 16
@@ -75,8 +100,8 @@ Project renamed.
 * xref:relnotes:ROOT:2023/2.0.0-RC1/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2023/2.0.0-RC1/mignotes.adoc[Migration Notes]
 
-| 2.0.0-M9
 | 18-Oct-2022
+| 2.0.0-M9
 |
 Ninth milestone release +
 Fixes CVE-2022-42466.
@@ -86,8 +111,8 @@ Fixes CVE-2022-42466.
 |
 * xref:relnotes:ROOT:2022/2.0.0-M9/relnotes.adoc[Release Notes]
 
-| 2.0.0-M8
 | 06-Oct-2022
+| 2.0.0-M8
 | Eighth milestone release +
 Fixes CVE-2022-42467.
 | 26
@@ -97,8 +122,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2022/2.0.0-M8/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2022/2.0.0-M8/mignotes.adoc[Migration Notes]
 
-| 2.0.0-M7
 | 28-Feb-2022
+| 2.0.0-M7
 | Seventh milestone release for Apache Causeway 2.0.0
 | 9
 | 17
@@ -107,8 +132,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2022/2.0.0-M7/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2022/2.0.0-M7/mignotes.adoc[Migration Notes]
 
-| 2.0.0-M6
 | 26-Aug-2021
+| 2.0.0-M6
 | Sixth milestone release; now JDK11+
 | 23
 | 92
@@ -117,8 +142,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2021/2.0.0-M6/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2021/2.0.0-M6/mignotes.adoc[Migration Notes]
 
-| 2.0.0-M5
 | 28-Mar-2021
+| 2.0.0-M5
 | Fifth milestone release
 | 4
 | 68
@@ -127,8 +152,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2021/2.0.0-M5/relnotes.adoc[Release Notes]
 * xref:relnotes:ROOT:2021/2.0.0-M5/mignotes.adoc[Migration Notes]
 
-| 2.0.0-M4
 | 17-Oct-2020
+| 2.0.0-M4
 | Fourth milestone release
 | 14
 | 28
@@ -138,8 +163,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2020/2.0.0-M4/mignotes.adoc[Migration Notes]
 * link:https://issues.apache.org/jira/projects/CAUSEWAY/versions/12347808[JIRA Rel Notes]
 
-| 2.0.0-M3
 | 27-Mar-2020
+| 2.0.0-M3
 | Third milestone release; now re-platformed on top of Spring Boot.
 | 24
 | 149
@@ -149,8 +174,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2020/2.0.0-M3/mignotes.adoc[Migration Notes]
 * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12344784[JIRA Rel Notes]
 
-| 2.0.0-M2
 | 22-Jan-2019
+| 2.0.0-M2
 | Second milestone release; tree support, initial work on simplifying bootstrapping and configuration, removing dependencies
 | 2
 | 36
@@ -159,8 +184,8 @@ Fixes CVE-2022-42467.
 * xref:relnotes:ROOT:2019/2.0.0-M2/relnotes.adoc[Release Notes]
 * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342393[JIRA Rel Notes]
 
-|2.0.0-M1
 | 31-Jul-2018
+| 2.0.0-M1
 | First milestone release; Java 8 support, DataNucleus 5.1, Wicket 8, meta-annotations, breadcrumbs
 | 6
 | 55
@@ -177,5 +202,3 @@ Fixes CVE-2022-42467.
 
 
 
-
-
diff --git a/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc b/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc
index 379c5212a6..922d03b249 100644
--- a/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc
@@ -4,7 +4,6 @@
 
 
 
-
 .Comparing v2.0.0 and v3.0.0
 [cols=">2a,^1m,^1m,2a", options="header"]
 |===
diff --git a/antora/components/relnotes/modules/ROOT/partials/2024/2.1.0/_relnotes.adoc b/antora/components/relnotes/modules/ROOT/partials/2024/2.1.0/_relnotes.adoc
new file mode 100644
index 0000000000..9a592e391b
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/partials/2024/2.1.0/_relnotes.adoc
@@ -0,0 +1,192 @@
+
+:Notice: 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 ag [...]
+:page-partial:
+
+
+
+
+.Comparing v2.1.0 and v3.1.0
+[cols=">2a,^1m,^1m,2a", options="header"]
+|===
+
+|
+| v2.1.0
+| v3.1.0
+| Notes
+
+| Java
+| 11
+| 17
+|
+
+| Spring Boot
+| v2.7.18
+| v3.3.1
+| Spring Boot 2.7 is EOL.
+
+| Namespace
+| javax.*
+| jakarta.*
+|
+
+| Wicket
+| v9.18.0
+| v10.1.0
+.2+| xref:vw:ROOT:about.adoc[Wicket viewer]
+
+| Bootstrap
+| 5.3.3
+| 5.3.3
+
+| RestEasy
+| 5.0.0.Final
+| 6.2.9.Final
+| xref:vro:ROOT:about.adoc[Restful Objects viewer]
+
+| EclipseLink
+| 2.7.15
+| 4.0.3
+| xref:pjpa::about.adoc[]
+
+| DataNucleus
+| 6.0.7
+| 6.0.7
+| xref:pjdo::about.adoc[]
+
+| Shiro
+| 1.13.0
+a| (dropped)
+| xref:security:shiro:about.adoc[]
+
+|===
+
+
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Features, improvements and bugs made since the previous release, common to both `2.1.0` and `3.1.0`:
+
+== New Feature (14)
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3794[CAUSEWAY-3794] - [Wicket Viewer] With tables, replace 'showAll' link with a page-size select dropdown.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3793[CAUSEWAY-3793] - [Wicket Viewer] Allow Sortable Column Indicator to be turned off
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3788[CAUSEWAY-3788] - Extend metrics provided by MetricsService
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3780[CAUSEWAY-3780] - Make SPI for EntityTrackchangesDefault's configuration
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3778[CAUSEWAY-3778] - secman's ApplicationUserCreationService should be configurable, and specify its precedence.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3774[CAUSEWAY-3774] - Add flag so that in prototype mode, the tooltip of disabled/invisible members indicates which facet did the veto'ing.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3773[CAUSEWAY-3773] - Add flag so that in prototype mode, invisible actions/prop/coll are still shown, but only as disabled. Change the tooltip message to indicate this (or perhaps leverage the little 'T' icon that we see)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3755[CAUSEWAY-3755] - Provide SPI hook for RunBackgroundCommandsJob
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3751[CAUSEWAY-3751] - Extend PageRenderSubscriber API, to include onRendering(...) as a pre-hook.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3745[CAUSEWAY-3745] - Bulk persisting of audit entries
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3743[CAUSEWAY-3743] - TimeZoneChoiceProvider SPI to customize Zone Choices for Wicket Viewer Login
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3705[CAUSEWAY-3705] - [Perf] Introduce a TitleCachingService SPI
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3680[CAUSEWAY-3680] - General purpose graph data structure.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3642[CAUSEWAY-3642] - [Wicket Viewer] Search Field for Tables
+
+
+
+== Improvement (22)
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3785[CAUSEWAY-3785] - Implement getTitle for packed ManagedObjcets (in other words, collections)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3784[CAUSEWAY-3784] - Refactoring: Extract interfaces of the TableDataInteractive model
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3782[CAUSEWAY-3782] - Blob/Clob support for ambiguous file extensions based on MIME type
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3781[CAUSEWAY-3781] - Improve CommandExecutorServiceDefault's logging, show also the target and param/arg values
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3771[CAUSEWAY-3771] - Reduce logging on CommandSubscriberForCommandLog
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3754[CAUSEWAY-3754] - CSS fix for autocomplete dropdowns, use full width of prompt (same as choices)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3748[CAUSEWAY-3748] - [Commons] Json/YamlUtils support for Optional
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3741[CAUSEWAY-3741] - Graphql Viewer to support Namespaces with a Hyphen
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3738[CAUSEWAY-3738] - If RunBackgroundCommandsJob encounters a deadlock,then automatically retry.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3723[CAUSEWAY-3723] - Provide a default impl of PasswordEncoder.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3722[CAUSEWAY-3722] - [Commons] Json/YamlUtils support for XmlAdapter
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3719[CAUSEWAY-3719] - Enable value semantics to be substituted if required.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3718[CAUSEWAY-3718] - Add Blob/Clob support to the RestClient Argument Builder (API)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3711[CAUSEWAY-3711] - [Programming Model] Remove TreeAdapter<T>#parentOf(T)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3710[CAUSEWAY-3710] - Simpifiy MetaModelRefiner Testing
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3668[CAUSEWAY-3668] - Reimplement EmailServiceDefault to use spring boot's JavaMailSender
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3630[CAUSEWAY-3630] - [Wicket Viewer] Simplified Tabular Data Integration
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3567[CAUSEWAY-3567] - UI - for menu, if missing fontawesome annotation, then is mis-aligned.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3548[CAUSEWAY-3548] - More polite error message if bookmark objectType not recognised.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3484[CAUSEWAY-3484] - [Wicket Viewer] Usability checks (and also visibility checks) should be cached.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-2667[CAUSEWAY-2667] - [JUnit] Parameters syntax for dependent params seems to trip MM validation for non-mixins of a domain service.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-2533[CAUSEWAY-2533] - [Wish] Hitting a non-existent end point renders a page that looks like an exception page rather than a 404 page.
+
+
+== Bug (30)
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3799[CAUSEWAY-3799] - Audit trail somehow can write duplicate entries
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3798[CAUSEWAY-3798] - [Wicket Viewer] When table defaultView="hide", page-size resets to 1.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3797[CAUSEWAY-3797] - [Wicket Viewer] Not every table column is sortable, yet always offers sorting.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3795[CAUSEWAY-3795] - Transaction-scoped destroy not being called.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3792[CAUSEWAY-3792] - [Commons] Internal Long Parsing implemented wrong
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3791[CAUSEWAY-3791] - Non-ascii char in the name of variable in class _Images
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3790[CAUSEWAY-3790] - Comparison of incompatible types in ConsentAbstract
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3789[CAUSEWAY-3789] - Array is output as it's memory address and not as it's content
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3775[CAUSEWAY-3775] - Improve background commands job failure handling
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3772[CAUSEWAY-3772] - Sorting on a collection of view models, hitting hollow exception
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3770[CAUSEWAY-3770] - ConcurrentModificationException in EntityChangeTrackerDefault
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3769[CAUSEWAY-3769] - Unable to file upload Blobs due to param validation
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3768[CAUSEWAY-3768] - global property to disable EntityChangeTrackerDefault
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3767[CAUSEWAY-3767] - [Validation] MM logical type name explicity-check is potentially too strict
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3756[CAUSEWAY-3756] - FileUploadModel for clob is not serializable.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3753[CAUSEWAY-3753] - Per-param validation errors show in wrong slot, for all params
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3746[CAUSEWAY-3746] - [Configuration] illformated additional-spring-configuration-metadata.json
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3739[CAUSEWAY-3739] - Fix security perms so that secman-admin can once more add roles to users.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3735[CAUSEWAY-3735] - Global configuration of property executionPublishing is not honoured.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3731[CAUSEWAY-3731] - Parameters as Tuple (PAT) fails when one non-scalar Param is a Collection other than List (e.g. a Set)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3730[CAUSEWAY-3730] - Sporadic Issues initializing AuthorizorSecman
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3727[CAUSEWAY-3727] - [Wicket Viewer] Scalar-Select2 rendered for editing when editing is disabled
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3726[CAUSEWAY-3726] - [Wicket Viewer] Clear-Field-Button is shown even when editing is disabled
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3725[CAUSEWAY-3725] - [Wicket Viewer] Regression: Some Action Dialog Components are not dynamically enabled (for editing)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3724[CAUSEWAY-3724] - [Validation] False Posititves on Choices or AutoComplete Checks (when abstract)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3717[CAUSEWAY-3717] - NPE from null execution if set property via excel import
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3713[CAUSEWAY-3713] - o.a.c.core.config.EclipselinkConfiguration deviates from Specification
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3702[CAUSEWAY-3702] - Blob#md5Hex() format is broken
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3641[CAUSEWAY-3641] - [Wicket Viewer] Cannot simply use Action Mementos to recreate Table Data
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3539[CAUSEWAY-3539] - [Wicket Viewer] Incorrect Rendering of Trees
+
+
+== Duplicate
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3783[CAUSEWAY-3783] - [DUPLICATE] Improved table rendering performance.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3480[CAUSEWAY-3480] - [duplicate] [Wicket Viewer] parameter#mustSatisfy is evaluated when hit OK, rather than when tab out (ie action scoped, not parameter scoped)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3457[CAUSEWAY-3457] - [DUPLICATE] [Wicket Viewer] Extra space in UI between field and warning message.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3438[CAUSEWAY-3438] - [duplicate] [Wicket Viewer] @Property#optionality, when editing, extra space required between field and message.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3436[CAUSEWAY-3436] - [duplicate] [demo app] @Parameter#maxLength seems to be evaluated at the action level rather than param level.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-2556[CAUSEWAY-2556] - [DUPLICATE] Provide an EntityPropertyChangesSubscriber to receive all property changes for an entity in a single callback.
+
+
+== Not a Problem / Won't Do
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3796[CAUSEWAY-3796] - [NOT A PROBLEM] Returned value ignored in ServiceRegistry_forTesting
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3786[CAUSEWAY-3786] - [WON'T DO] Add switch to activate 2.0.0 data table implementation (experimental)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3762[CAUSEWAY-3762] - [Duplicate] Table Quick Search Bar
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3740[CAUSEWAY-3740] - [NOT A PROBLEM] Fix security perms to prevent users from adding themselves to a role just by guessing the role.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3732[CAUSEWAY-3732] - [invalid] Cache CommandLogEntry#findByInteractionId(...)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3728[CAUSEWAY-3728] - [WON'T FIX] Extend eventphase context with viewer name
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3512[CAUSEWAY-3512] - [NOT A PROBLEM] Show whether user has access to each MM feature as per their permissions.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3511[CAUSEWAY-3511] - [not a problem] Secman admin should be able to add roles to user (can add users to role already)
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3396[CAUSEWAY-3396] - [won't fix] COMDEV-530 : reporter.apache.org hasn't copied over isis release data; mailing list stats are wrong
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-2654[CAUSEWAY-2654] - [not a problem] ImpersonateMenu's items does not automatically slot onto tertiary menu bar.
+
+
+== Documentation
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3758[CAUSEWAY-3758] - improve docs for EmailService - highlight requirement to include impl of JavaMailSender
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-2873[CAUSEWAY-2873] - petclinic tutorial (documentation)
+
+== Dependency Upgrades
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3766[CAUSEWAY-3766] - Bump Wicket 9.17.0. -> 9.18.0 and 10.0.0 -> 10.1.0
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3733[CAUSEWAY-3733] - Migrate from PDFJS 3.x to 4.x
+
+== Task
+
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3715[CAUSEWAY-3715] - Release activities for 2.1.0 / 3.1.0
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3712[CAUSEWAY-3712] - Relocate Tooling to Causewaystuff
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3305[CAUSEWAY-3305] - [DISCUSS] Re-platform on top of Spring security.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3439[CAUSEWAY-3439] - WHIMSY-399 whimsy hasn't consolidated isis and causeway meeting minutes into one.
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3398[CAUSEWAY-3398] - Further Causeway rename activities
+* link:https://issues.apache.org/jira/browse/CAUSEWAY-3145[CAUSEWAY-3145] - Issue press release about name change.
+
+
+
+


(causeway) 11/12: Merge branch 'release-3.1.0-RC1' into v3

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit d16668aae8b7e7fbe114aafc3087b0e8e00d89ae
Merge: 731b705ae5 1f95fe4e8d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 5 17:21:07 2024 +0100

    Merge branch 'release-3.1.0-RC1' into v3

 STATUS                                             |   3 +
 .../ROOT/pages/post-release-successful.adoc        | 155 ++++++++++-------
 antora/components/relnotes/modules/ROOT/nav.adoc   |   2 +
 .../modules/ROOT/pages/2024/2.1.0/mignotes.adoc    |   7 +
 .../modules/ROOT/pages/2024/2.1.0/relnotes.adoc    |  10 ++
 .../modules/ROOT/pages/2024/3.1.0/mignotes.adoc    |   7 +
 .../modules/ROOT/pages/2024/3.1.0/relnotes.adoc    |  26 +++
 .../relnotes/modules/ROOT/pages/about.adoc         |  79 ++++++---
 .../ROOT/partials/2024/2.0.0/_relnotes.adoc        |   5 +-
 .../ROOT/partials/2024/2.1.0/_relnotes.adoc        | 192 +++++++++++++++++++++
 antora/supplemental-ui/doap_causeway.rdf           |  20 ++-
 bom/pom.xml                                        |   2 +-
 scripts/clean-up-tags-local.sh                     |   0
 scripts/clean-up-tags-remote.sh                    |   0
 scripts/jira-release-notes.sh                      |   0
 scripts/ls-tags-remote.sh                          |   0
 scripts/verify-causeway-release.sh                 |   0
 17 files changed, 413 insertions(+), 95 deletions(-)


(causeway) 08/12: CAUSEWAY-3715: updates release notes on updating the website

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 2242d9ba97b69e21d226deaa3914deb70c3f37a9
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 5 16:53:16 2024 +0100

    CAUSEWAY-3715: updates release notes on updating the website
---
 .../ROOT/pages/post-release-successful.adoc        | 129 +++++++++++++--------
 1 file changed, 80 insertions(+), 49 deletions(-)

diff --git a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
index 07655020b7..001dc451db 100644
--- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
@@ -270,7 +270,7 @@ Apply any remaining documentation updates:
 
 ** copy the new schema(s) from
 +
-`api/schema/src/main/resources/o.a.i.s.xxx`
+`api/schema/src/main/resources/o.a.c.s.xxx`
 +
 to its versioned:
 +
@@ -293,34 +293,66 @@ We are now ready to xref:#generate-website[generate the website].
 [#generate-website]
 == Generate website
 
-We use Antora to generate the site, setting up a document maintenance branch to allow the website to be updated in the future if required.
-The `site.yml` references this documentation branch.
+We use Antora to generate the site, setting up a document maintenance branches `{page-causewayrelv2}` and `{page-causewayrelv3}`.
+These mirror the "rel/causeway-{page-causewayrelv2}" and "rel/causeway-{page-causewayrelv3}" (immutable) release tags, but are branches because they allow us to update the docs outside of formal releases.
 
-We therefore temporarily modify all of the `antora.yml` files (and update `index.html`) file and create a branch for this change; then we update `site.yml` with a reference to that new branch.
-All of this is changed after.
+The `site.yml` (which can be in any branch) references these documentation branches, but uses the link:https://docs.antora.org/antora/latest/playbook/urls-latest-version-segment/[latest version] support of Antora 3.x to reference the `{page-causewayrelv3}` version as "latest":
 
-NOTE: Previously we built a site with the current version and all previous versions.
-For the moment, though, we've simplified to just publish the current version.
-
-We also use the link:https://docs.antora.org/antora/latest/playbook/urls-latest-version-segment/[latest version] support of Antora 3.x so that the most recent version is made available as "latest".
-This has two benefits: first, the top-level `index.html` (in `supplemental-ui`) does not need to be updated, and secondly, this improves search engine results as there will always be a `latest` version.
+[source,yml]
+.site.yml
+----
+urls:
+    latest_version_segment: latest
+----
 
+This approach also means that the top-level `index.html` (from the Antora template) does not need to be modified; it can simply refer to "latest".
+To avoid duplicates in the Algolia search index, we also only index the "latest" directory.
 
-[#create-doc-branch]
-=== Create doc branch
 
-NOTE: At the time of writing we support two branches, `master` (for v2) and `v3`.
-Adjust these instructions if necessary.
+[#create-2.x.0-doc-branch]
+=== Create 2.x.0 doc branch
 
-First, we update all versions in `antora.yml`:
+* We create the `{page-causewayrelv2}` branch, at the rel/causeway-{page-causewayrelv2} release tag.
++
+[source,bash,subs="attributes+"]
+----
+git checkout -b {page-causewayrelv2}
+git reset --hard rel/causeway-{page-causewayrelv2}
+----
 
-* Update all `antora.yml` files to use the latest branch ({page-causewayrelv3}):
+* update all `antora.yml` files to use the latest branch ({page-causewayrelv3}):
 +
 [source,bash,subs="attributes+"]
 ----
 find . -name antora.yml -exec sed -i 's/latest/{page-causewayrelv3}/g' {} \;
 ----
 
+* build framework
++
+[source,bash,subs="attributes+"]
+----
+pushd bom
+mvnd clean install -T1C -DskipTests -Dgithub
+popd
+----
+
+* if necessary, build the module tooling, as per xref:release-process-prereqs.adoc#doc-tooling[doc tooling prereqs] process.
+
+* generate the website:
++
+[source,bash,subs="attributes+"]
+----
+sh preview.sh
+----
+
+* if any files have changed, then commit:
++
+[source,bash,subs="attributes+"]
+----
+git add .
+git commit -m "$CAUSEWAYJIRA: updates docs on new release branch"
+----
+
 * Commit all these changes:
 +
 [source,bash,subs="attributes+"]
@@ -329,26 +361,30 @@ git add .
 git commit -m "$CAUSEWAYJIRA: bumps antora.yml versions to $CAUSEWAYREL"
 ----
 
-We now create a branch which can be referenced in the `site.yml`, later on.
-
-* We create the `{page-causewayrelv3}` branch.
-+
-This mirrors the "rel/causeway-{page-causewayrelv3}" used for the formal (immutable) release tag, but is a branch because it allows us to move it, and must have this simplified name as it is used in the "edit page" link of the site template.
+* Push the documentation branch:
 +
 [source,bash,subs="attributes+"]
 ----
-git branch {page-causewayrelv3}
-git push origin {page-causewayrelv3}
+git push origin {page-causewayrelv2} -u
 ----
 
-Now we make sure that the docs in the new doc branch are actually up-to-date.
-(There is no need to update `site.yml`, because at this stage it continues to refer to the `HEAD` branch):
 
-* checkout the branch:
+[#create-3.x.0-doc-branch]
+=== Create 3.x.0 doc branch
+
+* We create the `{page-causewayrelv3}` branch, at the rel/causeway-{page-causewayrelv3} release tag.
 +
 [source,bash,subs="attributes+"]
 ----
-git checkout {page-causewayrelv3}
+git checkout -b {page-causewayrelv3}
+git reset --hard rel/causeway-{page-causewayrelv3}
+----
+
+* update all `antora.yml` files to use the latest branch ({page-causewayrelv3}):
++
+[source,bash,subs="attributes+"]
+----
+find . -name antora.yml -exec sed -i 's/latest/{page-causewayrelv3}/g' {} \;
 ----
 
 * build framework
@@ -377,33 +413,31 @@ git add .
 git commit -m "$CAUSEWAYJIRA: updates docs on new release branch"
 ----
 
+* Commit all these changes:
++
+[source,bash,subs="attributes+"]
+----
+git add .
+git commit -m "$CAUSEWAYJIRA: bumps antora.yml versions to $CAUSEWAYREL"
+----
 
-* push the updated doc branch:
+* Push the documentation branch:
 +
 [source,bash,subs="attributes+"]
 ----
-git push origin {page-causewayrelv3}
+git push origin {page-causewayrelv3} -u
 ----
 
 
 [#generate-the-site]
 === Generate the site
 
-To build the site , we need to update the `site.yml`.
-This is done in the release branch (`$CAUSEWAYBRANCH`), _not_ in the documentation branch for the current release ({page-causewayrelv3}).
+To build the site, we need to update the `site.yml`.
+
+This can be done from any branch, normally the release branch (`$CAUSEWAYBRANCH`) or `master`.
+
+NOTE: All that will be picked up from this branch is the `supplementary-ui` files (top-level index) and the `site.yml` playbook that identifies which branch(es) to include in the website.
 
-* Recreate the `website` branch off of `master`.
-+
-All that will be picked up from this branch is the `supplementary-ui` files (top-level index) and the `site.yml` playbook that identifies which branch(es) to include in the website.
-+
-[source,bash,subs="attributes+"]
-----
-git checkout master
-git branch -D website     #<.>
-git checkout -b website   #<.>
-----
-<.> delete the branch if necessary
-<.> recreate the branch
 
 * Update `site.yml` using `site.NEXT.yml`:
 
@@ -460,7 +494,6 @@ git commit -m "$CAUSEWAYJIRA: updates site.yml in readiness for website generati
 ----
 
 
-We are ready to actually generate the Antora website.
 
 * generate the website:
 +
@@ -472,11 +505,9 @@ sh preview.sh -AS
 This will write to `antora/target/site`; we'll use the results in the xref:#publish-website[next section].
 
 
-=== Revert site.yml
-
-Optionally, restore the original `site.yml` file.
-However, you might want to leave it as is in case there is a requirement to regenerate the website.
-In any case, when the next release comes around, we will delete this branch anyway.
+* Revert `site.yml`
++
+Restore the original `site.yml` file.
 
 
 include::partial$publish-and-index-website.adoc[]


(causeway) 03/12: : updates release notes, STATUS and doap_causeway.rdf

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 86935cd4edae3ca5c0410406ee1c7f6a951a5b65
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 5 16:24:58 2024 +0100

    : updates release notes, STATUS and doap_causeway.rdf
---
 STATUS                                               |  3 +++
 .../modules/ROOT/partials/2024/2.0.0/_relnotes.adoc  |  4 +++-
 antora/supplemental-ui/doap_causeway.rdf             | 20 ++++++++++++++++++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/STATUS b/STATUS
index fb6e6e91d4..286dce6ccf 100644
--- a/STATUS
+++ b/STATUS
@@ -25,6 +25,9 @@ Description
 
 TLP releases:
 
+  * causeway-3.1.0                                 :  5 Jul 2024
+  * causeway-2.1.0                                 :  5 Jul 2024
+
   * causeway-3.0.0                                 :  3 Apr 2024
   * causeway-2.0.0                                 :  3 Apr 2024
 
diff --git a/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc b/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc
index 922d03b249..70b11adfe0 100644
--- a/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/partials/2024/2.0.0/_relnotes.adoc
@@ -85,7 +85,9 @@ In particular, "encapsulated" mode mean that the properties and collections of e
 
 ** supported custom scalar value types and composite types
 +
-This includes xref:valuetypes:asciidoc:about.adoc[AsciiDoc], xref:valuetypes:markdown:about.adoc[Markdown], xref:valuetypes:jodatime:about.adoc[] and xref:valuetypes:vega:about.adoc[Vega] (link:https://vega.github.io/vega-lite/[Vega-lite], "a grammar of interactive graphics").
+This includes xref:valuetypes:asciidoc:about.adoc[AsciiDoc], xref:valuetypes:markdown:about.adoc[Markdown], xref:valuetypes:jodatime:about.adoc[Jodatime] and xref:valuetypes:vega:about.adoc[Vega]
+(link:https://vega.github.io/vega-lite/[Vega-lite], "a grammar of interactive graphics").
+
 
 ** mixin classes annotated as `@Action`, `@Property` or `@Collection`
 
diff --git a/antora/supplemental-ui/doap_causeway.rdf b/antora/supplemental-ui/doap_causeway.rdf
index fab6db5cdf..faed38979f 100644
--- a/antora/supplemental-ui/doap_causeway.rdf
+++ b/antora/supplemental-ui/doap_causeway.rdf
@@ -39,8 +39,16 @@
     <release>
       <Version>
         <name>causeway</name>
-        <created>2024-04-03</created>
-        <revision>2.0.0</revision>
+        <created>2024-07-05</created>
+        <revision>3.1.0</revision>
+      </Version>
+    </release>
+
+    <release>
+      <Version>
+        <name>causeway</name>
+        <created>2024-07-05</created>
+        <revision>2.1.0</revision>
       </Version>
     </release>
 
@@ -52,6 +60,14 @@
       </Version>
     </release>
 
+    <release>
+      <Version>
+        <name>causeway</name>
+        <created>2024-04-03</created>
+        <revision>2.0.0</revision>
+      </Version>
+    </release>
+
     <release>
       <Version>
         <name>causeway</name>


(causeway) 09/12: Merge branch 'release-2.1.0-RC1' into release-3.1.0-RC1

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 1f95fe4e8d84ce4b147224d0808328f8db0ab257
Merge: 2242d9ba97 1d41ee74d3
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 5 17:20:26 2024 +0100

    Merge branch 'release-2.1.0-RC1' into release-3.1.0-RC1

 .../ROOT/pages/post-release-successful.adoc        | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)