Merge branch 'master'

usc-isi-i2 · Aug 31, 2023 · c5f70c7 · c5f70c7
2 parents 361c034 + 0539261
commit c5f70c7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/karma-app/build b/karma-app/build
@@ -48,7 +48,8 @@ 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.88/bin/apache-tomcat-8.5.88.zip
+wget https://archive.apache.org/dist/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-app/desktop/app/package.json b/karma-app/desktop/app/package.json
@@ -7,6 +7,8 @@
   "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
@@ -47,5 +47,6 @@
     "spectron": "^13.0.0",
     "yargs": "^4.2.0",
     "electron-packager": "latest"
-  }
+  },
+  "type": "commonjs"
 }
diff --git a/karma-offline/pom.xml b/karma-offline/pom.xml
@@ -51,7 +51,7 @@
 		<dependency>
 			<groupId>org.apache.tika</groupId>
 			<artifactId>tika-core</artifactId>
-			<version>1.23</version>
+			<version>1.28.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tika</groupId>

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
 
 	<properties>
 		<skipTests>true</skipTests>
-    <jettyVersion>9.4.43.v20210629</jettyVersion>
+    <jettyVersion>9.4.51.v20230217</jettyVersion>
     <project.build.sourceEncoding>
       UTF-8
     </project.build.sourceEncoding>
@@ -73,7 +73,7 @@
 
 	  <gson.version>2.8.9</gson.version>
 	  <httpcomponents.version>4.5.13</httpcomponents.version>
-	  <guava.version>29.0-jre</guava.version>
+	  <guava.version>32.1.2-jre</guava.version>
 	  <spring.version>5.3.27</spring.version>
 
   </properties>