From 842e044ebfd82879ceb22404cb9679fadf9c6ce4 Mon Sep 17 00:00:00 2001
From: Jan Cizmar <cizmar@chlupac.com>
Date: Mon, 9 Sep 2024 15:28:18 +0200
Subject: [PATCH] fix: Fix startup message

---
 build.gradle      | 23 ++++++++++++-----------
 gradle/e2e.gradle |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1c96e0d263..d05330dde3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -140,17 +140,18 @@ ktlint {
 rootProject.subprojects {
     afterEvaluate {
         def skipServerBuild = System.getenv("SKIP_SERVER_BUILD") == "true"
-        tasks.findByName("compileKotlin")?.enabled = !skipServerBuild
-        tasks.findByName("kaptGenerateStubsTestKotlin")?.enabled = !skipServerBuild
-        tasks.findByName("kaptGenerateStubsKotlin")?.enabled = !skipServerBuild
-        tasks.findByName("kaptKotlin")?.enabled = !skipServerBuild
-        tasks.findByName("bootBuildInfo")?.enabled = !skipServerBuild
-        tasks.findByName("compileJava")?.enabled = !skipServerBuild
-        tasks.findByName("bootJarMainClassName")?.enabled = !skipServerBuild
-        tasks.findByName("jar")?.enabled = !skipServerBuild
-        tasks.findByName("bootJar")?.enabled = !skipServerBuild
-        tasks.findByName("classes")?.enabled = !skipServerBuild
-        tasks.findByName("compileTestKotlin")?.enabled = !skipServerBuild
+        tasks.findByName("compileKotlin")?.onlyIf { !skipServerBuild }
+        tasks.findByName("kaptGenerateStubsTestKotlin")?.onlyIf { !skipServerBuild }
+        tasks.findByName("kaptGenerateStubsKotlin")?.onlyIf { !skipServerBuild }
+        tasks.findByName("kaptKotlin")?.onlyIf { !skipServerBuild }
+        tasks.findByName("bootBuildInfo")?.onlyIf { !skipServerBuild }
+        tasks.findByName("compileJava")?.onlyIf { !skipServerBuild }
+        tasks.findByName("bootJarMainClassName")?.onlyIf { !skipServerBuild }
+        tasks.findByName("jar")?.onlyIf { !skipServerBuild }
+        tasks.findByName("bootJar")?.onlyIf { !skipServerBuild }
+        tasks.findByName("classes")?.onlyIf { !skipServerBuild }
+        tasks.findByName("classes")?.onlyIf { !skipServerBuild }
+        tasks.findByName("compileTestKotlin")?.onlyIf { !skipServerBuild }
     }
 }
 
diff --git a/gradle/e2e.gradle b/gradle/e2e.gradle
index b0be8526a4..12e934ee86 100644
--- a/gradle/e2e.gradle
+++ b/gradle/e2e.gradle
@@ -60,7 +60,7 @@ task waitForRunningContainer(type: Task, group: "e2e") {
             String s = null
             while ((s = stdInput.readLine()) != null) {
                 println(s)
-                if (s.contains("Tomcat started on port(s):")) {
+                if (s.contains("Tomcat started on port 8084 (http)")) {
                     return
                 }
             }