From d17fe88cf4e692ed9c4666def3584652eabcf76c Mon Sep 17 00:00:00 2001
From: Timothy Gerstel <tim.gerstel@gmail.com>
Date: Fri, 1 Mar 2024 19:13:34 -0500
Subject: [PATCH] Update typescript and @types/node

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>
---
 lib/tomcatManager.ts |  2 +-
 package-lock.json    | 34 ++++++++++++++++------------------
 package.json         |  6 +++---
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/lib/tomcatManager.ts b/lib/tomcatManager.ts
index 7b376b36..7f89e4f2 100755
--- a/lib/tomcatManager.ts
+++ b/lib/tomcatManager.ts
@@ -284,7 +284,7 @@ export class TomcatManager implements JavaServerManager {
           reject(error);
         } else {
           log.info(`ZWED0093I`, this.id); //log.info(`Tomcat Manager ID=${this.id} cleanup successful`);
-          resolve();
+          resolve(this.id);
         }
       })
     });
diff --git a/package-lock.json b/package-lock.json
index 575644b1..3627d3d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,6 +33,7 @@
         "rimraf": "~2.6.3",
         "semver": "~5.7.2",
         "swagger-parser": "~10.0.3",
+        "typescript": "^5.0.2",
         "ws": "^6.2.2",
         "yaml": "~1.10.2",
         "yauzl": "~2.10.0"
@@ -41,12 +42,11 @@
         "@types/connect": "3.4.32",
         "@types/express": "~4.16.1",
         "@types/express-serve-static-core": "4.17.7",
-        "@types/node": "~6.0.0",
+        "@types/node": "^14.18.63",
         "@types/qs": "6.9.3",
         "chai": "~4.2.0",
         "chai-http": "~4.2.0",
-        "mocha": "~8.4.0",
-        "typescript": "2.7.1"
+        "mocha": "~8.4.0"
       },
       "optionalDependencies": {
         "keyring_js": "~1.1.0"
@@ -233,9 +233,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "6.0.118",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.118.tgz",
-      "integrity": "sha512-N33cKXGSqhOYaPiT4xUGsYlPPDwFtQM/6QxJxuMXA/7BcySW+lkn2yigWP7vfs4daiL/7NJNU6DMCqg5N4B+xQ==",
+      "version": "14.18.63",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
+      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==",
       "dev": true
     },
     "node_modules/@types/qs": {
@@ -2647,16 +2647,15 @@
       }
     },
     "node_modules/typescript": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.1.tgz",
-      "integrity": "sha512-bqB1yS6o9TNA9ZC/MJxM0FZzPnZdtHj0xWK/IZ5khzVqdpGul/R/EIiHRgFXlwTD7PSIaYVnGKq1QgMCu2mnqw==",
-      "dev": true,
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz",
+      "integrity": "sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=12.20"
       }
     },
     "node_modules/uid-safe": {
@@ -3169,9 +3168,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "6.0.118",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.118.tgz",
-      "integrity": "sha512-N33cKXGSqhOYaPiT4xUGsYlPPDwFtQM/6QxJxuMXA/7BcySW+lkn2yigWP7vfs4daiL/7NJNU6DMCqg5N4B+xQ==",
+      "version": "14.18.63",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
+      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==",
       "dev": true
     },
     "@types/qs": {
@@ -5028,10 +5027,9 @@
       }
     },
     "typescript": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.1.tgz",
-      "integrity": "sha512-bqB1yS6o9TNA9ZC/MJxM0FZzPnZdtHj0xWK/IZ5khzVqdpGul/R/EIiHRgFXlwTD7PSIaYVnGKq1QgMCu2mnqw==",
-      "dev": true
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz",
+      "integrity": "sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw=="
     },
     "uid-safe": {
       "version": "2.1.5",
diff --git a/package.json b/package.json
index f8964d34..525fd809 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "rimraf": "~2.6.3",
     "semver": "~5.7.2",
     "swagger-parser": "~10.0.3",
+    "typescript": "^5.0.2",
     "ws": "^6.2.2",
     "yaml": "~1.10.2",
     "yauzl": "~2.10.0"
@@ -69,12 +70,11 @@
     "@types/connect": "3.4.32",
     "@types/express": "~4.16.1",
     "@types/express-serve-static-core": "4.17.7",
-    "@types/node": "~6.0.0",
+    "@types/node": "^14.18.63",
     "@types/qs": "6.9.3",
     "chai": "~4.2.0",
     "chai-http": "~4.2.0",
-    "mocha": "~8.4.0",
-    "typescript": "2.7.1"
+    "mocha": "~8.4.0"
   },
   "optionalDependencies": {
     "keyring_js": "~1.1.0"