You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/31 09:37:55 UTC
[isis] branch master updated (146da53 -> d16c3ba)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 146da53 ISIS-2223: re-enable surfire for 'isis-subdomains-excel-integtests'
new 53f2d13 ISIS-2192: removes refs to mavendeps-testing
new cc79354 ISIS-2192: more faff for fixing the deps of mavendeps-testing
new 633586c ISIS-2192: still faffing ... upgrading cucumber
new d16c3ba ISIS-2192: still faffing ... upgrading cucumber, ctd
The 4 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:
.../modules/comguide/pages/cutting-a-release.adoc | 114 +++++++++++++++------
core/pom.xml | 32 +++++-
examples/smoketests/pom.xml | 2 +-
extensions/vw/pdfjs/fixtures/pom.xml | 2 +-
mavendeps/adoc/modules/mavendeps/pages/about.adoc | 86 +++++-----------
mavendeps/pom.xml | 40 ++++++++
starters/pom.xml | 3 +-
subdomains/excel/fixture/pom.xml | 2 +-
subdomains/excel/integtests/pom.xml | 12 +--
testing/fakedata/integtests/pom.xml | 17 +--
.../adoc/modules/integtestsupport/pages/about.adoc | 6 +-
testing/pom.xml | 7 --
.../adoc/modules/specsupport/pages/about.adoc | 2 +-
testing/specsupport/applib/pom.xml | 14 +--
.../integration/ObjectFactoryForIntegration.java | 5 +-
.../adoc/modules/unittestsupport/pages/about.adoc | 2 +-
16 files changed, 193 insertions(+), 153 deletions(-)
[isis] 04/04: ISIS-2192: still faffing ... upgrading cucumber, ctd
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d16c3bab1f4b81241b11f983e9ab2b27ec65c37c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 19:33:23 2020 +0000
ISIS-2192: still faffing ... upgrading cucumber, ctd
---
.../specsupport/applib/integration/ObjectFactoryForIntegration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
index 849921c..9bfe4ff 100644
--- a/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
+++ b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
@@ -26,8 +26,8 @@ import org.apache.isis.core.commons.internal.collections._Maps;
import lombok.RequiredArgsConstructor;
-import cucumber.runtime.CucumberException;
import io.cucumber.core.backend.ObjectFactory;
+import io.cucumber.core.exception.CucumberException;
@RequiredArgsConstructor
[isis] 03/04: ISIS-2192: still faffing ... upgrading cucumber
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 633586c572858cc2882bfb17d82c6fa5ddde2bde
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 19:27:56 2020 +0000
ISIS-2192: still faffing ... upgrading cucumber
---
.../modules/comguide/pages/cutting-a-release.adoc | 56 ++++++++++++++++++++++
core/pom.xml | 18 +++++++
starters/pom.xml | 3 +-
.../adoc/modules/integtestsupport/pages/about.adoc | 6 +--
testing/pom.xml | 7 ---
.../adoc/modules/specsupport/pages/about.adoc | 2 +-
testing/specsupport/applib/pom.xml | 14 +-----
.../integration/ObjectFactoryForIntegration.java | 3 +-
.../adoc/modules/unittestsupport/pages/about.adoc | 2 +-
9 files changed, 83 insertions(+), 28 deletions(-)
diff --git a/antora/toc/modules/comguide/pages/cutting-a-release.adoc b/antora/toc/modules/comguide/pages/cutting-a-release.adoc
index d97e131..ad2ff21 100644
--- a/antora/toc/modules/comguide/pages/cutting-a-release.adoc
+++ b/antora/toc/modules/comguide/pages/cutting-a-release.adoc
@@ -326,6 +326,62 @@ git fetch
The remote tags aren't visible locally but can be seen link:https://github.com/apache/isis/tags[online].
====
+== Update starter apps
+
+For each starter app, we create a new branch and make the changes there, pushing the branch back if the sanity check passes.
+
+
+* for helloworld, the steps are:
++
+[source,bash,subs="attributes+"]
+----
+git checkout master
+git pull --ff-only
+
+git checkout -b $ISISBRANCH
+
+mvn versions:update-parent -DparentVersion=$ISISREL
+mvn versions:set -DnewVersion=$ISISREL
+
+mvn clean install -o
+mvn spring-boot:run
+----
+
+* for simple app, the steps are almost the same:
++
+[source,bash,subs="attributes+"]
+----
+git checkout master
+git pull --ff-only
+
+git checkout -b $ISISBRANCH
+
+mvn versions:update-parent -DparentVersion=$ISISREL
+mvn versions:set -DnewVersion=$ISISREL
+
+mvn clean install -o -Dmetamodel.lockdown
+mvn -pl webapp test -o -Dmavendeps.lockdown
+----
++
+Approve any failed lockdown tests (the mavendeps will fail first time arround because the dependencies on Apache Isis itself have just be bumped).
+Repeat, then run the app as a sanity check:
++
+[source,bash,subs="attributes+"]
+----
+mvn clean install -o -Dmetamodel.lockdown
+mvn -pl webapp test -o -Dmavendeps.lockdown
+
+mvn -pl webapp spring-boot:run
+----
+
+* For both apps, push the release branch to origin once ok:
++
+[source,bash,subs="attributes+"]
+----
+git push -u origin $ISISBRANCH
+----
+
+
== Voting
Once the artifacts have been uploaded, you can call a vote.
diff --git a/core/pom.xml b/core/pom.xml
index be0bdbc..fb908e1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -91,6 +91,8 @@
<commons-lang3.version>3.9</commons-lang3.version>
<commons-logging.version>1.2</commons-logging.version>
+ <cucumber.version>5.1.2</cucumber.version>
+
<cxf-rt-rs-client.version>3.3.4</cxf-rt-rs-client.version>
<danhaywood-java-assertjext.version>0.1.0</danhaywood-java-assertjext.version>
@@ -1554,6 +1556,22 @@
<version>${wicketstuff.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-java</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-spring</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-junit</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
diff --git a/starters/pom.xml b/starters/pom.xml
index fc6dd4d..82599ae 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -50,6 +50,7 @@ under the License.
<approvaltests.version>4.0.2</approvaltests.version>
<resteasy.version>4.4.1.Final</resteasy.version>
+
</properties>
<build>
@@ -252,7 +253,7 @@ under the License.
<version>${maven-surefire-plugin.version}</version>
<executions>
<execution>
- <id>default-test</id>
+ <id>unit-test</id>
<phase>test</phase>
<goals>
<goal>test</goal>
diff --git a/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc b/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
index 611d6f9..668ca98 100644
--- a/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
+++ b/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
@@ -550,17 +550,15 @@ Thus, the setup fixture runs the setup for the "inner-most" "leaf-level" modules
-
-
== Maven Configuration
-Apache Isis' integ test support is most easily configured through a dependency on the `isis-mavendeps-testing` module:
+Apache Isis' integ test support is most easily configured through a dependency on the `isis-mavendeps-integtests` module:
[source,xml]
----
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-integtests</artifactId>
<scope>test</scope> <!--1-->
<type>pom</type>
</dependency>
diff --git a/testing/pom.xml b/testing/pom.xml
index 87c62b2..2030f64 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -125,13 +125,6 @@
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
<modules>
<module>fakedata</module>
diff --git a/testing/specsupport/adoc/modules/specsupport/pages/about.adoc b/testing/specsupport/adoc/modules/specsupport/pages/about.adoc
index 64b8603..7ecc567 100644
--- a/testing/specsupport/adoc/modules/specsupport/pages/about.adoc
+++ b/testing/specsupport/adoc/modules/specsupport/pages/about.adoc
@@ -244,7 +244,7 @@ Apache Isis' BDD spec support is most easily configured through a dependency on
----
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-integspecs</artifactId>
<scope>test</scope> <!--1-->
<type>pom</type>
</dependency>
diff --git a/testing/specsupport/applib/pom.xml b/testing/specsupport/applib/pom.xml
index 4bfd111..489c0f5 100644
--- a/testing/specsupport/applib/pom.xml
+++ b/testing/specsupport/applib/pom.xml
@@ -28,8 +28,7 @@
<git-plugin.propertiesDir>org/apache/isis/testing/specsupport.applib</git-plugin.propertiesDir>
<cucumber.impl>io.cucumber</cucumber.impl>
- <cucumber.version>4.8.0</cucumber.version>
-
+
</properties>
<dependencies>
@@ -43,25 +42,14 @@
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
- <version>${cucumber.version}</version>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-spring</artifactId>
- <version>${cucumber.version}</version>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
- <version>${cucumber.version}</version>
-<!--
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
--->
</dependency>
</dependencies>
diff --git a/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
index 8023645..849921c 100644
--- a/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
+++ b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
@@ -26,8 +26,9 @@ import org.apache.isis.core.commons.internal.collections._Maps;
import lombok.RequiredArgsConstructor;
-import cucumber.api.java.ObjectFactory;
import cucumber.runtime.CucumberException;
+import io.cucumber.core.backend.ObjectFactory;
+
@RequiredArgsConstructor
public class ObjectFactoryForIntegration implements ObjectFactory {
diff --git a/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc b/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
index da5c2d6..632d969 100644
--- a/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
+++ b/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
@@ -321,7 +321,7 @@ Apache Isis' unit test support is most easily configured through a dependency on
----
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-unittests</artifactId>
<scope>test</scope> <!--1-->
<type>pom</type>
</dependency>
[isis] 01/04: ISIS-2192: removes refs to mavendeps-testing
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 53f2d13acb326b9dd80dda4fb9604863fac5985b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 17:42:25 2020 +0000
ISIS-2192: removes refs to mavendeps-testing
---
.../modules/comguide/pages/cutting-a-release.adoc | 50 ++++++++++------------
core/pom.xml | 14 +++++-
examples/smoketests/pom.xml | 2 +-
extensions/vw/pdfjs/fixtures/pom.xml | 2 +-
subdomains/excel/fixture/pom.xml | 2 +-
subdomains/excel/integtests/pom.xml | 12 +-----
testing/fakedata/integtests/pom.xml | 12 +-----
7 files changed, 40 insertions(+), 54 deletions(-)
diff --git a/antora/toc/modules/comguide/pages/cutting-a-release.adoc b/antora/toc/modules/comguide/pages/cutting-a-release.adoc
index 3481fb0..6d20d63 100644
--- a/antora/toc/modules/comguide/pages/cutting-a-release.adoc
+++ b/antora/toc/modules/comguide/pages/cutting-a-release.adoc
@@ -43,6 +43,7 @@ export ISISREL={isisnext}
export ISISRC=RC1
export ISISBRANCH=release-$ISISREL-$ISISRC
export ISISJIRA=ISIS-9999 # <2>
+export ISISART=isis
env | grep ISIS | sort
----
@@ -57,6 +58,7 @@ Obviously, alter ``$ISISREL`` as required, and bump ``$ISISRC`` for re-releasing
Note that the branch name is intentionally *not* the same as the eventual tag names (eg `isis-{isisnext}`).
====
+
== Pull down code to release
Set the HEAD of your local git repo to the commit to be released.
@@ -81,16 +83,26 @@ grep SNAPSHOT $(/bin/find . -name pom.xml | grep -v target sort)
The only mention of `SNAPSHOT` should be in the `revision` property of the root `core-prent/pom.xml` file.
-== Bump `revision` property to `$ISISREL`
+== Releasing the Framework
+
+Switch to the appropriate directory:
+
+[source,bash,subs="attributes+"]
+----
+cd core-parent
+----
+
+=== Bump `revision` property to `$ISISREL`
Previously we used the `maven-release-plugin` which took responsibility for bumping the `<version>` from -SNAPSHOT to release, and then onto the next -SNAPSHOT.
-However, we now use a simpler process, of just running `mvn versions:set -DnewVersion=...`.
+However, we now use a simpler process, and just use `mvn versions:set`.
So, bump to the release version:
[source,bash,subs="attributes+"]
----
-sh scripts/version-bump.sh $ISISJIRA $ISISREL
+mvn versions:set -DnewVersion=${ISISREL}
+git commit -am "${ISISJIRA}: bumps version to ${ISISREL}"
----
so that they should read:
@@ -103,27 +115,9 @@ so that they should read:
</properties>
----
-After release, there is a xref:toc:comguide:cutting-a-release.adoc#reset-revision[similar step at the end] to reset back to `1.0.0-SNAPSHOT`.
-
-== Releasing the Framework
-
-Switch to the appropriate directory:
-
-[source,bash,subs="attributes+"]
-----
-cd core-parent
-----
-
-=== Set environment variables
+NOTE: After release, there is a xref:toc:comguide:cutting-a-release.adoc#reset-revision[similar step at the end] to reset back to `2.0.0-SNAPSHOT`.
-Set additional environment variables for the core "artifact":
-[source,bash,subs="attributes+"]
-----
-export ISISART=isis
-
-env | grep ISIS | sort
-----
=== License headers
@@ -205,8 +199,6 @@ Commit any changes from the preceding steps:
[source,bash,subs="attributes+"]
----
-cd core
-mvn versions:set -DnewVersion=$ISISVER
git commit -am "$ISISJIRA: updates to pom.xml etc for release"
----
@@ -295,19 +287,21 @@ See xref:toc:comguide:about.adoc#key-generation[Key Generation] for more details
== Reset `revision` property
At the beginning of the release process we bumped the `revision` property to the release version, ie `$ISISREL`.
-With the release now deployed we now need to reset the revision back down to the base snapshot, ie `1.0.0-SNAPSHOT`.
+With the release now deployed we now need to reset the revision back down to the base snapshot, ie `2.0.0-SNAPSHOT`.
[NOTE]
====
Previously we bumped to the next development snapshot.
-However, this approach doesn't play well with CI/CD when Apache Isis is mounted as a git submodule, so instead we always use `1.0.0-SNAPSHOT` for all development work.
+However, this approach doesn't play well with CI/CD when Apache Isis is mounted as a git submodule, so instead we always use `2.0.0-SNAPSHOT` for all development work.
====
-In the root of the Apache Isis repo, we do this for all three ``pom.xml``s with:
+Therefore:
[source,bash,subs="attributes+"]
----
-sh scripts/version-reset.sh $ISISJIRA
+cd core-parent
+mvn versions:set -DnewVersion=2.0.0-SNAPSHOT
+git commit -am "${ISISJIRA}: resetting version"
----
== Push branches
diff --git a/core/pom.xml b/core/pom.xml
index a5db4dd..be0bdbc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -909,7 +909,19 @@
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-unittests</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-integtests</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-integspecs</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>pom</type>
</dependency>
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 1991ba6..162e0be 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-integtests</artifactId>
<scope>test</scope>
<type>pom</type>
</dependency>
diff --git a/extensions/vw/pdfjs/fixtures/pom.xml b/extensions/vw/pdfjs/fixtures/pom.xml
index e36cb4a..63bbad6 100644
--- a/extensions/vw/pdfjs/fixtures/pom.xml
+++ b/extensions/vw/pdfjs/fixtures/pom.xml
@@ -207,7 +207,7 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
<!-- test -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-unittests</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
diff --git a/subdomains/excel/fixture/pom.xml b/subdomains/excel/fixture/pom.xml
index 4142b1d..a41d63b 100644
--- a/subdomains/excel/fixture/pom.xml
+++ b/subdomains/excel/fixture/pom.xml
@@ -97,7 +97,7 @@
<!--
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-integtests</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
diff --git a/subdomains/excel/integtests/pom.xml b/subdomains/excel/integtests/pom.xml
index 399277f..08a2461 100644
--- a/subdomains/excel/integtests/pom.xml
+++ b/subdomains/excel/integtests/pom.xml
@@ -67,19 +67,9 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-integtests</artifactId>
<type>pom</type>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-unittestsupport-applib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!--
diff --git a/testing/fakedata/integtests/pom.xml b/testing/fakedata/integtests/pom.xml
index eef4ebc..82ed4f8 100644
--- a/testing/fakedata/integtests/pom.xml
+++ b/testing/fakedata/integtests/pom.xml
@@ -69,19 +69,9 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-integtests</artifactId>
<type>pom</type>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-unittestsupport-applib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
[isis] 02/04: ISIS-2192: more faff for fixing the deps of
mavendeps-testing
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit cc7935465d6a11da943bcd7d3b38b36de5a83057
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 17:58:22 2020 +0000
ISIS-2192: more faff for fixing the deps of mavendeps-testing
---
.../modules/comguide/pages/cutting-a-release.adoc | 8 +-
mavendeps/adoc/modules/mavendeps/pages/about.adoc | 86 +++++++---------------
mavendeps/pom.xml | 40 ++++++++++
testing/fakedata/integtests/pom.xml | 5 --
4 files changed, 69 insertions(+), 70 deletions(-)
diff --git a/antora/toc/modules/comguide/pages/cutting-a-release.adoc b/antora/toc/modules/comguide/pages/cutting-a-release.adoc
index 6d20d63..d97e131 100644
--- a/antora/toc/modules/comguide/pages/cutting-a-release.adoc
+++ b/antora/toc/modules/comguide/pages/cutting-a-release.adoc
@@ -286,7 +286,7 @@ See xref:toc:comguide:about.adoc#key-generation[Key Generation] for more details
== Reset `revision` property
-At the beginning of the release process we bumped the `revision` property to the release version, ie `$ISISREL`.
+At the beginning of the release process we bumped the version to the release version, ie `$ISISREL`.
With the release now deployed we now need to reset the revision back down to the base snapshot, ie `2.0.0-SNAPSHOT`.
[NOTE]
@@ -350,9 +350,7 @@ And use the following body:
[source,bash,subs="attributes+"]
----
-I've cut a release for Apache Isis Framework (Core, Extensions, Mavendeps + Mixins):
-
-* Framework {isisnext}
+I've just cut a new release for Apache Isis Framework.
The source code artifacts have been uploaded to staging repositories on repository.apache.org.
For each zip there is a corresponding signature file (append .asc to the zip's url).
@@ -368,8 +366,6 @@ To verify the source code, you can use the following commands (in an empty direc
gpg --import /tmp/KEYS
rm -rf isis-$VERSION*
- rm -rf simpleapp-archetype-$VERSION*
- rm -rf helloworld-archetype-$VERSION*
curl -O -L https://raw.githubusercontent.com/apache/isis/06f947ad7a0968c34d8e6941a77e12aa0196cd17/scripts/verify-isis-release.sh
diff --git a/mavendeps/adoc/modules/mavendeps/pages/about.adoc b/mavendeps/adoc/modules/mavendeps/pages/about.adoc
index 765ac28..81ae386 100644
--- a/mavendeps/adoc/modules/mavendeps/pages/about.adoc
+++ b/mavendeps/adoc/modules/mavendeps/pages/about.adoc
@@ -116,100 +116,68 @@ integspecs
|Apache Isis' own xref:testing:unittestsupport:about.adoc[unit test support] +
with JMock2 extensions to mock classes
-| Y
-|
-|
+| Y | - | -
|Apache Isis' own xref:testing:integtestsupport:about.adoc[integ test support]
-|
-| Y
-| Y
+| - | Y | Y
|Apache Isis' own xref:testing:specsupport:about.adoc[BDD spec support]
-|
-|
-| Y
+| - | - | Y
| link:https://junit.org/junit5/docs/current/user-guide/[JUnit 5 "jupiter"]
-| Y
-| Y
-| Y
+| Y | Y | Y
| link:https://junit.org/junit5/docs/current/user-guide/#migrating-from-junit4[JUnit 5 "vintage"]
-| Y
-|
-|
+| Y | - | -
| link:https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-testing[Spring Boot Test]
-| Y
-| Y
-| Y
+| Y | Y | Y
| link:http://hamcrest.org/JavaHamcrest/[Hamcrest] (core + library)
-| Y
-| Y
-| Y
+| Y | Y | Y
| link:https://joel-costigliola.github.io/assertj/[AssertJ]
-| Y
-| Y
-| Y
+| Y | Y | Y
| link:https://site.mockito.org/[Mockito]
-| Y
-| Y
-| Y
+| Y | Y | Y
| link:http://jmock.org/[JMock]
-| Y
-|
-|
+| Y | - | -
| link:https://github.com/approvals/ApprovalTests.Java[Approval tests]
-| Y
-| Y
-| Y
-
-| link:https://github.com/google/guava/wiki[Google's Guava]
-| Y
-|
-|
+| Y | Y | Y
| link:http://picocontainer.com/[PicoContainer] +
(for JMock2 extensions)
-| Y
-|
-|
+| Y | - | -
| Apache Isis xref:refguide:ROOT:about.adoc[Applib]
-| Y
-| Y
-| Y
+| Y | Y | Y
| Apache Isis xref:core:runtime-services:about.adoc[Runtime Services]
-|
-| Y
-| Y
+| - | Y | Y
| Apache Isis xref:security:bypass:about.adoc[Bypass] security
-|
-| Y
-| Y
+| - | Y | Y
| Apache Isis xref:pjdo:ROOT:about.adoc[JDO/DataNucleus]
-|
-| Y
-| Y
+| - | Y | Y
| Apache Isis xref:testing:fakedata:about.adoc[Fake Data]
-| Y
-| Y
-| Y
+| Y | Y | Y
| Apache Isis xref:testing:fixtures:about.adoc[Fixture Scripts]
-|
-| Y
-| Y
+| - | Y | Y
+
+| link:https://github.com/google/guava/wiki[Google's Guava]
+| Y | - | -
+
+| link:http://hsqldb.org[HSQLDB]
+| - | Y | Y
+
+| link:https://www.h2database.com[H2 Database]
+| - | Y | Y
|===
diff --git a/mavendeps/pom.xml b/mavendeps/pom.xml
index ee956f8..125bda9 100644
--- a/mavendeps/pom.xml
+++ b/mavendeps/pom.xml
@@ -87,12 +87,52 @@
</dependency>
<dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-unittests</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-integtests</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-integspecs</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-webapp</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-jdk11</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+
</dependencies>
</dependencyManagement>
diff --git a/testing/fakedata/integtests/pom.xml b/testing/fakedata/integtests/pom.xml
index 82ed4f8..d32698b 100644
--- a/testing/fakedata/integtests/pom.xml
+++ b/testing/fakedata/integtests/pom.xml
@@ -74,11 +74,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>