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 f5cc6b2989f263a0aba57ebe802e7e0d246feed4
Merge: 7b1f691f200 94053a62b57
Author: Dan Haywood <[email protected]>
AuthorDate: Sun Jul 12 15:52:13 2026 +0100

    Merge branch 'v3' into temp

 .../workflows/ci-build-site-no-push.yml~disabled   |  2 +-
 STATUS                                             |  2 ++
 .../applib/pages/index/annotation/Publishing.adoc  | 17 +++++++++
 antora/components/relnotes/modules/ROOT/nav.adoc   |  3 ++
 .../modules/ROOT/pages/2026/3.6.0/mignotes.adoc    |  7 ++++
 .../modules/ROOT/pages/2026/3.6.0/relnotes.adoc    | 42 ++++++++++++++++++++++
 .../relnotes/modules/ROOT/pages/about.adoc         | 10 ++++++
 antora/supplemental-ui/doap_causeway.rdf           |  8 +++++
 bom/pom.xml                                        | 12 ++-----
 core/adoc/modules/_overview/pages/about.adoc       | 14 ++++----
 .../pages/sections/causeway.viewer.wicket.adoc     | 29 +++++++++++++++
 persistence/jpa/eclipselink/pom.xml                |  5 ---
 .../src/main/resources/supplemental-models.xml     | 23 +++++++++---
 13 files changed, 149 insertions(+), 25 deletions(-)

diff --cc bom/pom.xml
index 5005d64772e,13cedf0d439..a66236252a3
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -118,7 -118,7 +118,7 @@@ identifie
  
          
<datasource-proxy-spring-boot-starter.version>1.12.1</datasource-proxy-spring-boot-starter.version>
  
-         <datatables.version>2.3.8</datatables.version> <!-- webjar 
 -        <datatables.version>2.3.7</datatables.version> <!-- webjar 
++        <datatables.version>2.3.8</datatables.version> <!-- webjar
          see also DatatablesDotNet -->
  
          <docx4j.version>11.3.2</docx4j.version>
@@@ -154,15 -153,15 +153,15 @@@
  
          <jspecify.version>1.0.0</jspecify.version>
          <jsr305.version>3.0.2</jsr305.version>
 -        <jsoup.version>1.22.1</jsoup.version>
 -        <junit-jupiter.version>6.0.3</junit-jupiter.version> <!-- overrides
 +        <jsoup.version>1.22.2</jsoup.version>
 +        <junit-jupiter.version>6.1.1</junit-jupiter.version> <!-- overrides
          spring -->
 -        <junit-platform.version>6.0.3</junit-platform.version>
 +        <junit-platform.version>6.1.1</junit-platform.version>
  
          <log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
 -        <lombok.version>1.18.44</lombok.version> <!-- overriding Spring -->
 +        <lombok.version>1.18.46</lombok.version> <!-- overriding Spring -->
  
--        <momentjs.version>2.30.1-1</momentjs.version> <!-- webjar 
++        <momentjs.version>2.30.1-1</momentjs.version> <!-- webjar
          see also
          
org.apache.causeway.viewer.wicket.ui.components.scalars.datepicker.MomentJsReference
 -->
  
@@@ -254,13 -253,13 +253,13 @@@
  
              <!-- org.apache.causeway.core -->
  
 -            <dependency>
 -                <groupId>org.apache.causeway.core</groupId>
 -                <artifactId>causeway-core</artifactId>
 -                <version>3.7.0-SNAPSHOT</version>
 -                <type>pom</type>
 -                <scope>compile</scope>
 -            </dependency>
 +<!--            <dependency>-->
 +<!--                <groupId>org.apache.causeway.core</groupId>-->
 +<!--                <artifactId>causeway-core</artifactId>-->
- <!--                <version>3.6.0-SNAPSHOT</version>-->
++<!--                <version>3.7.0-SNAPSHOT</version>-->
 +<!--                <type>pom</type>-->
 +<!--                <scope>compile</scope>-->
 +<!--            </dependency>-->
  
              <dependency>
                  <groupId>org.apache.causeway.core</groupId>

Reply via email to