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 2019/11/21 07:36:59 UTC
[isis] branch master updated (d945871 -> ecd503e)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from d945871 ISIS-2181: fixes site, bumps deps, distMgmt for isis-parent
new f076a7b ISIS-2181: debugs core, since looks like core-parent/pom.xml version isn't updated by mvn versions:set ??
new 8baf764 ISIS-2181: just use 'antora' for sites; add some echo stmts
new ecd503e ISIS-2181: updates <name> for all core pom.xmls
The 3 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:
core-parent/pom.xml | 5 -----
core/applib/pom.xml | 2 +-
core/commons/pom.xml | 2 +-
core/config/pom.xml | 2 +-
core/detached-tests/pom.xml | 2 +-
core/plugins/codegen-bytebuddy/pom.xml | 2 +-
core/plugins/jaxrs-resteasy-4/pom.xml | 2 +-
core/plugins/jdo/common/pom.xml | 2 +-
core/plugins/jdo/datanucleus-5/pom.xml | 2 +-
core/runtime-extensions/pom.xml | 2 +-
core/runtime-services/pom.xml | 2 +-
core/runtime-web/pom.xml | 2 +-
core/runtime/pom.xml | 2 +-
core/schema/pom.xml | 2 +-
core/security/api/pom.xml | 2 +-
core/security/bypass/pom.xml | 2 +-
core/security/keycloak/pom.xml | 2 +-
core/security/shiro/pom.xml | 2 +-
core/testsupport/integtestsupport/pom.xml | 2 +-
core/testsupport/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects/applib/pom.xml | 2 +-
core/viewer-restfulobjects/rendering/pom.xml | 2 +-
core/viewer-restfulobjects/server/pom.xml | 2 +-
core/viewer-wicket/impl/pom.xml | 2 +-
core/viewer-wicket/model/pom.xml | 2 +-
core/viewer-wicket/ui/pom.xml | 2 +-
scripts/ci/build-core.sh | 2 +-
scripts/ci/build-site.sh | 23 ++++++++++++++++++++---
28 files changed, 46 insertions(+), 34 deletions(-)
[isis] 02/03: ISIS-2181: just use 'antora' for sites;
add some echo stmts
Posted by da...@apache.org.
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 8baf76469875ab77d9ad7383ab4a6bfd6d6cab1d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Nov 21 07:34:37 2019 +0000
ISIS-2181: just use 'antora' for sites; add some echo stmts
---
scripts/ci/build-site.sh | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/scripts/ci/build-site.sh b/scripts/ci/build-site.sh
index 295cbe4..ddd7b65 100644
--- a/scripts/ci/build-site.sh
+++ b/scripts/ci/build-site.sh
@@ -17,7 +17,13 @@ if [ -z "$REVISION" ]; then
export REVISION="SNAPSHOT"
fi
+
SITE_CONFIG=$1
+
+
+##
+## run groovy
+##
GROOVY_CMD=`command -v groovy`
bash $SCRIPT_DIR/print-environment.sh "build-site"
@@ -29,18 +35,23 @@ echo ""
# for now meant to run with nightly builds only
if [ -z "${GROOVY_CMD}" ]; then
- echo "no groovy: skipping automated site content script(s)"
+ echo "doc gen: no groovy, skipping"
else
if [ ! -f "$PROJECT_ROOT_PATH/core/config/target/classes/META-INF/spring-configuration-metadata.json" ]; then
- echo "no spring-configuration-metadata.json to parse: skipping"
+ echo "doc gen: no spring-configuration-metadata.json to parse: skipping"
else
# generate automated site content (adoc files)
+ echo "doc gen: generating config .adoc from Spring metadata ..."
${GROOVY_CMD} $SCRIPT_DIR/../generateConfigDocs.groovy \
-f $PROJECT_ROOT_PATH/core/config/target/classes/META-INF/spring-configuration-metadata.json \
-o $PROJECT_ROOT_PATH/core/config/src/main/doc/modules/config/examples/generated
fi
fi
+
+##
+## copy over examples
+##
echo "copying over examples ..."
for examples_sh in $(find $PROJECT_ROOT_PATH -name examples.sh -print)
do
@@ -48,8 +59,14 @@ do
sh $examples_sh
done
+
+##
## run antora
-$(npm bin)/antora --stacktrace $SITE_CONFIG
+##
+echo "running antora ..."
+#ANTORA_CMD=$(npm bin)/antora
+ANTORA_CMD=antora
+$ANTORA_CMD --stacktrace $SITE_CONFIG
# add a marker, that tells github not to use jekyll on the github pages folder
touch ${PROJECT_ROOT_PATH}/antora/target/site/.nojekyll
[isis] 01/03: ISIS-2181: debugs core,
since looks like core-parent/pom.xml version isn't updated by mvn
versions:set ??
Posted by da...@apache.org.
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 f076a7b61ded07d5b88554fc70befdfb90a8efee
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Nov 21 07:34:08 2019 +0000
ISIS-2181: debugs core, since looks like core-parent/pom.xml version isn't updated by mvn versions:set ??
---
scripts/ci/build-core.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/ci/build-core.sh b/scripts/ci/build-core.sh
index e2bb6d8..089d93b 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -27,11 +27,11 @@ if [ ! -z "$REVISION" ]; then
mvn versions:set -DnewVersion=$REVISION
fi
+cat pom.xml
mvn -s $SETTINGS_XML \
--batch-mode \
$MVN_STAGES \
- -Dskip.assemble-zip \
$MVN_ADDITIONAL_OPTS \
$*
[isis] 03/03: ISIS-2181: updates for all core pom.xmls
Posted by da...@apache.org.
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 ecd503e24b61a172cc9b063b7dde1972d453834a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Nov 21 07:34:56 2019 +0000
ISIS-2181: updates <name> for all core pom.xmls
common prefix to look prettier
---
core-parent/pom.xml | 5 -----
core/applib/pom.xml | 2 +-
core/commons/pom.xml | 2 +-
core/config/pom.xml | 2 +-
core/detached-tests/pom.xml | 2 +-
core/plugins/codegen-bytebuddy/pom.xml | 2 +-
core/plugins/jaxrs-resteasy-4/pom.xml | 2 +-
core/plugins/jdo/common/pom.xml | 2 +-
core/plugins/jdo/datanucleus-5/pom.xml | 2 +-
core/runtime-extensions/pom.xml | 2 +-
core/runtime-services/pom.xml | 2 +-
core/runtime-web/pom.xml | 2 +-
core/runtime/pom.xml | 2 +-
core/schema/pom.xml | 2 +-
core/security/api/pom.xml | 2 +-
core/security/bypass/pom.xml | 2 +-
core/security/keycloak/pom.xml | 2 +-
core/security/shiro/pom.xml | 2 +-
core/testsupport/integtestsupport/pom.xml | 2 +-
core/testsupport/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects/applib/pom.xml | 2 +-
core/viewer-restfulobjects/rendering/pom.xml | 2 +-
core/viewer-restfulobjects/server/pom.xml | 2 +-
core/viewer-wicket/impl/pom.xml | 2 +-
core/viewer-wicket/model/pom.xml | 2 +-
core/viewer-wicket/ui/pom.xml | 2 +-
26 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/core-parent/pom.xml b/core-parent/pom.xml
index 5111ea5..a955272 100644
--- a/core-parent/pom.xml
+++ b/core-parent/pom.xml
@@ -792,11 +792,6 @@ under the License.
<name>Apache Release Distribution Repository</name>
<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
</repository>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>${distMgmtSnapshotsName}</name>
- <url>${distMgmtSnapshotsUrl}</url>
- </snapshotRepository>
</distributionManagement>
</profile>
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 273805c..862a9fa 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -28,7 +28,7 @@
<artifactId>isis-applib</artifactId>
- <name>Apache Isis AppLib</name>
+ <name>Apache Isis Core - AppLib</name>
<description>
Isis application library, defining annotations and utilities for the
default (Java) programming model.
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index 7723461..09e8b62 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -22,7 +22,7 @@
<artifactId>isis-commons</artifactId>
- <name>Apache Isis Commons</name>
+ <name>Apache Isis Core - Commons</name>
<description>
Isis library, defining utilities required by both Applib and Unittestsupport.
</description>
diff --git a/core/config/pom.xml b/core/config/pom.xml
index 3f540ac..8eaca4c 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -28,7 +28,7 @@
<artifactId>isis-config</artifactId>
- <name>Apache Isis Configuration</name>
+ <name>Apache Isis Core - Configuration</name>
<description>
Isis configuration library for framework internal use.
</description>
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index fba81f0..10d55df 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-detached-tests</artifactId>
- <name>Apache Isis Detached Tests (tests only)</name>
+ <name>Apache Isis Core - Detached Tests (tests only)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.detached-tests</jar-plugin.automaticModuleName>
diff --git a/core/plugins/codegen-bytebuddy/pom.xml b/core/plugins/codegen-bytebuddy/pom.xml
index 0d5bded..81b7e7a 100644
--- a/core/plugins/codegen-bytebuddy/pom.xml
+++ b/core/plugins/codegen-bytebuddy/pom.xml
@@ -23,7 +23,7 @@
<artifactId>isis-plugins-codegen-bytebuddy</artifactId>
- <name>Apache Isis Plugin for Code Generation (ByteBuddy)</name>
+ <name>Apache Isis Core Plugin - Code Generation (ByteBuddy)</name>
<description>
Code generation plugin using ByteBuddy.
</description>
diff --git a/core/plugins/jaxrs-resteasy-4/pom.xml b/core/plugins/jaxrs-resteasy-4/pom.xml
index 8888f2f..c50f8b1 100644
--- a/core/plugins/jaxrs-resteasy-4/pom.xml
+++ b/core/plugins/jaxrs-resteasy-4/pom.xml
@@ -23,7 +23,7 @@
<artifactId>isis-plugins-jaxrs-resteasy-4</artifactId>
- <name>Apache Isis Plugin for JAX-RS (Resteasy v4)</name>
+ <name>Apache Isis Core Plugin - JAX-RS (Resteasy v4)</name>
<description>
JAX-RS plugin using jboss resteasy.
</description>
diff --git a/core/plugins/jdo/common/pom.xml b/core/plugins/jdo/common/pom.xml
index 46514a3..46798c9 100644
--- a/core/plugins/jdo/common/pom.xml
+++ b/core/plugins/jdo/common/pom.xml
@@ -22,7 +22,7 @@
<artifactId>isis-plugins-jdo-common</artifactId>
- <name>Apache Isis Plugin for JDO (Common)</name>
+ <name>Apache Isis Core Plugin - JDO (Common)</name>
<description>
Common base for JDO plugins.
</description>
diff --git a/core/plugins/jdo/datanucleus-5/pom.xml b/core/plugins/jdo/datanucleus-5/pom.xml
index 8aa501e..31b7a6f 100644
--- a/core/plugins/jdo/datanucleus-5/pom.xml
+++ b/core/plugins/jdo/datanucleus-5/pom.xml
@@ -22,7 +22,7 @@
<artifactId>isis-plugins-jdo-datanucleus-5</artifactId>
- <name>Apache Isis Plugin for JDO (Datanucleus 5)</name>
+ <name>Apache Isis Core Plugin - JDO (Datanucleus 5)</name>
<description>
JDO plugin using datanucleus.
</description>
diff --git a/core/runtime-extensions/pom.xml b/core/runtime-extensions/pom.xml
index cdc798d..31d0f91 100644
--- a/core/runtime-extensions/pom.xml
+++ b/core/runtime-extensions/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>isis-runtime-extensions</artifactId>
- <name>Apache Isis Runtime Extensions</name>
+ <name>Apache Isis Core - Runtime Extensions</name>
<description>Introduced to keep the 'runtime' package concise. Viewers don't have dependencies on this module.</description>
<properties>
diff --git a/core/runtime-services/pom.xml b/core/runtime-services/pom.xml
index 9ca41ce..cf15f24 100644
--- a/core/runtime-services/pom.xml
+++ b/core/runtime-services/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>isis-runtime-services</artifactId>
- <name>Apache Isis Runtime Services</name>
+ <name>Apache Isis Core - Runtime Services</name>
<description>Introduced to keep the 'runtime' package concise. Viewers don't have dependencies on this module.</description>
<properties>
diff --git a/core/runtime-web/pom.xml b/core/runtime-web/pom.xml
index 251f80b..2fc2a5e 100644
--- a/core/runtime-web/pom.xml
+++ b/core/runtime-web/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>isis-runtime-web</artifactId>
- <name>Apache Isis Runtime Web</name>
+ <name>Apache Isis Core - Runtime Web</name>
<description>Introduced to keep the 'runtime' package concise.
Bundles all the web specific classes a srequired by viewers.</description>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 2757a9e..6b52122 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>isis-runtime</artifactId>
- <name>Apache Isis Runtime</name>
+ <name>Apache Isis Core - Runtime</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.runtime</jar-plugin.automaticModuleName>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 97bd0b7..c984b79 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -23,7 +23,7 @@
<artifactId>isis-schema</artifactId>
<packaging>jar</packaging>
- <name>Apache Isis Schemas</name>
+ <name>Apache Isis Core - Schemas</name>
<description>
Apache Isis schemas, for conversion into canonical DTOs (for use in integration scenarios).
</description>
diff --git a/core/security/api/pom.xml b/core/security/api/pom.xml
index 71e306d..1bc7cea 100644
--- a/core/security/api/pom.xml
+++ b/core/security/api/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>isis-security</artifactId>
- <name>Apache Isis Security (API)</name>
+ <name>Apache Isis Core - Security (API)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.security</jar-plugin.automaticModuleName>
diff --git a/core/security/bypass/pom.xml b/core/security/bypass/pom.xml
index e1ccd64..0efa360 100644
--- a/core/security/bypass/pom.xml
+++ b/core/security/bypass/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>isis-security-bypass</artifactId>
- <name>Apache Isis Security - Bypass Implementation</name>
+ <name>Apache Isis Core - Security (Bypass Implementation)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.security.bypass</jar-plugin.automaticModuleName>
diff --git a/core/security/keycloak/pom.xml b/core/security/keycloak/pom.xml
index 6086d55..fc44d56 100644
--- a/core/security/keycloak/pom.xml
+++ b/core/security/keycloak/pom.xml
@@ -29,7 +29,7 @@
<artifactId>isis-security-keycloak</artifactId>
- <name>Apache Isis Core - Security (Keycloak)</name>
+ <name>Apache Isis Core - Security (Keycloak Implementation)</name>
<description>
Authentication and Authorization using Keycloak
</description>
diff --git a/core/security/shiro/pom.xml b/core/security/shiro/pom.xml
index 13ccbe7..ebba8fa 100644
--- a/core/security/shiro/pom.xml
+++ b/core/security/shiro/pom.xml
@@ -29,7 +29,7 @@
<artifactId>isis-security-shiro</artifactId>
- <name>Apache Isis Core - Security (Shiro)</name>
+ <name>Apache Isis Core - Security (Shiro Implementation)</name>
<description>
Authentication and Authorization using Apache Shiro.
</description>
diff --git a/core/testsupport/integtestsupport/pom.xml b/core/testsupport/integtestsupport/pom.xml
index 4368f91..bf2c572 100644
--- a/core/testsupport/integtestsupport/pom.xml
+++ b/core/testsupport/integtestsupport/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>isis-integtestsupport</artifactId>
- <name>Apache Isis Integration Testing Support</name>
+ <name>Apache Isis Core - Integration Testing Support</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.integtestsupport</jar-plugin.automaticModuleName>
diff --git a/core/testsupport/unittestsupport/pom.xml b/core/testsupport/unittestsupport/pom.xml
index e361635..a9563fe 100644
--- a/core/testsupport/unittestsupport/pom.xml
+++ b/core/testsupport/unittestsupport/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>isis-unittestsupport</artifactId>
- <name>Apache Isis Unit Test Support</name>
+ <name>Apache Isis Core - Unit Test Support</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.unittestsupport</jar-plugin.automaticModuleName>
diff --git a/core/viewer-restfulobjects/applib/pom.xml b/core/viewer-restfulobjects/applib/pom.xml
index b642a67..d9f1b9a 100644
--- a/core/viewer-restfulobjects/applib/pom.xml
+++ b/core/viewer-restfulobjects/applib/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
- <name>Apache Isis RestfulObjects Viewer AppLib</name>
+ <name>Apache Isis Core - RO Viewer (AppLib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.viewer.restfulobjects.applib</jar-plugin.automaticModuleName>
diff --git a/core/viewer-restfulobjects/rendering/pom.xml b/core/viewer-restfulobjects/rendering/pom.xml
index 7c0f1bb..0f647a2 100644
--- a/core/viewer-restfulobjects/rendering/pom.xml
+++ b/core/viewer-restfulobjects/rendering/pom.xml
@@ -29,7 +29,7 @@
<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
- <name>Apache Isis RestfulObjects Viewer Rendering</name>
+ <name>Apache Isis Core - RO Viewer (Rendering)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.viewer.restfulobjects.rendering</jar-plugin.automaticModuleName>
diff --git a/core/viewer-restfulobjects/server/pom.xml b/core/viewer-restfulobjects/server/pom.xml
index ef37d18..c9e3502 100644
--- a/core/viewer-restfulobjects/server/pom.xml
+++ b/core/viewer-restfulobjects/server/pom.xml
@@ -29,7 +29,7 @@
<artifactId>isis-viewer-restfulobjects-server</artifactId>
- <name>Apache Isis RestfulObjects Viewer Server</name>
+ <name>Apache Isis Core - RO Viewer (Server)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.viewer.restfulobjects.server</jar-plugin.automaticModuleName>
diff --git a/core/viewer-wicket/impl/pom.xml b/core/viewer-wicket/impl/pom.xml
index 568d894..e6cac0e 100644
--- a/core/viewer-wicket/impl/pom.xml
+++ b/core/viewer-wicket/impl/pom.xml
@@ -28,7 +28,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <name>Apache Isis Wicket Viewer Implementation</name>
+ <name>Apache Isis Core - Wicket Viewer (Implementation)</name>
<artifactId>isis-viewer-wicket-impl</artifactId>
diff --git a/core/viewer-wicket/model/pom.xml b/core/viewer-wicket/model/pom.xml
index 7c1bff2..110d624 100644
--- a/core/viewer-wicket/model/pom.xml
+++ b/core/viewer-wicket/model/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>isis-viewer-wicket-model</artifactId>
- <name>Apache Isis Wicket Viewer Model</name>
+ <name>Apache Isis Core - Wicket Viewer (Model)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.viewer.wicket.model</jar-plugin.automaticModuleName>
diff --git a/core/viewer-wicket/ui/pom.xml b/core/viewer-wicket/ui/pom.xml
index 378c9fb..3ad7a23 100644
--- a/core/viewer-wicket/ui/pom.xml
+++ b/core/viewer-wicket/ui/pom.xml
@@ -30,7 +30,7 @@
</parent>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <name>Apache Isis Wicket Viewer UI Components</name>
+ <name>Apache Isis Core - Wicket Viewer (UI Components)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.viewer.wicket.ui</jar-plugin.automaticModuleName>