feat: Update 3.4.0.0

- Merge upstream 3.4.0
- Replace version approach with WireMock solution
  wiremock-gui version is lost now.

build.gradle

@@ -443,19 +443,8 @@ task generateWebapp(type: NpmTask) {
   args = ['run', 'prod']
 }
 
-task versionTxt()  {
-  dependsOn generateWebapp
-  doLast {
-    new File(projectDir.getAbsolutePath() + "/src/main/resources", "version.json").text = """{
-  "buildTime": "${new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date())}",
-  "version": "$version"
-}
-"""
-  }
-}
-
 task finalizeWebapp(type: Copy) {
-  dependsOn versionTxt
+  dependsOn generateWebapp
   // Because of: https://github.com/angular/angular-cli/issues/26304
   // we need to copy some things around.
   from 'webapp/wiremock/dist/browser'

webapp/wiremock/src/app/components/home/home.component.html

@@ -113,15 +113,10 @@
           Shutdown
         </button>
         <div class="dropdown-divider"></div>
-        <h6 class="dropdown-header" [ngbTooltip]="versionTooltipContent">{{ version }}</h6>
+        <h6 class="dropdown-header">{{ version }}</h6>
       </div>
     </div>
   </div>
 </nav>
 <wm-message></wm-message>
 <router-outlet></router-outlet>
-<ng-template #versionTooltipContent>
-  <pre class="text-wrap mb-0">
-  {{ versionTooltip }}
-  </pre>
-</ng-template>

webapp/wiremock/src/app/components/home/home.component.ts

@@ -30,7 +30,6 @@ export class HomeComponent implements OnInit, OnDestroy {
 
   currentRecordingStatus?: RecordingStatus;
   version?: string;
-  versionTooltip?: string;
 
   RecordingStatus = RecordingStatus;
 
@@ -83,10 +82,6 @@ export class HomeComponent implements OnInit, OnDestroy {
     this.wiremockService.getVersion().subscribe({
       next: version => {
         this.version = `Version: ${version.version}`;
-        this.versionTooltip = `WireMock: ${version.version.substring(
-          0,
-          version.version.lastIndexOf(".")
-        )}\nBuildTime: ${version.buildTime}`;
       },
     });
   }

webapp/wiremock/src/app/model/wiremock/version.ts

@@ -1,4 +1,3 @@
 export class Version {
   version!: string;
-  buildTime!: string;
 }

webapp/wiremock/src/app/services/wiremock.service.ts

@@ -122,7 +122,19 @@ export class WiremockService {
   }
 
   getVersion(): Observable<Version> {
-    return this.defaultPipe(this.http.get<Version>(WiremockService.getUrl("version")));
+    return this.defaultPipe(
+      this.http
+        .get(WiremockService.getUrl("version"), {
+          responseType: "text",
+        })
+        .pipe(
+          map(v => {
+            const version = new Version();
+            version.version = v;
+            return version;
+          })
+        )
+    );
   }
 
   shutdown(): Observable<ResponseDefinition> {
@@ -213,7 +225,7 @@ export class WiremockService {
             if (error.error instanceof ErrorEvent) {
               console.error("An error occurred:", error.error.message);
             } else {
-              console.error("An error occurred:", error);
+              console.error("An error occurred:", JSON.stringify(error));
             }
           }
           console.log(`Attempt ${count}: retrying in ${count * delay}ms`);