Merge pull request #556 from usc-isi-i2/release0915

Release0915
usc-isi-i2 · Oct 20, 2022 · b2edf5b · b2edf5b
2 parents 2191a82 + 39119c6
commit b2edf5b
Show file tree

Hide file tree

Showing 8 changed files with 195 additions and 198 deletions.
diff --git 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.72/bin/apache-tomcat-8.5.72.zip
+wget https://dlcdn.apache.org/tomcat/tomcat-8/v8.5.83/bin/apache-tomcat-8.5.83.zip
 unzip apache-tomcat-*.zip
 rm apache-tomcat-*.zip
 mv apache-tomcat* tomcat

diff --git a/karma-common/pom.xml b/karma-common/pom.xml
@@ -29,6 +29,11 @@
         <artifactId>jersey-common</artifactId>
         <version>2.4.1</version>
     </dependency>
+	<dependency>
+		<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+		<artifactId>jersey-guava</artifactId>
+		<version>2.6</version>
+	</dependency>
     <dependency>
 	<groupId>javax.ws.rs</groupId>
 	<artifactId>javax.ws.rs-api</artifactId>