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/09/09 13:29:55 UTC

[isis] branch master updated: ISIS-2426: fix build scripts after renaming core-parent -> isis-parent

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 3f6dd35  ISIS-2426: fix build scripts after renaming core-parent -> isis-parent
3f6dd35 is described below

commit 3f6dd35575aa15a679b72971f580afdaf31ffac9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 9 15:29:42 2020 +0200

    ISIS-2426: fix build scripts after renaming core-parent -> isis-parent
---
 interim-release.sh             | 2 +-
 scripts/ci/build-core.sh       | 6 +++---
 scripts/ci/build-demo-app.sh   | 4 ++--
 scripts/ci/build-smoketests.sh | 4 ++--
 scripts/verify-isis-release.sh | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/interim-release.sh b/interim-release.sh
index b0abaff..5fc943e 100644
--- a/interim-release.sh
+++ b/interim-release.sh
@@ -20,7 +20,7 @@ echo "checking out new branch $BRANCH"
 git checkout -b "$BRANCH"
 
 echo "updating version in all pom.xml files..."
-pushd core-parent >/dev/null
+pushd isis-parent >/dev/null
 mvn versions:set -DnewVersion=$VERSION > /dev/null
 popd >/dev/null
 pushd starter >/dev/null
diff --git a/scripts/ci/build-core.sh b/scripts/ci/build-core.sh
index a96e9b5..b7f20be 100644
--- a/scripts/ci/build-core.sh
+++ b/scripts/ci/build-core.sh
@@ -38,7 +38,7 @@ sh $SCRIPT_DIR/_print-environment.sh "build-core"
 
 if [ ! -z "$REVISION" ]; then
 
-  cd $PROJECT_ROOT_PATH/core-parent
+  cd $PROJECT_ROOT_PATH/isis-parent
   echo ""
   echo ""
   echo ">>> mvn versions:set -DnewVersion=$REVISION ..."
@@ -62,7 +62,7 @@ if [ ! -z "$REVISION" ]; then
   sed -i "s|<version>$CURR</version>|<version>$REVISION</version>|g" pom.xml
 fi
 
-cd $PROJECT_ROOT_PATH/core-parent
+cd $PROJECT_ROOT_PATH/isis-parent
 echo ""
 echo ""
 echo ">>> mvn $MVN_STAGES $MVN_ADDITIONAL_OPTS"
@@ -94,7 +94,7 @@ mvn -s $SETTINGS_XML \
     | fgrep --line-buffered -v "[INFO] Skipping because packaging 'jar' is not pom."
 
 if [ ! -z "$REVISION" ]; then
-  cd $PROJECT_ROOT_PATH/core-parent
+  cd $PROJECT_ROOT_PATH/isis-parent
   echo ""
   echo ""
   echo ">>> mvn versions:revert ..."
diff --git a/scripts/ci/build-demo-app.sh b/scripts/ci/build-demo-app.sh
index 2ac5c0e..e7310a8 100644
--- a/scripts/ci/build-demo-app.sh
+++ b/scripts/ci/build-demo-app.sh
@@ -69,7 +69,7 @@ function revertRevision() {
 	fi
 }
 
-setRevision core-parent
+setRevision isis-parent
 
 #
 # now build the apps
@@ -103,6 +103,6 @@ do
 
 done
 
-revertRevision core-parent
+revertRevision isis-parent
 
 
diff --git a/scripts/ci/build-smoketests.sh b/scripts/ci/build-smoketests.sh
index f43220f..86f61da 100644
--- a/scripts/ci/build-smoketests.sh
+++ b/scripts/ci/build-smoketests.sh
@@ -43,7 +43,7 @@ sh $SCRIPT_DIR/_print-environment.sh "build-smoketests"
 # update version (but just for the modules we need to build)
 #
 if [ ! -z "$REVISION" ]; then
-  cd $PROJECT_ROOT_PATH/core-parent
+  cd $PROJECT_ROOT_PATH/isis-parent
   mvn versions:set -DnewVersion=$REVISION -Dsmoketests-module
   cd $PROJECT_ROOT_PATH
 fi
@@ -66,7 +66,7 @@ done
 # finally, revert the version
 #
 if [ ! -z "$REVISION" ]; then
-  cd $PROJECT_ROOT_PATH/core-parent
+  cd $PROJECT_ROOT_PATH/isis-parent
   mvn versions:revert -Dsmoketests-module
   cd $PROJECT_ROOT_PATH
 fi
diff --git a/scripts/verify-isis-release.sh b/scripts/verify-isis-release.sh
index e2154c2..ac25922 100755
--- a/scripts/verify-isis-release.sh
+++ b/scripts/verify-isis-release.sh
@@ -87,7 +87,7 @@ _build(){
 
     echo 'Building'
     # previously there were multiple directories, now just the one.
-    pushd isis*/core-parent
+    pushd isis*/isis-parent
     _execmustpass mvn clean install -Dskip.git -Preleased,-all
 	popd
 }