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:56 UTC
[isis] 01/04: ISIS-2192: removes refs to 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 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>