You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/04/12 08:36:49 UTC
[isis] branch master updated: ISIS-2445: update release docs and scripts (isis-parent renamed to isis-bom)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new fe1462f545 ISIS-2445: update release docs and scripts (isis-parent renamed to isis-bom)
fe1462f545 is described below
commit fe1462f54587ab842afa38333026e0d482054a36
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Apr 12 10:36:43 2022 +0200
ISIS-2445: update release docs and scripts (isis-parent renamed to
isis-bom)
---
.../modules/ROOT/pages/cutting-a-release.adoc | 24 +++++++++++-----------
.../ROOT/pages/post-release-successful.adoc | 12 +++++------
.../modules/ROOT/pages/updating-the-website.adoc | 2 +-
scripts/ci/build-regressiontests.sh | 4 ++--
scripts/verify-isis-release.sh | 4 ++--
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
index 23de7d7ac6..c0857f4b11 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -10,7 +10,7 @@ The release process consists of:
* Members of the Apache Isis PMC xref:comguide:ROOT:verifying-releases.adoc[verifying] and voting on the release
* the release manager performing post-release tasks, for either a xref:comguide:ROOT:post-release-successful.adoc[successful] or an xref:comguide:ROOT:post-release-unsuccessful.adoc[unsuccessful] vote.
-Apache Isis itself is released in one go, everything is ultimately a child of `isis-parent/pom.xml` (relative to the link:https://github.com/apache/isis[source code root]).
+Apache Isis itself is released in one go, everything is ultimately a child of `bom/pom.xml` (relative to the link:https://github.com/apache/isis[source code root]).
This section details the process for formally releasing this module.
The subsequent sections describe how other committers can xref:comguide:ROOT:verifying-releases.adoc[verify a release] and how the release manager can then perform xref:comguide:ROOT:post-release-successful.adoc[post-release] activities and set up for the next development iteration.
@@ -72,7 +72,7 @@ To run the RAT tool, use:
----
mvn clean
-pushd isis-parent
+pushd bom
mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=1000 -Dreleased
popd
@@ -141,9 +141,9 @@ licenses to remove from supplemental-models.xml (are spurious):
If any missing entries are listed or are spurious, then update `supplemental-models.xml` and try again.
-=== Reconcile isis-parent pom
+=== Reconcile isis-bom pom
-The `isis-parent/pom.xml` is a customisation of the `org.apache:apache` pom, with each section of customisation clearly identified.
+The `bom/pom.xml` is a customisation of the `org.apache:apache` pom, with each section of customisation clearly identified.
Check to see if there has been a new version of `org.apache:apache`; if so, merge in the changes.
@@ -151,7 +151,7 @@ Check to see if there has been a new version of `org.apache:apache`; if so, merg
For link:https://maven.apache.org/guides/mini/guide-reproducible-builds.html[reproducibility], the `project.build.outputTimestamp` property must be updated to a hard-coded value.
-Locate this property in `isis-parent/pom.xml` and update to the current date/time.
+Locate this property in `bom/pom.xml` and update to the current date/time.
=== Update and preview website
@@ -264,13 +264,13 @@ Search through the `.java` files for `{page-isisprev}`, and change to `{page-isi
At the time of writing there was just one `.java` file that had the release hard-coded (`IsisConfigurationLegacy`).
-=== Switch to the `isis-parent` directory
+=== Switch to the `bom` directory
-The remainder of the release process is performed from the context of the `isis-parent` directory:
+The remainder of the release process is performed from the context of the `bom` directory:
[source,bash,subs="attributes+"]
----
-cd isis-parent
+cd bom
----
=== Bump projects to `$ISISREL`
@@ -278,7 +278,7 @@ cd isis-parent
We use `mvn versions:set` to manually bump the release version.
(After release, there is a xref:comguide:ROOT:cutting-a-release.adoc#reset-revision-property[similar step at the end] to reset back to a `-SNAPSHOT` version).
-(Still in the `isis-parent` directory), the steps are:
+(Still in the `bom` directory), the steps are:
* First we bump the framework's `pom.xml` files:
+
@@ -342,7 +342,7 @@ We activate the (inherited) `apache-release` profile to bring in the `gpg` plugi
The build creates a zip of the directory, so before executing the release we remove any other files.
-Still in the `isis-parent` directory, we deploy (upload the artifacts) using:
+Still in the `bom` directory, we deploy (upload the artifacts) using:
[source,bash,subs="attributes+"]
----
@@ -435,7 +435,7 @@ With the release now deployed we now need to reset the revision back down to the
Bumping back to `2.0.0-SNAPSHOT` (rather than the next development snapshot) simplifies CI/CD scripts for teams that want to building Apache Isis from source using git submodules.
====
-Therefore (still in the `isis-parent` directory):
+Therefore (still in the `bom` directory):
[source,bash,subs="attributes+"]
----
@@ -732,7 +732,7 @@ You'll also need to rebuild all and then regenerate config files and tooling:
[source,bash,subs="attributes+"]
----
git checkout $ISISBRANCH
-pushd isis-parent
+pushd bom
mvn clean install -DskipTests -Dreleased
popd
mvn clean install -pl core/config
diff --git a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
index 502f0e4759..369ddb71a4 100644
--- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
@@ -217,14 +217,14 @@ asc="$zip.asc"
md5="$zip.md5"
-fullname="isis-parent"
-pushd isis-parent
+fullname="isis-bom"
+pushd bom
-curl -O $repo_root/$fullname/$new_ver/$fullname-$new_ver-$asc
+curl -O $repo_root/bom/$new_ver/$fullname-$new_ver-$asc
svn add $fullname-$new_ver-$asc
-curl -O $repo_root/$fullname/$new_ver/$fullname-$new_ver-$md5
+curl -O $repo_root/bom/$new_ver/$fullname-$new_ver-$md5
svn add $fullname-$new_ver-$md5
-curl -O $repo_root/$fullname/$new_ver/$fullname-$new_ver-$zip
+curl -O $repo_root/bom/$new_ver/$fullname-$new_ver-$zip
svn add $fullname-$new_ver-$zip
if [ "Z${old_ver}Z" == "ZZ" ]; then
@@ -375,7 +375,7 @@ We are now in a position to actually generate the Antora website.
[source,bash,subs="attributes+"]
----
git checkout $ISISBRANCH
-pushd isis-parent
+pushd bom
mvn clean install -DskipTests -Dreleased
popd
mvn clean install -pl core/config
diff --git a/antora/components/comguide/modules/ROOT/pages/updating-the-website.adoc b/antora/components/comguide/modules/ROOT/pages/updating-the-website.adoc
index 4136791115..5a2c46824a 100644
--- a/antora/components/comguide/modules/ROOT/pages/updating-the-website.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/updating-the-website.adoc
@@ -26,7 +26,7 @@ This is most easily done by rebuilding all:
+
[source,bash,subs="attributes+"]
----
-pushd isis-parent
+pushd bom
mvn clean install -DskipTests -Dreleased
popd
----
diff --git a/scripts/ci/build-regressiontests.sh b/scripts/ci/build-regressiontests.sh
index 18a5a02110..3d89dac912 100644
--- a/scripts/ci/build-regressiontests.sh
+++ b/scripts/ci/build-regressiontests.sh
@@ -43,7 +43,7 @@ bash $SCRIPT_DIR/_print-environment.sh "build-smoketests"
# update version (but just for the modules we need to build)
#
if [ ! -z "$REVISION" ]; then
- cd $PROJECT_ROOT_PATH/isis-parent
+ cd $PROJECT_ROOT_PATH/bom
mvn versions:set -DnewVersion=$REVISION -Dmodule-regressiontests
cd $PROJECT_ROOT_PATH
fi
@@ -66,7 +66,7 @@ done
# finally, revert the version
#
if [ ! -z "$REVISION" ]; then
- cd $PROJECT_ROOT_PATH/isis-parent
+ cd $PROJECT_ROOT_PATH/bom
mvn versions:revert -Dmodule-regressiontests
cd $PROJECT_ROOT_PATH
fi
diff --git a/scripts/verify-isis-release.sh b/scripts/verify-isis-release.sh
index 7461e3e46b..08a59a3128 100755
--- a/scripts/verify-isis-release.sh
+++ b/scripts/verify-isis-release.sh
@@ -88,7 +88,7 @@ _build(){
echo 'Building'
# previously there were multiple directories, now just the one.
- pushd isis*/isis-parent
+ pushd isis*/bom
_execmustpass mvn clean install -Dskip.git -Preleased,-all
popd
}
@@ -140,7 +140,7 @@ if [[ -z "$NEXUSREPONUM" || -z "$VERSION" || -z "$RC" ]]; then
fi
cat <<EOF >/tmp/url.txt
-http://repository.apache.org/content/repositories/orgapacheisis-$NEXUSREPONUM/org/apache/isis/isis-parent/$VERSION/isis-parent-$VERSION-source-release.zip
+http://repository.apache.org/content/repositories/orgapacheisis-$NEXUSREPONUM/org/apache/isis/bom/$VERSION/isis-bom-$VERSION-source-release.zip
EOF
# The work starts here