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 2022/08/21 17:44:27 UTC
[isis] branch release-2.0.0-M8-RC1 updated (d6bb349b3a -> 7640035d86)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch release-2.0.0-M8-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
from d6bb349b3a ISIS-2965: resetting version
new 4cf91f3abd ISIS-2965: updates release procedures
new 6690ef808c ISIS-2965: updates release procedure
new 735cc044a4 Merge branch 'master' into release-2.0.0-M8-RC1
new af47ac0962 ISIS-2965: updates release procedure
new 3db2ffdbd0 ISIS-2965: updates release procedure
new e3def2916d ISIS-2965: updates release procedure
new 7640035d86 ISIS-2965: updates to refguide/index from previewing website.
The 7 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/ROOT/pages/cutting-a-release.adoc | 57 ++++++++--------------
.../wkt/viewer/IsisModuleExtFullCalendarUi.adoc | 12 -----
.../viewer/IsisModuleExtFullCalendarWicketUi.adoc} | 8 ++-
.../ui/IsisModuleExtExcelDownloadUi.adoc | 12 -----
.../ui/IsisModuleExtExcelDownloadWicketUi.adoc} | 8 ++-
core/adoc/modules/_overview/pages/about.adoc | 14 +++---
6 files changed, 34 insertions(+), 77 deletions(-)
delete mode 100644 antora/components/refguide-index/modules/extensions/pages/index/fullcalendar/wkt/viewer/IsisModuleExtFullCalendarUi.adoc
copy antora/components/refguide-index/modules/{applib/pages/index/graph/SimpleEdge.adoc => extensions/pages/index/fullcalendar/wkt/viewer/IsisModuleExtFullCalendarWicketUi.adoc} (87%)
delete mode 100644 antora/components/refguide-index/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc
copy antora/components/refguide-index/modules/{applib/pages/index/graph/SimpleEdge.adoc => extensions/pages/index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadWicketUi.adoc} (86%)
[isis] 04/07: ISIS-2965: updates release procedure
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit af47ac09624443c803aea09d2bdb8549c4bab72a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 21 18:17:47 2022 +0100
ISIS-2965: updates release procedure
---
antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 2df480fbac..7f0ac28535 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -740,7 +740,7 @@ You'll also need to rebuild all and then regenerate config files and tooling:
----
git checkout $ISISBRANCH
pushd bom
-mvn clean install -DskipTests -Dreleased
+mvn clean install -DskipTests -Dgithub
popd
mvn clean install -pl core/config
mvn -D module-tooling -D skip.essential install -DskipTests
[isis] 06/07: ISIS-2965: updates release procedure
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e3def2916db0b188b689cca84f3482833c2fdab3
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 21 18:25:06 2022 +0100
ISIS-2965: updates release procedure
---
antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 03ed9da43f..f0e4e75aa4 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -743,7 +743,7 @@ pushd bom
mvn clean install -T1C -o -DskipTests -Dgithub
popd
mvn clean install -pl core/config
-mvn -D module-tooling -D skip.essential install -DskipTests
+mvn install -Dmodule-tooling -Dskip.essential -DskipTests
----
====
[isis] 03/07: Merge branch 'master' into release-2.0.0-M8-RC1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 735cc044a49d289a45829240c50d9b7c9e2697cb
Merge: d6bb349b3a 6690ef808c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 21 18:16:50 2022 +0100
Merge branch 'master' into release-2.0.0-M8-RC1
.../modules/ROOT/pages/cutting-a-release.adoc | 53 ++++++++--------------
1 file changed, 19 insertions(+), 34 deletions(-)
[isis] 02/07: ISIS-2965: updates release procedure
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6690ef808cfc3a566d84935d93ee54de3ef66f8a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 21 18:16:01 2022 +0100
ISIS-2965: updates release procedure
---
.../modules/ROOT/pages/cutting-a-release.adoc | 37 ++++++++--------------
1 file changed, 13 insertions(+), 24 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 f20730ccee..2df480fbac 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -358,30 +358,24 @@ git clean -dfx ..
Since the `<version>` has already been updated, we just use `mvn deploy` to upload the artifacts.
We activate the (inherited) `apache-release` profile to bring in the `gpg` plugin for code signing.
+[WARNING]
+====
+make sure that the version of `gpg` on the `$PATH` is correct.
+
+I hit issues running on Windows under git-bash, as I was picking up git's version of gpg in `/usr/bin/gpg`.
+I sorted the issue eventually by running under Powershell, to pick up my gpg4Win.
+====
+
The build creates a zip of the directory, so before executing the release we remove any other files.
Still in the `bom` directory, we deploy (upload the artifacts) using:
[source,bash,subs="attributes+"]
----
-mvn deploy \
- -Dapache-release \
- -Dgit \
- -Dmaven.javadoc.skip=true #<.>
+mvn deploy -Dapache-release -Dgit
----
-<.> generation of Javadoc is broken as of 2.0.0-M6; see note below.
-
-When prompted, enter your GPG passphrase.
-(Or, it might be sufficient to add just `-Dgpg.passphrase="..."`)
-
-[WARNING]
-.javadoc generation
-====
-As of 2.0.0-M6 javadoc generation is broken, due to link:https://issues.apache.org/jira/browse/MJAVADOC-586[MJAVADOC-586].
-Fixing the issue requires performing the build using a more recent version of the JDK than JDK11.
-However, this in turn requires module paths to be properly fixed; see link:https://issues.apache.org/jira/browse/ISIS-2841[ISIS-2841] for some ideas.
-====
+When prompted, enter your GPG passphrase (unless configured in `~/mvn/settings.xml` as the `gpg.passphrase` property)
@@ -400,7 +394,7 @@ git tag $ISISART-$ISISREL-$ISISRC
The `mvn deploy` commands will have uploaded all of the release artifacts into a newly created staging repository on the ASF Nexus repository server.
-Log onto http://repository.apache.org[repository.apache.org] (using your ASF LDAP account):
+Log onto https://repository.apache.org[repository.apache.org] (using your ASF LDAP account):
image::release-process/nexus-staging-0.png[width="600px"]
@@ -448,17 +442,12 @@ See xref:comguide:ROOT:key-generation.adoc[Key Generation] for more details.
At the <<bump-code-to-isisrel,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]
-====
-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 `bom` directory):
+Therefore, still in the `bom` directory:
[source,bash,subs="attributes+"]
----
mvn versions:set -DnewVersion=2.0.0-SNAPSHOT
-mvn install -DskipTests -o -Dreleased
+mvn install -DskipTests -o -T1C -Dgithub
pushd ../starters
mvn versions:set -DnewVersion=2.0.0-SNAPSHOT
[isis] 01/07: ISIS-2965: updates release procedures
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4cf91f3abdf5598cd699592d65df6d9bccc94f22
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 21 14:15:19 2022 +0100
ISIS-2965: updates release procedures
---
.../comguide/modules/ROOT/pages/cutting-a-release.adoc | 16 ++++++----------
1 file changed, 6 insertions(+), 10 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 2265bb3ace..f20730ccee 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -313,15 +313,10 @@ mvn versions:set -DnewVersion=$ISISREL
+
[source,bash,subs="attributes+"]
----
-mvn install -o -DskipTests -Dreleased
+mvn install -o -DskipTests -T1C -Dgithub
----
+
-[NOTE]
-====
-The `released` system property is set to only sanity check the modules actually to be released (ignores the incubator modules).
-
-Partly that's because there's no need to check the incubator modules, it's also because the incubator modules might require more recent versions of Java than that formally supported by the framework (Java 11 currently).
-====
+The `-Dgithub` property activates the "github" profile that references all modules to be released.
* next we also update the starters (as used by applications built using the framework):
+
@@ -337,7 +332,6 @@ popd
+
[source,bash,subs="attributes+"]
----
-
git add ..
git commit -m "$ISISJIRA: bumps version to $ISISREL"
----
@@ -347,12 +341,14 @@ git commit -m "$ISISJIRA: bumps version to $ISISREL"
=== Sanity check
Perform one last sanity check on the codebase.
-Delete all Isis artifacts from your local Maven repo, then build using the `-o` offline flag:
+Delete all Isis artifacts from your local Maven repo, then build using the `-o` offline flag.
+
+Still in the `bom` directory:
[source,bash,subs="attributes+"]
----
rm -rf ~/.m2/repository/org/apache/isis
-mvn clean install -o -Dreleased
+mvn clean install -o -T1C -Dgithub
git clean -dfx ..
----
[isis] 07/07: ISIS-2965: updates to refguide/index from previewing website.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7640035d86a4379e11cc2b74959effd879105006
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 21 18:32:34 2022 +0100
ISIS-2965: updates to refguide/index from previewing website.
---
...endarUi.adoc => IsisModuleExtFullCalendarWicketUi.adoc} | 6 +++---
...loadUi.adoc => IsisModuleExtExcelDownloadWicketUi.adoc} | 6 +++---
core/adoc/modules/_overview/pages/about.adoc | 14 +++++++-------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/fullcalendar/wkt/viewer/IsisModuleExtFullCalendarUi.adoc b/antora/components/refguide-index/modules/extensions/pages/index/fullcalendar/wkt/viewer/IsisModuleExtFullCalendarWicketUi.adoc
similarity index 87%
rename from antora/components/refguide-index/modules/extensions/pages/index/fullcalendar/wkt/viewer/IsisModuleExtFullCalendarUi.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/fullcalendar/wkt/viewer/IsisModuleExtFullCalendarWicketUi.adoc
index 7fca913da5..6ee06b4b7f 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/fullcalendar/wkt/viewer/IsisModuleExtFullCalendarUi.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/fullcalendar/wkt/viewer/IsisModuleExtFullCalendarWicketUi.adoc
@@ -1,12 +1,12 @@
-= IsisModuleExtFullCalendarUi
+= IsisModuleExtFullCalendarWicketUi
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
== API
[source,java]
-.IsisModuleExtFullCalendarUi.java
+.IsisModuleExtFullCalendarWicketUi.java
----
-class IsisModuleExtFullCalendarUi {
+class IsisModuleExtFullCalendarWicketUi {
}
----
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc b/antora/components/refguide-index/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadWicketUi.adoc
similarity index 86%
rename from antora/components/refguide-index/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadWicketUi.adoc
index d06cec6094..d0b1abbd34 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadWicketUi.adoc
@@ -1,12 +1,12 @@
-= IsisModuleExtExcelDownloadUi
+= IsisModuleExtExcelDownloadWicketUi
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
== API
[source,java]
-.IsisModuleExtExcelDownloadUi.java
+.IsisModuleExtExcelDownloadWicketUi.java
----
-class IsisModuleExtExcelDownloadUi {
+class IsisModuleExtExcelDownloadWicketUi {
}
----
diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc
index 2a65ebb05d..65b9694659 100644
--- a/core/adoc/modules/_overview/pages/about.adoc
+++ b/core/adoc/modules/_overview/pages/about.adoc
@@ -4414,7 +4414,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
.Document Index Entries
****
-xref:refguide:extensions:index/fullcalendar/wkt/viewer/IsisModuleExtFullCalendarUi.adoc[IsisModuleExtFullCalendarUi]
+xref:refguide:extensions:index/fullcalendar/wkt/viewer/IsisModuleExtFullCalendarWicketUi.adoc[IsisModuleExtFullCalendarWicketUi]
****
|Apache Isis Ext - pdf.js - Parent
@@ -5017,7 +5017,7 @@ package "Applib: Excel\n[Software System]" {
Group: org.apache.isis.extensions
Artifact: isis-extensions-excel
Type: pom
-Directory: /extensions/applib/excel
+Directory: /extensions/core/excel
----
|A domain service for Apache Isis', allowing collections
of (view model) objects to be exported/imported to/from an
@@ -5029,7 +5029,7 @@ Excel spreadsheet. Also support for excel-based fixtures.
Group: org.apache.isis.extensions
Artifact: isis-extensions-excel-applib
Type: jar
-Directory: /extensions/applib/excel/applib
+Directory: /extensions/core/excel/applib
----
|.Components
****
@@ -5057,7 +5057,7 @@ xref:refguide:extensions:index/excel/applib/AggregationType.adoc[AggregationType
Group: org.apache.isis.extensions
Artifact: isis-extensions-excel-fixtures
Type: jar
-Directory: /extensions/applib/excel/fixture
+Directory: /extensions/core/excel/fixture
----
|.Dependencies
****
@@ -5075,7 +5075,7 @@ org.projectlombok:lombok:jar:<managed> +
Group: org.apache.isis.extensions
Artifact: isis-extensions-excel-integtests
Type: jar
-Directory: /extensions/applib/excel/integtests
+Directory: /extensions/core/excel/integtests
----
|.Dependencies
****
@@ -5093,7 +5093,7 @@ org.hsqldb:hsqldb:jar:<managed> +
Group: org.apache.isis.extensions
Artifact: isis-extensions-excel-testing
Type: jar
-Directory: /extensions/applib/excel/testing
+Directory: /extensions/core/excel/testing
----
|.Dependencies
****
@@ -5140,7 +5140,7 @@ org.apache.poi:poi-ooxml-lite:jar:<managed> +
.Document Index Entries
****
-xref:refguide:extensions:index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc[IsisModuleExtExcelDownloadUi], xref:refguide:extensions:index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc[CollectionContentsAsExcelFactory]
+xref:refguide:extensions:index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadWicketUi.adoc[IsisModuleExtExcelDownloadWicketUi], xref:refguide:extensions:index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc[CollectionContentsAsExcelFactory]
****
|===
[isis] 05/07: ISIS-2965: updates release procedure
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3db2ffdbd0b20b82eed720bb0a337c5a4fccc9a3
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 21 18:18:49 2022 +0100
ISIS-2965: updates release procedure
---
antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 7f0ac28535..03ed9da43f 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -740,7 +740,7 @@ You'll also need to rebuild all and then regenerate config files and tooling:
----
git checkout $ISISBRANCH
pushd bom
-mvn clean install -DskipTests -Dgithub
+mvn clean install -T1C -o -DskipTests -Dgithub
popd
mvn clean install -pl core/config
mvn -D module-tooling -D skip.essential install -DskipTests