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:57 UTC
[isis] 02/04: ISIS-2192: more faff for fixing the deps of
mavendeps-testing
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>