This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch build-website in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 80517a8b6152ef4ed4930971a2f6fb943f83af0a Merge: 34192c75cb5 519fc32ccc9 Author: Dan Haywood <[email protected]> AuthorDate: Sun Jul 12 15:39:39 2026 +0100 Merge branch 'release-4.0.0-M2-RC1' STATUS | 2 + .../modules/ROOT/pages/cutting-a-release.adoc | 6 +- antora/components/relnotes/modules/ROOT/nav.adoc | 1 + .../modules/ROOT/pages/2026/4.0.0-M2/mignotes.adoc | 27 ++- .../ROOT/pages/2026/4.0.0-M2/otel-howto.adoc | 76 ++++++++ .../modules/ROOT/pages/2026/4.0.0-M2/relnotes.adoc | 207 +++++++++------------ .../relnotes/modules/ROOT/pages/about.adoc | 10 + antora/pom.xml | 2 +- antora/supplemental-ui/doap_causeway.rdf | 8 + api/applib/pom.xml | 2 +- api/schema/pom.xml | 2 +- bom/pom.xml | 2 +- commons/pom.xml | 2 +- core/codegen-bytebuddy/pom.xml | 2 +- core/config/pom.xml | 2 +- core/interaction/pom.xml | 2 +- core/internaltestsupport/pom.xml | 2 +- core/metamodel/pom.xml | 2 +- core/mmtest/pom.xml | 20 +- core/mmtestsupport/pom.xml | 2 +- core/pom.xml | 2 +- core/runtime/pom.xml | 2 +- core/runtimeservices/pom.xml | 2 +- core/security/pom.xml | 2 +- core/transaction/pom.xml | 2 +- core/webapp/pom.xml | 2 +- extensions/core/commandlog/applib/pom.xml | 2 +- extensions/core/commandlog/persistence-jpa/pom.xml | 2 +- extensions/core/commandlog/pom.xml | 2 +- extensions/core/docgen/help/pom.xml | 2 +- extensions/core/docgen/pom.xml | 2 +- extensions/core/excel/applib/pom.xml | 2 +- extensions/core/excel/fixture/pom.xml | 2 +- extensions/core/excel/integtests/pom.xml | 2 +- extensions/core/excel/pom.xml | 2 +- extensions/core/excel/testing/pom.xml | 2 +- extensions/core/executionlog/applib/pom.xml | 2 +- .../core/executionlog/persistence-jpa/pom.xml | 2 +- extensions/core/executionlog/pom.xml | 2 +- extensions/core/executionoutbox/applib/pom.xml | 2 +- .../core/executionoutbox/persistence-jpa/pom.xml | 2 +- extensions/core/executionoutbox/pom.xml | 2 +- extensions/core/executionoutbox/restclient/pom.xml | 2 +- .../core/executionrepublisher/applib/pom.xml | 2 +- extensions/core/executionrepublisher/pom.xml | 2 +- extensions/core/flyway/impl/pom.xml | 2 +- extensions/core/flyway/pom.xml | 2 +- extensions/core/layoutloaders/github/pom.xml | 2 +- extensions/core/layoutloaders/pom.xml | 2 +- extensions/core/titlecache/applib/pom.xml | 2 +- extensions/core/titlecache/caffeine/pom.xml | 2 +- extensions/core/titlecache/pom.xml | 2 +- extensions/pom.xml | 2 +- extensions/security/audittrail/applib/pom.xml | 2 +- .../security/audittrail/persistence-jpa/pom.xml | 2 +- extensions/security/audittrail/pom.xml | 2 +- extensions/security/secman/applib/pom.xml | 2 +- .../security/secman/delegated-springoauth2/pom.xml | 2 +- .../security/secman/encryption-jbcrypt/pom.xml | 2 +- .../security/secman/encryption-spring/pom.xml | 2 +- extensions/security/secman/integration/pom.xml | 2 +- extensions/security/secman/persistence-jpa/pom.xml | 2 +- extensions/security/secman/pom.xml | 2 +- extensions/security/sessionlog/applib/pom.xml | 2 +- .../security/sessionlog/persistence-jpa/pom.xml | 2 +- extensions/security/sessionlog/pom.xml | 2 +- extensions/security/spring-oauth2/pom.xml | 2 +- extensions/vro/cors/impl/pom.xml | 2 +- extensions/vro/cors/pom.xml | 2 +- extensions/vw/fullcalendar/applib/pom.xml | 2 +- extensions/vw/fullcalendar/pom.xml | 2 +- .../vw/fullcalendar/wicket/integration/pom.xml | 2 +- extensions/vw/fullcalendar/wicket/pom.xml | 2 +- extensions/vw/fullcalendar/wicket/ui/pom.xml | 2 +- extensions/vw/pdfjs/applib/pom.xml | 2 +- extensions/vw/pdfjs/metamodel/pom.xml | 2 +- extensions/vw/pdfjs/pom.xml | 2 +- extensions/vw/pdfjs/wicket/integration/pom.xml | 2 +- extensions/vw/pdfjs/wicket/pom.xml | 2 +- extensions/vw/pdfjs/wicket/ui/pom.xml | 2 +- extensions/vw/sse/applib/pom.xml | 2 +- extensions/vw/sse/metamodel/pom.xml | 2 +- extensions/vw/sse/pom.xml | 2 +- extensions/vw/sse/wicket/pom.xml | 2 +- extensions/vw/tabular/applib/pom.xml | 2 +- extensions/vw/tabular/excel/pom.xml | 2 +- extensions/vw/tabular/pdf/pom.xml | 2 +- extensions/vw/tabular/pom.xml | 2 +- mavendeps/pom.xml | 2 +- mavendeps/webapp/pom.xml | 2 +- parent/pom.xml | 4 +- persistence/commons/pom.xml | 2 +- persistence/jdbc/pom.xml | 2 +- persistence/jpa/applib/pom.xml | 2 +- persistence/jpa/eclipselink/pom.xml | 2 +- persistence/jpa/integration/pom.xml | 2 +- persistence/jpa/metamodel/pom.xml | 2 +- persistence/jpa/pom.xml | 2 +- persistence/querydsl/applib/pom.xml | 2 +- persistence/querydsl/integration/pom.xml | 2 +- persistence/querydsl/jpa/pom.xml | 2 +- persistence/querydsl/metamodel/pom.xml | 2 +- persistence/querydsl/pom.xml | 2 +- persistence/querydsl/testsupport/pom.xml | 2 +- pom.xml | 39 +++- regressiontests/base-jpa/pom.xml | 2 +- regressiontests/base/pom.xml | 2 +- regressiontests/bootstrapping/pom.xml | 2 +- regressiontests/cmdexecauditsess/generic/pom.xml | 2 +- .../cmdexecauditsess/persistence-jpa/pom.xml | 2 +- regressiontests/cmdexecauditsess/pom.xml | 2 +- regressiontests/config/pom.xml | 2 +- regressiontests/core-wrapperfactory/pom.xml | 2 +- regressiontests/cucumber/pom.xml | 2 +- regressiontests/domainmodel/pom.xml | 2 +- regressiontests/eventhandling/pom.xml | 2 +- regressiontests/factory/pom.xml | 2 +- regressiontests/interact/pom.xml | 2 +- regressiontests/persistence-jpa/pom.xml | 2 +- regressiontests/pom.xml | 2 +- regressiontests/publishing-jpa/pom.xml | 2 +- regressiontests/rest-jpa/pom.xml | 2 +- regressiontests/value/pom.xml | 2 +- regressiontests/viewers-common/pom.xml | 2 +- regressiontests/viewers-jpa/pom.xml | 2 +- security/bypass/pom.xml | 2 +- security/keycloak/pom.xml | 2 +- security/simple/pom.xml | 2 +- security/spring/pom.xml | 2 +- starters/pom.xml | 2 +- testing/archtestsupport/applib/pom.xml | 2 +- testing/archtestsupport/pom.xml | 2 +- testing/fakedata/applib/pom.xml | 2 +- testing/fakedata/fixtures/pom.xml | 2 +- testing/fakedata/integtests/pom.xml | 2 +- testing/fakedata/pom.xml | 2 +- testing/fixtures/applib/pom.xml | 2 +- testing/fixtures/pom.xml | 2 +- testing/h2console/pom.xml | 2 +- testing/h2console/ui/pom.xml | 2 +- testing/hsqldbmgr/pom.xml | 2 +- testing/hsqldbmgr/ui/pom.xml | 2 +- testing/integtestsupport/applib/pom.xml | 2 +- testing/integtestsupport/pom.xml | 2 +- testing/pom.xml | 2 +- testing/specsupport/applib/pom.xml | 2 +- testing/specsupport/pom.xml | 2 +- testing/unittestsupport/applib/pom.xml | 2 +- testing/unittestsupport/pom.xml | 2 +- valuetypes/asciidoc/applib/pom.xml | 2 +- valuetypes/asciidoc/builder/pom.xml | 2 +- valuetypes/asciidoc/metamodel/pom.xml | 2 +- valuetypes/asciidoc/persistence-jpa/pom.xml | 2 +- valuetypes/asciidoc/pom.xml | 2 +- valuetypes/asciidoc/ui/pom.xml | 2 +- valuetypes/asciidoc/ui/wicket/pom.xml | 2 +- valuetypes/markdown/applib/pom.xml | 2 +- valuetypes/markdown/metamodel/pom.xml | 2 +- valuetypes/markdown/persistence-jpa/pom.xml | 2 +- valuetypes/markdown/pom.xml | 2 +- valuetypes/markdown/ui/pom.xml | 2 +- valuetypes/markdown/ui/wicket/pom.xml | 2 +- valuetypes/pom.xml | 2 +- valuetypes/vega/applib/pom.xml | 2 +- valuetypes/vega/metamodel/pom.xml | 2 +- valuetypes/vega/persistence-jpa/pom.xml | 2 +- valuetypes/vega/pom.xml | 2 +- valuetypes/vega/ui/pom.xml | 2 +- valuetypes/vega/ui/wicket/pom.xml | 2 +- viewers/commons/applib/pom.xml | 2 +- viewers/commons/model/pom.xml | 2 +- viewers/commons/pom.xml | 2 +- viewers/commons/prism/pom.xml | 2 +- viewers/commons/services/pom.xml | 2 +- viewers/graphql/applib/pom.xml | 2 +- viewers/graphql/model/pom.xml | 2 +- viewers/graphql/pom.xml | 2 +- viewers/graphql/test/pom.xml | 2 +- viewers/graphql/test/src/test/resources/schema.gql | 136 -------------- viewers/graphql/test2/pom.xml | 2 +- viewers/graphql/testsupport/pom.xml | 2 +- viewers/graphql/viewer/pom.xml | 2 +- viewers/restfulobjects/applib/pom.xml | 2 +- viewers/restfulobjects/client/pom.xml | 2 +- viewers/restfulobjects/pom.xml | 2 +- viewers/restfulobjects/rendering/pom.xml | 2 +- viewers/restfulobjects/test/pom.xml | 2 +- viewers/restfulobjects/viewer/pom.xml | 2 +- viewers/wicket/applib/pom.xml | 2 +- viewers/wicket/model/pom.xml | 2 +- viewers/wicket/pom.xml | 2 +- viewers/wicket/ui-test/pom.xml | 2 +- viewers/wicket/ui/pom.xml | 2 +- viewers/wicket/viewer/pom.xml | 2 +- 194 files changed, 444 insertions(+), 456 deletions(-) diff --cc core/mmtest/pom.xml index 9c0ed7b6869,90512af586c..6359e953cfb --- a/core/mmtest/pom.xml +++ b/core/mmtest/pom.xml @@@ -1,69 -1,49 +1,69 @@@ <?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more --contributor ++contributor license agreements. See the NOTICE file distributed with this work for --additional -- information regarding copyright ownership. The ASF licenses this file to -- you under the Apache License, Version 2.0 (the "License"); you may not use -- this file except in compliance with the License. You may obtain a copy of -- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required -- by applicable law or agreed to in writing, software distributed under the -- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS -- OF ANY KIND, either express or implied. See the License for the specific ++additional ++ information regarding copyright ownership. The ASF licenses this file to ++ you under the Apache License, Version 2.0 (the "License"); you may not use ++ this file except in compliance with the License. You may obtain a copy of ++ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required ++ by applicable law or agreed to in writing, software distributed under the ++ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS ++ OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.causeway.core</groupId> - <artifactId>causeway-core</artifactId> - <version>4.0.0-M3-SNAPSHOT</version> - </parent> - - <artifactId>causeway-core-mmtest</artifactId> - <name>Apache Causeway Core - Metamodel Test</name> - - <properties> - <jar-plugin.automaticModuleName>org.apache.causeway.core.mmtest</jar-plugin.automaticModuleName> - <git-plugin.propertiesDir>org/apache/causeway/core/mmtest</git-plugin.propertiesDir> - <maven.deploy.skip>true</maven.deploy.skip> <!-- don't deploy test + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core</artifactId> - <version>4.0.0-SNAPSHOT</version> ++ <version>4.0.0-M3-SNAPSHOT</version> + </parent> + + <artifactId>causeway-core-mmtest</artifactId> + <name>Apache Causeway Core - Metamodel Test</name> + + <properties> + <jar-plugin.automaticModuleName>org.apache.causeway.core.mmtest</jar-plugin.automaticModuleName> + <git-plugin.propertiesDir>org/apache/causeway/core/mmtest</git-plugin.propertiesDir> + <maven.deploy.skip>true</maven.deploy.skip> <!-- don't deploy test artifiacts --> - </properties> + </properties> - <description> - Tests the causeway-core-metamodel artifact (using a custom - MetaModelContext for testing, as provided by - causeway-core-mmtestsupport). - Introduced to avoid a circular artifact dependency. - </description> + <description> + Tests the causeway-core-metamodel artifact (using a custom + MetaModelContext for testing, as provided by + causeway-core-mmtestsupport). + Introduced to avoid a circular artifact dependency. + </description> - <dependencies> + <dependencies> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-mmtestsupport</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-unittestsupport-applib</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-internaltestsupport</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-integtestsupport-applib</artifactId> + </dependency> <dependency> - <groupId>org.apache.causeway.core</groupId> - <artifactId>causeway-core-mmtestsupport</artifactId> + <!-- required by com.approvaltests:test (version managed by spring boot) --> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> <scope>test</scope> </dependency> diff --cc valuetypes/asciidoc/builder/pom.xml index 61e0b8641d5,7e1fe7d70cb..e187db2d73c --- a/valuetypes/asciidoc/builder/pom.xml +++ b/valuetypes/asciidoc/builder/pom.xml @@@ -12,124 -12,88 +12,124 @@@ additiona OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.causeway.valuetypes</groupId> - <artifactId>causeway-valuetypes-asciidoc</artifactId> - <version>4.0.0-M3-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-asciidoc</artifactId> - <version>4.0.0-SNAPSHOT</version> ++ <version>4.0.0-M3-SNAPSHOT</version> + </parent> - <artifactId>causeway-valuetypes-asciidoc-builder</artifactId> - <name>Apache Causeway Val - Asciidoctor (Builder)</name> + <artifactId>causeway-valuetypes-asciidoc-builder</artifactId> + <name>Apache Causeway Val - Asciidoctor (Builder)</name> - <description> - Library for programmatic AsciiDoc generation. + <description> + Library for programmatic AsciiDoc generation. - The AsciiDoc name is trademarked by the Eclipse Foundation - (https://www.eclipse.org/). - This project is *not* part of the specification effort for _AsciiDoc_ - under the - AsciiDoc Working Group. See - https://projects.eclipse.org/proposals/asciidoc-language - and https://accounts.eclipse.org/mailing-list/asciidoc-wg. However, we - are happy to - help with transfer of source code, if any project (under the umbrella of - the - AsciiDoc Working Group) is willing to take over. - </description> + The AsciiDoc name is trademarked by the Eclipse Foundation + (https://www.eclipse.org/). + This project is *not* part of the specification effort for _AsciiDoc_ + under the + AsciiDoc Working Group. See + https://projects.eclipse.org/proposals/asciidoc-language + and https://accounts.eclipse.org/mailing-list/asciidoc-wg. However, we + are happy to + help with transfer of source code, if any project (under the umbrella of + the + AsciiDoc Working Group) is willing to take over. + </description> - <properties> - <jar-plugin.automaticModuleName> - org.apache.causeway.valuetypes.asciidoc.builder</jar-plugin.automaticModuleName> - <git-plugin.propertiesDir> - org/apache/causeway/valuetypes/asciidoc/builder</git-plugin.propertiesDir> - </properties> + <properties> + <jar-plugin.automaticModuleName> + org.apache.causeway.valuetypes.asciidoc.builder</jar-plugin.automaticModuleName> + <git-plugin.propertiesDir> + org/apache/causeway/valuetypes/asciidoc/builder</git-plugin.propertiesDir> + </properties> - <dependencies> + <dependencies> - <dependency> - <groupId>org.apache.causeway.commons</groupId> - <artifactId>causeway-commons</artifactId> - </dependency> + <dependency> + <groupId>org.apache.causeway.commons</groupId> + <artifactId>causeway-commons</artifactId> + </dependency> - <dependency> - <groupId>org.apache.causeway.valuetypes</groupId> - <artifactId>causeway-valuetypes-asciidoc-applib</artifactId> - </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-asciidoc-applib</artifactId> + </dependency> - <!--same as in ../ui --> - <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctorj</artifactId> - </dependency> - <dependency> - <groupId>org.jruby</groupId> - <artifactId>jruby</artifactId> - </dependency> - <dependency> - <groupId>com.github.jnr</groupId> - <artifactId>jnr-posix</artifactId> - </dependency> - <dependency> - <groupId>com.github.jnr</groupId> - <artifactId>jnr-enxio</artifactId> - </dependency> - <dependency> - <groupId>com.github.jnr</groupId> - <artifactId>jnr-constants</artifactId> - </dependency> - <dependency> - <groupId>com.github.jnr</groupId> - <artifactId>jnr-ffi</artifactId> - </dependency> + <!--same as in ../ui --> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj</artifactId> + </dependency> + <dependency> + <groupId>org.jruby</groupId> + <artifactId>jruby</artifactId> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + <exclusion> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-posix</artifactId> + </exclusion> + <exclusion> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-enxio</artifactId> + </exclusion> + <exclusion> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-constants</artifactId> + </exclusion> + <exclusion> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-ffi</artifactId> + </exclusion> + <exclusion> + <groupId>com.github.jnr</groupId> + <artifactId>jffi</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-posix</artifactId> + </dependency> + <dependency> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-enxio</artifactId> + </dependency> + <dependency> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-constants</artifactId> + </dependency> + <dependency> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-ffi</artifactId> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.github.jnr</groupId> + <artifactId>jffi</artifactId> + </dependency> - <!-- TESTING --> + <!-- TESTING --> - <dependency> - <groupId>org.apache.causeway.core</groupId> - <artifactId>causeway-core-internaltestsupport</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-internaltestsupport</artifactId> + <scope>test</scope> + </dependency> - </dependencies> + </dependencies> </project>
