From 3acdd340d1fb35600aa609c92784c9af6a5aa89c Mon Sep 17 00:00:00 2001
From: Vladimir Mikhaylenko <vladimir.mikhaylenko@sap.com>
Date: Thu, 25 Apr 2024 14:30:20 +0200
Subject: [PATCH 1/7] pm2-less integration tests

---
 integration-tests/pom.xml | 38 ++++++++++++++++++--------------------
 mtx/sidecar/package.json  |  3 +--
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 73f59d34..d5e87696 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -95,34 +95,32 @@
 							<workingDirectory>${sidecar.dir}</workingDirectory>
 						</configuration>
 					</execution>
+				</executions>
+			</plugin>
 
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>3.2.0</version>
+				<executions>
 					<execution>
-						<id>start-sidecar</id>
-						<goals>
-							<goal>npx</goal>
-						</goals>
 						<phase>pre-integration-test</phase>
-						<configuration>
-							<arguments>pm2 -l sidecar.log --time start --name=sidecar npm -- run start</arguments>
-							<skip>${skipTests}</skip>
-							<workingDirectory>${sidecar.dir}</workingDirectory>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>stop-sidecar</id>
+						<id>start-sidecar</id>
 						<goals>
-							<goal>npx</goal>
+							<goal>exec</goal>
 						</goals>
-						<phase>post-integration-test</phase>
-						<configuration>
-							<arguments>pm2 delete sidecar</arguments>
-							<skip>${skipTests}</skip>
-							<workingDirectory>${sidecar.dir}</workingDirectory>
-						</configuration>
 					</execution>
 				</executions>
+				<configuration>
+					<executable>node</executable>
+					<!-- optional -->
+					<workingDirectory>${sidecar.dir}</workingDirectory>
+					<async>true</async>
+					<useMavenLogger>true</useMavenLogger>
+					<commandlineArgs>node_modules/@sap/cds/bin/cds-serve.js</commandlineArgs>
+				</configuration>
 			</plugin>
+
 		</plugins>
 	</build>
 </project>
diff --git a/mtx/sidecar/package.json b/mtx/sidecar/package.json
index 592c2c7f..80916817 100644
--- a/mtx/sidecar/package.json
+++ b/mtx/sidecar/package.json
@@ -9,8 +9,7 @@
     "@sap/hdi-deploy": "4.8.2"
   },
   "devDependencies": {
-    "sqlite3": "^5",
-    "pm2": "^5.3.0"
+    "sqlite3": "^5"
   },
   "engines": {
     "node": "^18"

From ccd67c2e5a9560d88ab42f53c8c72e9231c97b07 Mon Sep 17 00:00:00 2001
From: Vladimir Mikhaylenko <vladimir.mikhaylenko@sap.com>
Date: Thu, 25 Apr 2024 14:34:01 +0200
Subject: [PATCH 2/7] Clearer log

---
 .github/workflows/maven.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 5d6d859e..d6cb8fdc 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -9,7 +9,7 @@ on:
       - main
       - postgres
   pull_request:
-    branches: 
+    branches:
       - main
       - postgres
 
@@ -27,4 +27,4 @@ jobs:
         java-version: 17
         distribution: 'temurin'
     - name: Build with Maven
-      run: mvn -B clean install
+      run: mvn -ntp -B clean install

From 8e05300a8ff3c3c49a49395ab89460c5a3b4270c Mon Sep 17 00:00:00 2001
From: Vladimir Mikhaylenko <vladimir.mikhaylenko@sap.com>
Date: Thu, 25 Apr 2024 14:37:58 +0200
Subject: [PATCH 3/7] Cleanup

---
 integration-tests/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index d5e87696..9e2f99a6 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -113,14 +113,12 @@
 				</executions>
 				<configuration>
 					<executable>node</executable>
-					<!-- optional -->
 					<workingDirectory>${sidecar.dir}</workingDirectory>
 					<async>true</async>
 					<useMavenLogger>true</useMavenLogger>
 					<commandlineArgs>node_modules/@sap/cds/bin/cds-serve.js</commandlineArgs>
 				</configuration>
 			</plugin>
-
 		</plugins>
 	</build>
 </project>

From d56acf344a42c29ced939777b9d3044e5232e18b Mon Sep 17 00:00:00 2001
From: Vladimir Mikhaylenko <vladimir.mikhaylenko@sap.com>
Date: Thu, 25 Apr 2024 15:06:49 +0200
Subject: [PATCH 4/7] Add <skip>

---
 integration-tests/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 9e2f99a6..07f50629 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -113,6 +113,7 @@
 				</executions>
 				<configuration>
 					<executable>node</executable>
+					<skip>${skipTests}</skip>
 					<workingDirectory>${sidecar.dir}</workingDirectory>
 					<async>true</async>
 					<useMavenLogger>true</useMavenLogger>

From dcf0d6e3fd723f9246435fa30d0fd4cc81eb458f Mon Sep 17 00:00:00 2001
From: Vladimir Mikhaylenko <vladimir.mikhaylenko@sap.com>
Date: Thu, 25 Apr 2024 15:20:47 +0200
Subject: [PATCH 5/7] Use installed Node.js

---
 integration-tests/pom.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 07f50629..66996f57 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -82,6 +82,16 @@
 				<artifactId>cds-maven-plugin</artifactId>
 				<version>${cds.services.version}</version>
 				<executions>
+					<execution>
+						<id>cds.install-node</id>
+						<goals>
+							<goal>install-node</goal>
+						</goals>
+						<configuration>
+							<skip>${cdsdk-global}</skip>
+						</configuration>
+					</execution>
+
 					<!-- Following steps start and stop MTX sidecar for tests executed by failsafe plugin -->
 					<execution>
 						<id>install-sidecar</id>
@@ -112,7 +122,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<executable>node</executable>
+					<executable>${cds.node.executable}</executable>
 					<skip>${skipTests}</skip>
 					<workingDirectory>${sidecar.dir}</workingDirectory>
 					<async>true</async>

From b477b7e4d8ccd17ec07bb46a8af899b90811ef52 Mon Sep 17 00:00:00 2001
From: Vladimir Mikhaylenko <vladimir.mikhaylenko@sap.com>
Date: Thu, 25 Apr 2024 15:51:03 +0200
Subject: [PATCH 6/7] Cleanup

---
 integration-tests/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 66996f57..477711e7 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -92,7 +92,6 @@
 						</configuration>
 					</execution>
 
-					<!-- Following steps start and stop MTX sidecar for tests executed by failsafe plugin -->
 					<execution>
 						<id>install-sidecar</id>
 						<goals>

From 3359c8de6c4d3b98df0b6fb9fa7f20638b27d0e3 Mon Sep 17 00:00:00 2001
From: Vladimir Mikhaylenko <vladimir.mikhaylenko@sap.com>
Date: Thu, 25 Apr 2024 16:03:57 +0200
Subject: [PATCH 7/7] Try default for cds.node.executable

---
 integration-tests/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 477711e7..0d3f7bc7 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -15,6 +15,7 @@
 
 	<properties>
 		<sidecar.dir>../mtx/sidecar</sidecar.dir>
+		<cds.node.executable>node</cds.node.executable>
 	</properties>
 
 	<dependencies>