chore: update run scripts and flatten poms

scc-digitalhub · Mar 19, 2024 · 913efbe · 913efbe
1 parent 6bac7e9
commit 913efbe
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 42 deletions.
diff --git a/.flattened-pom.xml b/.flattened-pom.xml
@@ -4,6 +4,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>it.smartcommunitylabdhub</groupId>
   <artifactId>digitalhub-core</artifactId>
-  <version>0.0.29</version>
+  <version>0.0.32</version>
   <packaging>pom</packaging>
 </project>
diff --git a/build.sh 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
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>it.smartcommunitylabdhub</groupId>
   <artifactId>dh-console</artifactId>
-  <version>0.0.29</version>
+  <version>0.0.32</version>
   <dependencies>
     <dependency>
       <groupId>org.projectlombok</groupId>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>it.smartcommunitylabdhub</groupId>
       <artifactId>dh-commons</artifactId>
-      <version>0.0.29</version>
+      <version>0.0.32</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/frontend/console b/frontend/console
diff --git a/modules/commons/.flattened-pom.xml b/modules/commons/.flattened-pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>it.smartcommunitylabdhub</groupId>
   <artifactId>dh-commons</artifactId>
-  <version>0.0.29</version>
+  <version>0.0.32</version>
   <dependencies>
     <dependency>
       <groupId>org.projectlombok</groupId>

diff --git a/modules/framework-k8s/.flattened-pom.xml b/modules/framework-k8s/.flattened-pom.xml
@@ -4,18 +4,18 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>it.smartcommunitylabdhub</groupId>
   <artifactId>dh-framework-k8s</artifactId>
-  <version>0.0.29</version>
+  <version>0.0.32</version>
   <dependencies>
     <dependency>
       <groupId>it.smartcommunitylabdhub</groupId>
       <artifactId>dh-commons</artifactId>
-      <version>0.0.29</version>
+      <version>0.0.32</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>it.smartcommunitylabdhub</groupId>
       <artifactId>dh-fsm</artifactId>
-      <version>0.0.29</version>
+      <version>0.0.32</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/modules/fsm/.flattened-pom.xml b/modules/fsm/.flattened-pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>it.smartcommunitylabdhub</groupId>
   <artifactId>dh-fsm</artifactId>
-  <version>0.0.29</version>
+  <version>0.0.32</version>
   <dependencies>
     <dependency>
       <groupId>it.smartcommunitylabdhub</groupId>
       <artifactId>dh-commons</artifactId>
-      <version>0.0.29</version>
+      <version>0.0.32</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/modules/runtime-container/.flattened-pom.xml b/modules/runtime-container/.flattened-pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>it.smartcommunitylabdhub</groupId>
   <artifactId>dh-runtime-container</artifactId>
-  <version>0.0.29</version>
+  <version>0.0.32</version>
   <dependencies>
     <dependency>
       <groupId>org.springdoc</groupId>
@@ -15,13 +15,13 @@
     <dependency>
       <groupId>it.smartcommunitylabdhub</groupId>
       <artifactId>dh-commons</artifactId>
-      <version>0.0.29</version>
+      <version>0.0.32</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>it.smartcommunitylabdhub</groupId>
       <artifactId>dh-framework-k8s</artifactId>
-      <version>0.0.29</version>
+      <version>0.0.32</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/modules/runtime-dbt/.flattened-pom.xml b/modules/runtime-dbt/.flattened-pom.xml
@@ -4,18 +4,18 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>it.smartcommunitylabdhub</groupId>
   <artifactId>dh-runtime-dbt</artifactId>
-  <version>0.0.29</version>
+  <version>0.0.32</version>
   <dependencies>
     <dependency>
       <groupId>it.smartcommunitylabdhub</groupId>
       <artifactId>dh-commons</artifactId>
-      <version>0.0.29</version>
+      <version>0.0.32</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>it.smartcommunitylabdhub</groupId>
       <artifactId>dh-framework-k8s</artifactId>
-      <version>0.0.29</version>
+      <version>0.0.32</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/modules/runtime-mlrun/.flattened-pom.xml b/modules/runtime-mlrun/.flattened-pom.xml
@@ -4,18 +4,18 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>it.smartcommunitylabdhub</groupId>
   <artifactId>dh-runtime-mlrun</artifactId>
-  <version>0.0.29</version>
+  <version>0.0.32</version>
   <dependencies>
     <dependency>
       <groupId>it.smartcommunitylabdhub</groupId>
       <artifactId>dh-commons</artifactId>
-      <version>0.0.29</version>
+      <version>0.0.32</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>it.smartcommunitylabdhub</groupId>
       <artifactId>dh-framework-k8s</artifactId>
-      <version>0.0.29</version>
+      <version>0.0.32</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/modules/runtime-nefertem/.flattened-pom.xml b/modules/runtime-nefertem/.flattened-pom.xml
@@ -4,18 +4,18 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>it.smartcommunitylabdhub</groupId>
   <artifactId>dh-runtime-nefertem</artifactId>
-  <version>0.0.29</version>
+  <version>0.0.32</version>
   <dependencies>
     <dependency>
       <groupId>it.smartcommunitylabdhub</groupId>
       <artifactId>dh-commons</artifactId>
-      <version>0.0.29</version>
+      <version>0.0.32</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>it.smartcommunitylabdhub</groupId>
       <artifactId>dh-framework-k8s</artifactId>
-      <version>0.0.29</version>
+      <version>0.0.32</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git 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
+1 −1		src/App.tsx
+1 −1		src/components/StateChips.tsx
+11 −0		src/i18n/englishMessages.tsx
+9 −2		src/i18n/italianMessages.tsx
+32 −0		src/pages/dashboard/Counter.tsx
+152 −242		src/pages/dashboard/Dashboard.tsx
+31 −0		src/pages/dashboard/Recent.tsx
+81 −0		src/pages/dashboard/RecentList.tsx
+83 −0		src/pages/dashboard/RecentRunList.tsx
+65 −0		src/pages/dashboard/RunsGrid.tsx
+6 −0		src/pages/dashboard/helper.ts
+10 −2		src/provider/schemaProvider.tsx
+1 −1		src/resources/dataitems/preview-table/PreviewHeaderCell.tsx
+6 −14		src/resources/dataitems/preview-table/PreviewTabComponent.tsx
+30 −24		src/resources/dataitems/preview-table/usePreviewDataGridController.ts
+4 −4		src/resources/dataitems/schema-table/SchemaTabComponent.tsx
+25 −40		src/resources/functions/show.tsx