From 5a188919717059143a9a9545bb119b87f63ac039 Mon Sep 17 00:00:00 2001 From: namrata1012 Date: Sun, 9 Apr 2023 16:02:31 -0700 Subject: [PATCH 1/6] updates without electron --- karma-app/build | 2 +- karma-app/desktop/app/package.json | 4 +++- karma-app/desktop/package.json | 5 ++++- karma-common/pom.xml | 1 + karma-offline/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/karma-app/build b/karma-app/build index 016a3f049..64c5af9c9 100755 --- a/karma-app/build +++ b/karma-app/build @@ -48,7 +48,7 @@ unzip master.zip mv karma-app-deps-master/*.tar.gz . rm -rf karma-app-deps-master master.zip # download tomcat binary -wget https://dlcdn.apache.org/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84.zip +wget https://dlcdn.apache.org/tomcat/tomcat-8/v8.5.87/bin/apache-tomcat-8.5.87.zip unzip apache-tomcat-*.zip rm apache-tomcat-*.zip mv apache-tomcat* tomcat diff --git a/karma-app/desktop/app/package.json b/karma-app/desktop/app/package.json index 700df22f1..271c2f11c 100644 --- a/karma-app/desktop/app/package.json +++ b/karma-app/desktop/app/package.json @@ -7,9 +7,11 @@ "homepage": "http://www.isi.edu/integration/karma/", "license": "MIT", "main": "background.js", + "type": "commonjs", + "dependencies": { "fs-jetpack": "^0.9.0", - "open": "latest", + "open": "7.0.2", "tail": "latest", "dialog-polyfill": "latest" } diff --git a/karma-app/desktop/package.json b/karma-app/desktop/package.json index 6fc69d9cf..8e820dbec 100644 --- a/karma-app/desktop/package.json +++ b/karma-app/desktop/package.json @@ -1,4 +1,6 @@ { + "type": "commonjs", + "build": { "appId": "edu.isi.karma", "win": { @@ -19,6 +21,7 @@ "background": "resources/osx/dmg-background.png" } }, + "directories": { "buildResources": "resources" }, @@ -43,7 +46,7 @@ "mocha": "^3.0.2", "rollup": "^0.34.7", "source-map-support": "^0.4.2", - "spectron": "^3.3.0", + "spectron": "^13.0.0", "yargs": "^4.2.0", "electron-packager": "latest" } diff --git a/karma-common/pom.xml b/karma-common/pom.xml index 212089115..dea1eccfe 100644 --- a/karma-common/pom.xml +++ b/karma-common/pom.xml @@ -103,6 +103,7 @@ commons-fileupload commons-fileupload + 1.5 diff --git a/karma-offline/pom.xml b/karma-offline/pom.xml index e74705e34..3a7d550d1 100644 --- a/karma-offline/pom.xml +++ b/karma-offline/pom.xml @@ -56,7 +56,7 @@ org.apache.tika tika-parsers - 1.5 + 1.18 jaxen diff --git a/pom.xml b/pom.xml index cff82b487..5662fd7e4 100644 --- a/pom.xml +++ b/pom.xml @@ -240,7 +240,7 @@ commons-fileupload commons-fileupload - 1.4 + 1.5 commons-io From 86ae8a612c62367400c45d7f42324d2c170c3f5c Mon Sep 17 00:00:00 2001 From: namrata1012 Date: Thu, 20 Apr 2023 11:24:10 -0700 Subject: [PATCH 2/6] tomcat file changes --- karma-app/build | 2 +- karma-jsonld/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/karma-app/build b/karma-app/build index 64c5af9c9..d579dcf2b 100755 --- a/karma-app/build +++ b/karma-app/build @@ -48,7 +48,7 @@ unzip master.zip mv karma-app-deps-master/*.tar.gz . rm -rf karma-app-deps-master master.zip # download tomcat binary -wget https://dlcdn.apache.org/tomcat/tomcat-8/v8.5.87/bin/apache-tomcat-8.5.87.zip +wget https://dlcdn.apache.org/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88.zip unzip apache-tomcat-*.zip rm apache-tomcat-*.zip mv apache-tomcat* tomcat diff --git a/karma-jsonld/pom.xml b/karma-jsonld/pom.xml index a382999f4..2bbd95eba 100644 --- a/karma-jsonld/pom.xml +++ b/karma-jsonld/pom.xml @@ -88,7 +88,7 @@ org.apache.httpcomponents httpclient-osgi - 4.5.2 + 4.5.13 commons-logging From d964b222926f9739dab0071e354f28fda9dd04aa Mon Sep 17 00:00:00 2001 From: namrata1012 Date: Wed, 3 May 2023 21:16:57 -0700 Subject: [PATCH 3/6] update latest sec vuln --- karma-jsonld/pom.xml | 4 ++-- pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/karma-jsonld/pom.xml b/karma-jsonld/pom.xml index 2bbd95eba..1b3623a51 100644 --- a/karma-jsonld/pom.xml +++ b/karma-jsonld/pom.xml @@ -19,7 +19,7 @@ org.json json - 20141113 + 20230227 org.apache.commons @@ -49,7 +49,7 @@ com.fasterxml.jackson.core jackson-databind - 2.13.4.1 + 2.13.4.2 com.fasterxml.jackson.core diff --git a/pom.xml b/pom.xml index 5662fd7e4..bff97929c 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 2.8.9 4.5.13 29.0-jre - 5.3.20 + 5.3.27 @@ -235,7 +235,7 @@ org.json json - 20131018 + 20230227 commons-fileupload From b7f45890d65581e01a6cd64f1bb77772b2e807d9 Mon Sep 17 00:00:00 2001 From: namrata1012 Date: Mon, 15 May 2023 13:40:19 -0700 Subject: [PATCH 4/6] package json update --- karma-app/desktop/app/package.json | 2 -- karma-app/desktop/package.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/karma-app/desktop/app/package.json b/karma-app/desktop/app/package.json index 271c2f11c..a6069f0c3 100644 --- a/karma-app/desktop/app/package.json +++ b/karma-app/desktop/app/package.json @@ -7,8 +7,6 @@ "homepage": "http://www.isi.edu/integration/karma/", "license": "MIT", "main": "background.js", - "type": "commonjs", - "dependencies": { "fs-jetpack": "^0.9.0", "open": "7.0.2", diff --git a/karma-app/desktop/package.json b/karma-app/desktop/package.json index 8e820dbec..d3dac8f71 100644 --- a/karma-app/desktop/package.json +++ b/karma-app/desktop/package.json @@ -1,6 +1,4 @@ { - "type": "commonjs", - "build": { "appId": "edu.isi.karma", "win": { From adfc6f654df6242839b89d25681dbf69d311be77 Mon Sep 17 00:00:00 2001 From: P Punith Krishna Date: Thu, 18 May 2023 14:17:02 -0700 Subject: [PATCH 5/6] Bump jetty-server from 9.4.43.v20210629 to 10.0.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bff97929c..c1c2084f3 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ true - 9.4.43.v20210629 + 10.0.14 UTF-8 From 76f90d2ff089ebcb0b1404ef7554c99e689d605b Mon Sep 17 00:00:00 2001 From: P Punith Krishna Date: Thu, 18 May 2023 16:14:13 -0700 Subject: [PATCH 6/6] Downgrade jetty-server to 9.4.43.v20210629 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1c2084f3..bff97929c 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ true - 10.0.14 + 9.4.43.v20210629 UTF-8