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 2020/05/20 05:07:48 UTC
[isis] branch master updated: ISIS-2341: try fixing jib build
(nightly) (2)
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 4973380 ISIS-2341: try fixing jib build (nightly) (2)
4973380 is described below
commit 497338097cc2517662383d065dabea1f168ad8d2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 20 07:07:36 2020 +0200
ISIS-2341: try fixing jib build (nightly) (2)
---
core-parent/pom.xml | 4 ++--
examples/demo/vaadin/pom.xml | 2 +-
examples/demo/wicket/pom.xml | 2 +-
scripts/ci/build-demo-app.sh | 41 ++++++++++++++++++++++++-----------------
4 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/core-parent/pom.xml b/core-parent/pom.xml
index c1f44be..93a23ef 100644
--- a/core-parent/pom.xml
+++ b/core-parent/pom.xml
@@ -952,8 +952,8 @@ under the License.
</activation>
<modules>
<module>../examples/demo</module>
- <module>../examples/demo-wicket</module>
- <module>../examples/demo-vaadin</module>
+ <module>../examples/demo/wicket</module>
+ <module>../examples/demo/vaadin</module>
</modules>
</profile>
diff --git a/examples/demo/vaadin/pom.xml b/examples/demo/vaadin/pom.xml
index ea54f4b..c4bc194 100644
--- a/examples/demo/vaadin/pom.xml
+++ b/examples/demo/vaadin/pom.xml
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.isis.examples.apps</groupId>
<artifactId>demo</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>jar</type>
</dependency>
diff --git a/examples/demo/wicket/pom.xml b/examples/demo/wicket/pom.xml
index 5ddf65d..33955ae 100644
--- a/examples/demo/wicket/pom.xml
+++ b/examples/demo/wicket/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.examples.apps</groupId>
<artifactId>demo</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>jar</type>
</dependency>
diff --git a/scripts/ci/build-demo-app.sh b/scripts/ci/build-demo-app.sh
index 93c95a9..9c344d7 100644
--- a/scripts/ci/build-demo-app.sh
+++ b/scripts/ci/build-demo-app.sh
@@ -46,14 +46,29 @@ echo "\$Docker Image Flavor: ${FLAVOR}"
echo "\$Isis Version: ${ISIS_VERSION}"
echo ""
-#
-# update version (but just for the modules we need to build)
-#
-if [ ! -z "$REVISION" ]; then
- cd $PROJECT_ROOT_PATH/core-parent
- mvn versions:set -DnewVersion=$REVISION -Ddemo-app-modules
- cd $PROJECT_ROOT_PATH
-fi
+function setRevision() {
+ #
+ # set version (but just for the modules we need to build)
+ #
+ if [ ! -z "$REVISION" ]; then
+ cd $PROJECT_ROOT_PATH/core-parent
+ mvn versions:set -DnewVersion=$REVISION -Ddemo-app-module
+ cd $PROJECT_ROOT_PATH
+ fi
+}
+
+function revertRevision() {
+ #
+ # revert the version (but just for the modules we need to build)
+ #
+ if [ ! -z "$REVISION" ]; then
+ cd $PROJECT_ROOT_PATH/core-parent
+ mvn versions:revert -DnewVersion=$REVISION -Ddemo-app-module
+ cd $PROJECT_ROOT_PATH
+ fi
+}
+
+setRevision
#
# now build the apps
@@ -86,14 +101,6 @@ do
cd $PROJECT_ROOT_PATH
done
+revertRevision
-
-#
-# finally, revert the version
-#
-if [ ! -z "$REVISION" ]; then
- cd $PROJECT_ROOT_PATH/core-parent
- mvn versions:revert -Dstarter-apps-modules
- cd $PROJECT_ROOT_PATH
-fi