From 913efbe038d9a40d789342fa6f5e2f526414802f Mon Sep 17 00:00:00 2001 From: Matteo Saloni Date: Tue, 19 Mar 2024 11:48:08 +0100 Subject: [PATCH] chore: update run scripts and flatten poms --- .flattened-pom.xml | 2 +- build.sh | 19 ++++++++++++++ frontend/.flattened-pom.xml | 4 +-- frontend/console | 2 +- modules/commons/.flattened-pom.xml | 2 +- modules/framework-k8s/.flattened-pom.xml | 6 ++--- modules/fsm/.flattened-pom.xml | 4 +-- modules/runtime-container/.flattened-pom.xml | 6 ++--- modules/runtime-dbt/.flattened-pom.xml | 6 ++--- modules/runtime-mlrun/.flattened-pom.xml | 6 ++--- modules/runtime-nefertem/.flattened-pom.xml | 6 ++--- run.sh | 27 +++++--------------- 12 files changed, 48 insertions(+), 42 deletions(-) create mode 100755 build.sh diff --git a/.flattened-pom.xml b/.flattened-pom.xml index bce415cd..43481ffe 100644 --- a/.flattened-pom.xml +++ b/.flattened-pom.xml @@ -4,6 +4,6 @@ 4.0.0 it.smartcommunitylabdhub digitalhub-core - 0.0.29 + 0.0.32 pom diff --git a/build.sh b/build.sh new file mode 100755 index 00000000..60115599 --- /dev/null +++ b/build.sh @@ -0,0 +1,19 @@ +#!/bin/bash +MIN_VERSION=21 +CUR_VERSION=`java -version 2>&1 | grep 'version' 2>&1 | awk -F\" '{ split($2,a,"."); print a[1]}'` + +if [[ "$CUR_VERSION" ]]; then + echo "Detected java version $CUR_VERSION." + if [[ "$CUR_VERSION" -lt "$MIN_VERSION" ]]; then + echo "Required java version is $MIN_VERSION. Exit." + exit + fi +else + echo "Missing java. Exit" + exit +fi + + +# Build Root Project +echo "Building project" +./mvnw clean install -DskipTests diff --git a/frontend/.flattened-pom.xml b/frontend/.flattened-pom.xml index ecec6e8b..f2ae2ab3 100644 --- a/frontend/.flattened-pom.xml +++ b/frontend/.flattened-pom.xml @@ -4,7 +4,7 @@ 4.0.0 it.smartcommunitylabdhub dh-console - 0.0.29 + 0.0.32 org.projectlombok @@ -40,7 +40,7 @@ it.smartcommunitylabdhub dh-commons - 0.0.29 + 0.0.32 compile diff --git a/frontend/console b/frontend/console index b96889f3..fa6fad21 160000 --- a/frontend/console +++ b/frontend/console @@ -1 +1 @@ -Subproject commit b96889f36295bf9c270f74decef1c6ec2f6bbf6b +Subproject commit fa6fad2166699e738235b06eaf11dd7ec896c7b1 diff --git a/modules/commons/.flattened-pom.xml b/modules/commons/.flattened-pom.xml index 0733289b..dee03b23 100644 --- a/modules/commons/.flattened-pom.xml +++ b/modules/commons/.flattened-pom.xml @@ -4,7 +4,7 @@ 4.0.0 it.smartcommunitylabdhub dh-commons - 0.0.29 + 0.0.32 org.projectlombok diff --git a/modules/framework-k8s/.flattened-pom.xml b/modules/framework-k8s/.flattened-pom.xml index af255c07..522a8d87 100644 --- a/modules/framework-k8s/.flattened-pom.xml +++ b/modules/framework-k8s/.flattened-pom.xml @@ -4,18 +4,18 @@ 4.0.0 it.smartcommunitylabdhub dh-framework-k8s - 0.0.29 + 0.0.32 it.smartcommunitylabdhub dh-commons - 0.0.29 + 0.0.32 compile it.smartcommunitylabdhub dh-fsm - 0.0.29 + 0.0.32 compile diff --git a/modules/fsm/.flattened-pom.xml b/modules/fsm/.flattened-pom.xml index 32a9cda5..5e6b7140 100644 --- a/modules/fsm/.flattened-pom.xml +++ b/modules/fsm/.flattened-pom.xml @@ -4,12 +4,12 @@ 4.0.0 it.smartcommunitylabdhub dh-fsm - 0.0.29 + 0.0.32 it.smartcommunitylabdhub dh-commons - 0.0.29 + 0.0.32 compile diff --git a/modules/runtime-container/.flattened-pom.xml b/modules/runtime-container/.flattened-pom.xml index 43dc5db0..5f7cd022 100644 --- a/modules/runtime-container/.flattened-pom.xml +++ b/modules/runtime-container/.flattened-pom.xml @@ -4,7 +4,7 @@ 4.0.0 it.smartcommunitylabdhub dh-runtime-container - 0.0.29 + 0.0.32 org.springdoc @@ -15,13 +15,13 @@ it.smartcommunitylabdhub dh-commons - 0.0.29 + 0.0.32 compile it.smartcommunitylabdhub dh-framework-k8s - 0.0.29 + 0.0.32 compile diff --git a/modules/runtime-dbt/.flattened-pom.xml b/modules/runtime-dbt/.flattened-pom.xml index 9e93b850..2cf80bcc 100644 --- a/modules/runtime-dbt/.flattened-pom.xml +++ b/modules/runtime-dbt/.flattened-pom.xml @@ -4,18 +4,18 @@ 4.0.0 it.smartcommunitylabdhub dh-runtime-dbt - 0.0.29 + 0.0.32 it.smartcommunitylabdhub dh-commons - 0.0.29 + 0.0.32 compile it.smartcommunitylabdhub dh-framework-k8s - 0.0.29 + 0.0.32 compile diff --git a/modules/runtime-mlrun/.flattened-pom.xml b/modules/runtime-mlrun/.flattened-pom.xml index 7abd043f..f869c24f 100644 --- a/modules/runtime-mlrun/.flattened-pom.xml +++ b/modules/runtime-mlrun/.flattened-pom.xml @@ -4,18 +4,18 @@ 4.0.0 it.smartcommunitylabdhub dh-runtime-mlrun - 0.0.29 + 0.0.32 it.smartcommunitylabdhub dh-commons - 0.0.29 + 0.0.32 compile it.smartcommunitylabdhub dh-framework-k8s - 0.0.29 + 0.0.32 compile diff --git a/modules/runtime-nefertem/.flattened-pom.xml b/modules/runtime-nefertem/.flattened-pom.xml index 510f96f3..f47c03dc 100644 --- a/modules/runtime-nefertem/.flattened-pom.xml +++ b/modules/runtime-nefertem/.flattened-pom.xml @@ -4,18 +4,18 @@ 4.0.0 it.smartcommunitylabdhub dh-runtime-nefertem - 0.0.29 + 0.0.32 it.smartcommunitylabdhub dh-commons - 0.0.29 + 0.0.32 compile it.smartcommunitylabdhub dh-framework-k8s - 0.0.29 + 0.0.32 compile diff --git a/run.sh b/run.sh index 4a9115f1..1a16f6f1 100755 --- a/run.sh +++ b/run.sh @@ -18,28 +18,15 @@ if [[ $# == 0 ]]; then PROFILE="default" fi -# cd modules || exit 1 - -# # Build each modules -# for module in commons fsm framework-k8s runtime-container runtime-dbt runtime-mlrun runtime-nefertem; do -# echo "Building module: $module" -# cd "$module" || exit 1 -# mvn clean install -DskipTests -# cd .. -# done - -# cd .. || exit 1 +PWD=`pwd` +if [ ! -d "${PWD}/application/target" ]; then + ./build.sh +fi -# # Build Application Module -# cd application || exit 1 -# echo "Building application module" -# mvn clean install -DskipTests -# cd .. || exit 1 -# Build Root Project -echo "Building project" -./mvnw clean install -DskipTests +DB="${PWD}/data/db" # Run the application -echo "Running Spring Boot application with profile $PROFILE..." +echo "Running Spring Boot application with profile $PROFILE, using $DB..." +export JDBC_URL="jdbc:h2:file:${DB}" ./mvnw spring-boot:run -pl application -Dspring-boot.run.profiles=$PROFILE