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/11 10:02:51 UTC
[isis] branch master updated: Revert "ISIS-2445: purge 'released' profile"
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 e635e94d3a Revert "ISIS-2445: purge 'released' profile"
e635e94d3a is described below
commit e635e94d3aaad33e42a5b2d7757cd5d71aa78a17
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Apr 11 12:01:46 2022 +0200
Revert "ISIS-2445: purge 'released' profile"
This reverts commit 0706a3a6e0ccc000a8b851ce622f7e6ba18fa992.
---
.github/workflows/ci-build-artifacts-push-maven.yml | 7 +++----
.../comguide/modules/ROOT/pages/cutting-a-release.adoc | 10 +++++-----
.../modules/ROOT/pages/post-release-successful.adoc | 2 +-
.../modules/ROOT/pages/updating-the-website.adoc | 2 +-
isis-parent/pom.xml | 18 ++++++++++++++++++
5 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/ci-build-artifacts-push-maven.yml b/.github/workflows/ci-build-artifacts-push-maven.yml
index 04e8de6ac4..474a0e1548 100644
--- a/.github/workflows/ci-build-artifacts-push-maven.yml
+++ b/.github/workflows/ci-build-artifacts-push-maven.yml
@@ -77,18 +77,17 @@ jobs:
- name: Build Artifacts (Github March 2022)
run: 'bash scripts/ci/build-artifacts.sh'
env:
- # -Dmodule-all ... build all released modules
+ # -Dreleased ... build only the released modules
# -Denforcer.failFast=true ... fail fast on convergence issues (enforcer plugin)
# -Djacoco.skip=true ... no need for the CI build to add test coverage reports
# -T 1C ... 1 build thread per core
MVN_ADDITIONAL_OPTS: >-
-f isis-parent/pom.xml
- -Dmodule-all
+ -Dreleased
-Dgithub
-Denforcer.failFast=true
-Djacoco.skip=true
- -DinstallAtEnd=true
- -DdeployAtEnd=true
+ -DinstallAtEnd=true -DdeployAtEnd=true
GITHUB_TOKEN: ${{ github.token }}
MVN_STAGES: deploy
SOURCE_MODE: attach
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 035da5b08e..23de7d7ac6 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -73,7 +73,7 @@ To run the RAT tool, use:
mvn clean
pushd isis-parent
-mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=1000 -Dmodule-all
+mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=1000 -Dreleased
popd
for a in `/bin/find . -name rat.txt -print`; do grep '!???' $a; done > /tmp/rat-qn.txt
@@ -291,7 +291,7 @@ mvn versions:set -DnewVersion=$ISISREL
+
[source,bash,subs="attributes+"]
----
-mvn install -o -DskipTests -Dmodule-all
+mvn install -o -DskipTests -Dreleased
----
+
[NOTE]
@@ -330,7 +330,7 @@ Delete all Isis artifacts from your local Maven repo, then build using the `-o`
[source,bash,subs="attributes+"]
----
rm -rf ~/.m2/repository/org/apache/isis
-mvn clean install -o -Dmodule-all
+mvn clean install -o -Dreleased
git clean -dfx ..
----
@@ -440,7 +440,7 @@ Therefore (still in the `isis-parent` directory):
[source,bash,subs="attributes+"]
----
mvn versions:set -DnewVersion=2.0.0-SNAPSHOT
-mvn install -DskipTests -o -Dmodule-all
+mvn install -DskipTests -o -Dreleased
pushd ../starters
mvn versions:set -DnewVersion=2.0.0-SNAPSHOT
@@ -733,7 +733,7 @@ You'll also need to rebuild all and then regenerate config files and tooling:
----
git checkout $ISISBRANCH
pushd isis-parent
-mvn clean install -DskipTests -Dmodule-all
+mvn clean install -DskipTests -Dreleased
popd
mvn clean install -pl core/config
mvn -D module-tooling -D skip.essential install -DskipTests
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 6cd7ae76c1..502f0e4759 100644
--- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
@@ -376,7 +376,7 @@ We are now in a position to actually generate the Antora website.
----
git checkout $ISISBRANCH
pushd isis-parent
-mvn clean install -DskipTests -Dmodule-all
+mvn clean install -DskipTests -Dreleased
popd
mvn clean install -pl core/config
mvn -D module-tooling -D skip.essential install -DskipTests
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 69e5ae6fd3..4136791115 100644
--- a/antora/components/comguide/modules/ROOT/pages/updating-the-website.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/updating-the-website.adoc
@@ -27,7 +27,7 @@ This is most easily done by rebuilding all:
[source,bash,subs="attributes+"]
----
pushd isis-parent
-mvn clean install -DskipTests -Dmodule-all
+mvn clean install -DskipTests -Dreleased
popd
----
+
diff --git a/isis-parent/pom.xml b/isis-parent/pom.xml
index 41821f2403..a35b24c261 100644
--- a/isis-parent/pom.xml
+++ b/isis-parent/pom.xml
@@ -1050,6 +1050,24 @@ under the License.
</profile>
<!-- APACHE ISIS customisation 15/15: start -->
+ <profile>
+ <id>released</id>
+ <activation>
+ <property>
+ <name>released</name>
+ </property>
+ </activation>
+ <modules>
+ <module>../core</module>
+ <module>../extensions</module>
+ <module>../mappings</module>
+ <module>../mavendeps</module>
+ <module>../starters</module>
+ <module>../subdomains</module>
+ <module>../testing</module>
+ <module>../valuetypes</module>
+ </modules>
+ </profile>
<profile>
<id>sources</id>