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/30 08:52:45 UTC
[isis] branch master updated (50fa364 -> 72118c8)
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 50fa364 ISIS-2062: docs
new 518cbe2 ISIS-2094: reducing noise of build
new 7e4fe47 ISIS-2094: reducing noise of build
new a35bb94 ISIS-2094: reducing noise of build
new b082b55 ISIS-2094: reducing noise of build, ctd
new 44e2514 ISIS-2094: reducing noise of build, ctd
new 90c381d ISIS-2094: reducing noise of build, ctd
new aaac152 ISIS-2094: reducing noise of build, ctd
new 6b86e93 ISIS-2094: reducing noise of build, ctd
new aad0c98 ISIS-2094: reducing noise of build, ctd
new dcefb43 ISIS-2274: fixes unit tests
new 8e9b905 ISIS-2094: reducing noise of build, ctd
new 72118c8 ISIS-2274: fixes unit tests
The 12 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:
.../DomainObjectAnnotationFacetFactoryTest.java | 8 ++-
scripts/ci/build-core.sh | 65 +++++++++++++++++++---
2 files changed, 64 insertions(+), 9 deletions(-)
[isis] 02/12: ISIS-2094: reducing noise of build
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 7e4fe473b19606db4c277d827113244ace08f81c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 08:23:59 2020 +0000
ISIS-2094: reducing noise of build
---
scripts/ci/build-core.sh | 33 ++++++++++-----------------------
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/scripts/ci/build-core.sh b/scripts/ci/build-core.sh
index 08d73ec..63fcfe7 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -44,7 +44,7 @@ if [ ! -z "$REVISION" ]; then
| grep -v "Downloaded from central" \
| grep -v "Downloading from DataNucleus_2" \
| grep -v "Downloaded from DataNucleus_2" \
- | grep -v "^[INFO] $"
+ | grep -v "^\[INFO\] $"
cd $PROJECT_ROOT_PATH/starters
echo ""
@@ -63,13 +63,9 @@ fi
cd $PROJECT_ROOT_PATH/core-parent
echo ""
echo ""
-echo ""
-echo ""
echo ">>> mvn $MVN_STAGES $MVN_ADDITIONAL_OPTS"
echo ""
echo ""
-echo ""
-echo ""
mvn -s $SETTINGS_XML \
$BATCH_MODE \
-T1C \
@@ -85,45 +81,36 @@ mvn -s $SETTINGS_XML \
| grep -v "Uploaded from gcpappenginerepo" \
| grep -v "Downloading from gcpappenginerepo" \
| grep -v "Downloaded from gcpappenginerepo" \
- | grep -v "^[INFO] $" \
- | grep -v "^[INFO] --- maven-enforcer-plugin" \
- | grep -v "^[INFO] --- maven-site-plugin" \
- | grep -v "^[INFO] <<< maven-source-plugin:" \
- | grep -v "^[INFO] >>> maven-source-plugin" \
- | grep -v "^[INFO] Using alternate deployment repository gcpappenginerepo" \
- | grep -v "^[INFO] No site descriptor found: nothing to attach." \
- | grep -v "^[INFO] Skipping because packaging 'jar' is not pom." \
- | grep -v "^[INFO] Installing"
+ | grep -v "^\[INFO\] $" \
+ | grep -v "^\[INFO\] --- maven-enforcer-plugin" \
+ | grep -v "^\[INFO\] --- maven-site-plugin" \
+ | grep -v "^\[INFO\] <<< maven-source-plugin:" \
+ | grep -v "^\[INFO\] >>> maven-source-plugin" \
+ | grep -v "^\[INFO\] Using alternate deployment repository gcpappenginerepo" \
+ | grep -v "^\[INFO\] No site descriptor found: nothing to attach." \
+ | grep -v "^\[INFO\] Skipping because packaging 'jar' is not pom."
if [ ! -z "$REVISION" ]; then
cd $PROJECT_ROOT_PATH/core-parent
echo ""
echo ""
- echo ""
- echo ""
echo ">>> mvn versions:revert ..."
echo ""
echo ""
- echo ""
- echo ""
mvn versions:revert \
| grep -v "^Progress (1)" \
| grep -v "Downloading from central" \
| grep -v "Downloaded from central" \
| grep -v "Downloading from DataNucleus_2" \
| grep -v "Downloaded from DataNucleus_2" \
- | grep -v "^[INFO] $"
+ | grep -v "^\[INFO\] $"
cd $PROJECT_ROOT_PATH/starters
echo ""
echo ""
- echo ""
- echo ""
echo ">>> sed'ing to revert version in starters ..."
echo ""
echo ""
- echo ""
- echo ""
sed -i "s|<version>$REVISION</version>|<version>$CURR</version>|g" pom.xml
fi
[isis] 04/12: ISIS-2094: reducing noise of build, ctd
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 b082b55a75ab7ac829c1445a68e2328c71dd7039
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 08:33:23 2020 +0000
ISIS-2094: reducing noise of build, ctd
---
scripts/ci/build-core.sh | 52 ++++++++++++++++++++++++------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/scripts/ci/build-core.sh b/scripts/ci/build-core.sh
index 8e9ef41..144d896 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -35,11 +35,11 @@ if [ ! -z "$REVISION" ]; then
echo ""
mvn versions:set \
-DnewVersion=$REVISION \
- | grep -v "^Progress (1)" \
- | grep -v "Downloading from central" \
- | grep -v "Downloaded from central" \
- | grep -v "Downloading from DataNucleus_2" \
- | grep -v "Downloaded from DataNucleus_2"
+ | fgrep --line-buffered -v "^Progress (1)" \
+ | fgrep --line-buffered -v "Downloading from central" \
+ | fgrep --line-buffered -v "Downloaded from central" \
+ | fgrep --line-buffered -v "Downloading from DataNucleus_2" \
+ | fgrep --line-buffered -v "Downloaded from DataNucleus_2"
cd $PROJECT_ROOT_PATH/starters
echo ""
@@ -63,22 +63,22 @@ mvn -s $SETTINGS_XML \
$MVN_STAGES \
$MVN_ADDITIONAL_OPTS \
$* \
- | grep -v "^Progress (1)" \
- | grep -v "Downloading from central" \
- | grep -v "Downloaded from central" \
- | grep -v "Downloading from DataNucleus_2" \
- | grep -v "Downloaded from DataNucleus_2" \
- | grep -v "Uploading from gcpappenginerepo" \
- | grep -v "Uploaded from gcpappenginerepo" \
- | grep -v "Downloading from gcpappenginerepo" \
- | grep -v "Downloaded from gcpappenginerepo" \
- | grep -v "^\[INFO\] --- maven-enforcer-plugin" \
- | grep -v "^\[INFO\] --- maven-site-plugin" \
- | grep -v "^\[INFO\] <<< maven-source-plugin:" \
- | grep -v "^\[INFO\] >>> maven-source-plugin" \
- | grep -v "^\[INFO\] Using alternate deployment repository gcpappenginerepo" \
- | grep -v "^\[INFO\] No site descriptor found: nothing to attach." \
- | grep -v "^\[INFO\] Skipping because packaging 'jar' is not pom."
+ | fgrep --line-buffered -v "^Progress (1)" \
+ | fgrep --line-buffered -v "Downloading from central" \
+ | fgrep --line-buffered -v "Downloaded from central" \
+ | fgrep --line-buffered -v "Downloading from DataNucleus_2" \
+ | fgrep --line-buffered -v "Downloaded from DataNucleus_2" \
+ | fgrep --line-buffered -v "Uploading from gcpappenginerepo" \
+ | fgrep --line-buffered -v "Uploaded from gcpappenginerepo" \
+ | fgrep --line-buffered -v "Downloading from gcpappenginerepo" \
+ | fgrep --line-buffered -v "Downloaded from gcpappenginerepo" \
+ | fgrep --line-buffered -v "[INFO] --- maven-enforcer-plugin" \
+ | fgrep --line-buffered -v "[INFO] --- maven-site-plugin" \
+ | fgrep --line-buffered -v "[INFO] <<< maven-source-plugin:" \
+ | fgrep --line-buffered -v "[INFO] >>> maven-source-plugin" \
+ | fgrep --line-buffered -v "[INFO] Using alternate deployment repository gcpappenginerepo" \
+ | fgrep --line-buffered -v "[INFO] No site descriptor found: nothing to attach." \
+ | fgrep --line-buffered -v "[INFO] Skipping because packaging 'jar' is not pom."
if [ ! -z "$REVISION" ]; then
cd $PROJECT_ROOT_PATH/core-parent
@@ -88,11 +88,11 @@ if [ ! -z "$REVISION" ]; then
echo ""
echo ""
mvn versions:revert \
- | grep -v "^Progress (1)" \
- | grep -v "Downloading from central" \
- | grep -v "Downloaded from central" \
- | grep -v "Downloading from DataNucleus_2" \
- | grep -v "Downloaded from DataNucleus_2"
+ | fgrep --line-buffered -v "^Progress (1)" \
+ | fgrep --line-buffered -v "Downloading from central" \
+ | fgrep --line-buffered -v "Downloaded from central" \
+ | fgrep --line-buffered -v "Downloading from DataNucleus_2" \
+ | fgrep --line-buffered -v "Downloaded from DataNucleus_2"
cd $PROJECT_ROOT_PATH/starters
echo ""
[isis] 07/12: ISIS-2094: reducing noise of build, ctd
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 aaac152bdecc5922c9ca31f41c24c99dd28d4716
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 08:36:55 2020 +0000
ISIS-2094: reducing noise of build, ctd
---
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 2d86b51..411e472 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -72,7 +72,7 @@ mvn -s $SETTINGS_XML \
| fgrep --line-buffered -v "Uploaded from gcpappenginerepo" \
| fgrep --line-buffered -v "Downloading from gcpappenginerepo" \
| fgrep --line-buffered -v "Downloaded from gcpappenginerepo" \
- | fgrep --line-buffered -v "^[INFO]$" \
+ | grep --line-buffered -v "^\[INFO\]\s*$" \
| fgrep --line-buffered -v "[INFO] --- maven-enforcer-plugin" \
| fgrep --line-buffered -v "[INFO] --- maven-site-plugin" \
| fgrep --line-buffered -v "[INFO] <<< maven-source-plugin:" \
[isis] 05/12: ISIS-2094: reducing noise of build, ctd
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 44e25144578e776f1a4c37afa0a321d760e482c5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 08:34:27 2020 +0000
ISIS-2094: reducing noise of build, ctd
---
scripts/ci/build-core.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/ci/build-core.sh b/scripts/ci/build-core.sh
index 144d896..cb5e4e1 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -72,6 +72,7 @@ mvn -s $SETTINGS_XML \
| fgrep --line-buffered -v "Uploaded from gcpappenginerepo" \
| fgrep --line-buffered -v "Downloading from gcpappenginerepo" \
| fgrep --line-buffered -v "Downloaded from gcpappenginerepo" \
+ | fgrep --line-buffered -v "^[INFO] $" \
| fgrep --line-buffered -v "[INFO] --- maven-enforcer-plugin" \
| fgrep --line-buffered -v "[INFO] --- maven-site-plugin" \
| fgrep --line-buffered -v "[INFO] <<< maven-source-plugin:" \
[isis] 09/12: ISIS-2094: reducing noise of build, ctd
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 aad0c98807d00a2bff64334333a7679d0450adde
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 08:39:11 2020 +0000
ISIS-2094: reducing noise of build, ctd
---
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 2a6fd0b..33b2f85 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -72,11 +72,11 @@ mvn -s $SETTINGS_XML \
| fgrep --line-buffered -v "Uploaded from gcpappenginerepo" \
| fgrep --line-buffered -v "Downloading from gcpappenginerepo" \
| fgrep --line-buffered -v "Downloaded from gcpappenginerepo" \
- | grep --line-buffered -v "^\[INFO\][\s]*$" \
| fgrep --line-buffered -v "[INFO] --- maven-enforcer-plugin" \
| fgrep --line-buffered -v "[INFO] --- maven-site-plugin" \
| fgrep --line-buffered -v "[INFO] <<< maven-source-plugin:" \
| fgrep --line-buffered -v "[INFO] >>> maven-source-plugin" \
+ | fgrep --line-buffered -v "[INFO] Installing" \
| fgrep --line-buffered -v "[INFO] Using alternate deployment repository gcpappenginerepo" \
| fgrep --line-buffered -v "[INFO] No site descriptor found: nothing to attach." \
| fgrep --line-buffered -v "[INFO] Skipping because packaging 'jar' is not pom."
[isis] 10/12: ISIS-2274: fixes unit tests
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 dcefb438bbe509f7f6dddbd5503bf19ce80b820e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 08:44:06 2020 +0000
ISIS-2274: fixes unit tests
---
.../domainobject/DomainObjectAnnotationFacetFactoryTest.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 319b294..6753789 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -607,7 +607,9 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(ImmutableFacet.class);
- Assert.assertNull(facet);
+ Assert.assertNotNull(facet); // default is now non-editable
+ Assert.assertTrue(facet instanceof ImmutableFacetFromConfiguration);
+
expectNoMethodsRemoved();
}
@@ -623,7 +625,8 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndEditingSetToAsConfigured.class, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(ImmutableFacet.class);
- Assert.assertNull(facet);
+ Assert.assertNotNull(facet); // default is now non-editable
+ Assert.assertTrue(facet instanceof ImmutableFacetFromConfiguration);
expectNoMethodsRemoved();
}
[isis] 06/12: ISIS-2094: reducing noise of build, ctd
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 90c381d9f4785184763a7b3e44ccf3aa155fa1ac
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 08:35:08 2020 +0000
ISIS-2094: reducing noise of build, ctd
---
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 cb5e4e1..2d86b51 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -72,7 +72,7 @@ mvn -s $SETTINGS_XML \
| fgrep --line-buffered -v "Uploaded from gcpappenginerepo" \
| fgrep --line-buffered -v "Downloading from gcpappenginerepo" \
| fgrep --line-buffered -v "Downloaded from gcpappenginerepo" \
- | fgrep --line-buffered -v "^[INFO] $" \
+ | fgrep --line-buffered -v "^[INFO]$" \
| fgrep --line-buffered -v "[INFO] --- maven-enforcer-plugin" \
| fgrep --line-buffered -v "[INFO] --- maven-site-plugin" \
| fgrep --line-buffered -v "[INFO] <<< maven-source-plugin:" \
[isis] 11/12: ISIS-2094: reducing noise of build, ctd
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 8e9b9055ccbd5a281bd83a10a28a9cebd3468097
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 08:44:27 2020 +0000
ISIS-2094: reducing noise of build, ctd
---
scripts/ci/build-core.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/ci/build-core.sh b/scripts/ci/build-core.sh
index 33b2f85..2b49c88 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -77,6 +77,7 @@ mvn -s $SETTINGS_XML \
| fgrep --line-buffered -v "[INFO] <<< maven-source-plugin:" \
| fgrep --line-buffered -v "[INFO] >>> maven-source-plugin" \
| fgrep --line-buffered -v "[INFO] Installing" \
+ | fgrep --line-buffered -v "[INFO] Copying" \
| fgrep --line-buffered -v "[INFO] Using alternate deployment repository gcpappenginerepo" \
| fgrep --line-buffered -v "[INFO] No site descriptor found: nothing to attach." \
| fgrep --line-buffered -v "[INFO] Skipping because packaging 'jar' is not pom."
[isis] 01/12: ISIS-2094: reducing noise of build
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 518cbe2d1dd1f39c16be50a0595102bc768b9f3a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 08:20:16 2020 +0000
ISIS-2094: reducing noise of build
---
scripts/ci/build-core.sh | 87 ++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 80 insertions(+), 7 deletions(-)
diff --git a/scripts/ci/build-core.sh b/scripts/ci/build-core.sh
index 15bfaca..08d73ec 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -28,29 +28,102 @@ sh $SCRIPT_DIR/_print-environment.sh "build-core"
if [ ! -z "$REVISION" ]; then
cd $PROJECT_ROOT_PATH/core-parent
- echo "updating version in isis-parent ..."
- mvn versions:set -DnewVersion=$REVISION
+ echo ""
+ echo ""
+ echo ""
+ echo ""
+ echo ">>> mvn versions:set -DnewVersion=$REVISION ..."
+ echo ""
+ echo ""
+ echo ""
+ echo ""
+ mvn versions:set \
+ -DnewVersion=$REVISION \
+ | grep -v "^Progress (1)" \
+ | grep -v "Downloading from central" \
+ | grep -v "Downloaded from central" \
+ | grep -v "Downloading from DataNucleus_2" \
+ | grep -v "Downloaded from DataNucleus_2" \
+ | grep -v "^[INFO] $"
cd $PROJECT_ROOT_PATH/starters
- echo "updating version in isis-app-starter-parent ..."
+ echo ""
+ echo ""
+ echo ""
+ echo ""
+ echo ">>> sed'ing version in starters ..."
+ echo ""
+ echo ""
+ echo ""
+ echo ""
CURR=$(grep "<version>" pom.xml | head -1 | cut -d'>' -f2 | cut -d'<' -f1)
sed -i "s|<version>$CURR</version>|<version>$REVISION</version>|g" pom.xml
fi
cd $PROJECT_ROOT_PATH/core-parent
+echo ""
+echo ""
+echo ""
+echo ""
+echo ">>> mvn $MVN_STAGES $MVN_ADDITIONAL_OPTS"
+echo ""
+echo ""
+echo ""
+echo ""
mvn -s $SETTINGS_XML \
$BATCH_MODE \
-T1C \
$MVN_STAGES \
$MVN_ADDITIONAL_OPTS \
- $*
+ $* \
+ | grep -v "^Progress (1)" \
+ | grep -v "Downloading from central" \
+ | grep -v "Downloaded from central" \
+ | grep -v "Downloading from DataNucleus_2" \
+ | grep -v "Downloaded from DataNucleus_2" \
+ | grep -v "Uploading from gcpappenginerepo" \
+ | grep -v "Uploaded from gcpappenginerepo" \
+ | grep -v "Downloading from gcpappenginerepo" \
+ | grep -v "Downloaded from gcpappenginerepo" \
+ | grep -v "^[INFO] $" \
+ | grep -v "^[INFO] --- maven-enforcer-plugin" \
+ | grep -v "^[INFO] --- maven-site-plugin" \
+ | grep -v "^[INFO] <<< maven-source-plugin:" \
+ | grep -v "^[INFO] >>> maven-source-plugin" \
+ | grep -v "^[INFO] Using alternate deployment repository gcpappenginerepo" \
+ | grep -v "^[INFO] No site descriptor found: nothing to attach." \
+ | grep -v "^[INFO] Skipping because packaging 'jar' is not pom." \
+ | grep -v "^[INFO] Installing"
if [ ! -z "$REVISION" ]; then
cd $PROJECT_ROOT_PATH/core-parent
- echo "reverting version in isis-parent ..."
- mvn versions:revert
+ echo ""
+ echo ""
+ echo ""
+ echo ""
+ echo ">>> mvn versions:revert ..."
+ echo ""
+ echo ""
+ echo ""
+ echo ""
+ mvn versions:revert \
+ | grep -v "^Progress (1)" \
+ | grep -v "Downloading from central" \
+ | grep -v "Downloaded from central" \
+ | grep -v "Downloading from DataNucleus_2" \
+ | grep -v "Downloaded from DataNucleus_2" \
+ | grep -v "^[INFO] $"
+
cd $PROJECT_ROOT_PATH/starters
- echo "reverting version in isis-app-starter-parent ..."
+ echo ""
+ echo ""
+ echo ""
+ echo ""
+ echo ">>> sed'ing to revert version in starters ..."
+ echo ""
+ echo ""
+ echo ""
+ echo ""
sed -i "s|<version>$REVISION</version>|<version>$CURR</version>|g" pom.xml
fi
[isis] 03/12: ISIS-2094: reducing noise of build
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 a35bb9495eae551bb34af79b5cfb987b2548bdc1
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 08:25:47 2020 +0000
ISIS-2094: reducing noise of build
---
scripts/ci/build-core.sh | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/scripts/ci/build-core.sh b/scripts/ci/build-core.sh
index 63fcfe7..8e9ef41 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -30,32 +30,23 @@ if [ ! -z "$REVISION" ]; then
cd $PROJECT_ROOT_PATH/core-parent
echo ""
echo ""
- echo ""
- echo ""
echo ">>> mvn versions:set -DnewVersion=$REVISION ..."
echo ""
echo ""
- echo ""
- echo ""
mvn versions:set \
-DnewVersion=$REVISION \
| grep -v "^Progress (1)" \
| grep -v "Downloading from central" \
| grep -v "Downloaded from central" \
| grep -v "Downloading from DataNucleus_2" \
- | grep -v "Downloaded from DataNucleus_2" \
- | grep -v "^\[INFO\] $"
+ | grep -v "Downloaded from DataNucleus_2"
cd $PROJECT_ROOT_PATH/starters
echo ""
echo ""
- echo ""
- echo ""
echo ">>> sed'ing version in starters ..."
echo ""
echo ""
- echo ""
- echo ""
CURR=$(grep "<version>" pom.xml | head -1 | cut -d'>' -f2 | cut -d'<' -f1)
sed -i "s|<version>$CURR</version>|<version>$REVISION</version>|g" pom.xml
fi
@@ -81,7 +72,6 @@ mvn -s $SETTINGS_XML \
| grep -v "Uploaded from gcpappenginerepo" \
| grep -v "Downloading from gcpappenginerepo" \
| grep -v "Downloaded from gcpappenginerepo" \
- | grep -v "^\[INFO\] $" \
| grep -v "^\[INFO\] --- maven-enforcer-plugin" \
| grep -v "^\[INFO\] --- maven-site-plugin" \
| grep -v "^\[INFO\] <<< maven-source-plugin:" \
@@ -102,8 +92,7 @@ if [ ! -z "$REVISION" ]; then
| grep -v "Downloading from central" \
| grep -v "Downloaded from central" \
| grep -v "Downloading from DataNucleus_2" \
- | grep -v "Downloaded from DataNucleus_2" \
- | grep -v "^\[INFO\] $"
+ | grep -v "Downloaded from DataNucleus_2"
cd $PROJECT_ROOT_PATH/starters
echo ""
[isis] 08/12: ISIS-2094: reducing noise of build, ctd
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 6b86e933338826233a37168b72adf4b8b4f46a07
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 08:37:18 2020 +0000
ISIS-2094: reducing noise of build, ctd
---
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 411e472..2a6fd0b 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -72,7 +72,7 @@ mvn -s $SETTINGS_XML \
| fgrep --line-buffered -v "Uploaded from gcpappenginerepo" \
| fgrep --line-buffered -v "Downloading from gcpappenginerepo" \
| fgrep --line-buffered -v "Downloaded from gcpappenginerepo" \
- | grep --line-buffered -v "^\[INFO\]\s*$" \
+ | grep --line-buffered -v "^\[INFO\][\s]*$" \
| fgrep --line-buffered -v "[INFO] --- maven-enforcer-plugin" \
| fgrep --line-buffered -v "[INFO] --- maven-site-plugin" \
| fgrep --line-buffered -v "[INFO] <<< maven-source-plugin:" \
[isis] 12/12: ISIS-2274: fixes unit tests
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 72118c8200f682b9ed85503dade7c9c3109c1724
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 08:48:34 2020 +0000
ISIS-2274: fixes unit tests
---
.../domainobject/DomainObjectAnnotationFacetFactoryTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 6753789..fa1d127 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -50,6 +50,7 @@ import org.apache.isis.core.metamodel.facets.object.domainobject.auditing.Audita
import org.apache.isis.core.metamodel.facets.object.domainobject.autocomplete.AutoCompleteFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.choices.ChoicesFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.editing.ImmutableFacetForDomainObjectAnnotation;
+import org.apache.isis.core.metamodel.facets.object.domainobject.editing.ImmutableFacetForDomainObjectAnnotationAsConfigured;
import org.apache.isis.core.metamodel.facets.object.domainobject.editing.ImmutableFacetFromConfiguration;
import org.apache.isis.core.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetForDomainObjectAnnotation;
@@ -625,8 +626,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndEditingSetToAsConfigured.class, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(ImmutableFacet.class);
- Assert.assertNotNull(facet); // default is now non-editable
- Assert.assertTrue(facet instanceof ImmutableFacetFromConfiguration);
+ Assert.assertNull(facet);
expectNoMethodsRemoved();
}
@@ -651,7 +651,8 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndEditingSetToAsConfigured.class, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(ImmutableFacet.class);
- Assert.assertNull(facet);
+ Assert.assertNotNull(facet); // default is now non-editable
+ Assert.assertTrue(facet instanceof ImmutableFacetForDomainObjectAnnotationAsConfigured);
expectNoMethodsRemoved();
}