Merge pull request #228 from pdowler/master

cadc-util, cadc-rest: update dependencies for CVE vulnerabilities
opencadc · Aug 17, 2023 · d390b3b · d390b3b
2 parents 79fb915 + 4f0d82c
commit d390b3b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/cadc-rest/build.gradle b/cadc-rest/build.gradle
@@ -16,13 +16,13 @@ sourceCompatibility = 1.8
 
 group = 'org.opencadc'
 
-version = '1.3.16'
+version = '1.3.17'
 
 description = 'OpenCADC REST server library'
 def git_url = 'https://github.com/opencadc/core'
 
 dependencies {
-    compile 'commons-fileupload:commons-fileupload:1.4'
+    compile 'commons-fileupload:commons-fileupload:1.5'
     compile 'javax.servlet:javax.servlet-api:3.1.0'
     compile 'org.opencadc:cadc-util:[1.9.5,2.0)'
     compile 'org.opencadc:cadc-registry:[1.5,)'

diff --git a/cadc-util/build.gradle b/cadc-util/build.gradle
@@ -16,7 +16,7 @@ sourceCompatibility = 1.8
 
 group = 'org.opencadc'
 
-version = '1.9.8'
+version = '1.9.9'
 
 description = 'OpenCADC core utility library'
 def git_url = 'https://github.com/opencadc/core'
@@ -33,11 +33,13 @@ dependencies {
     compile 'org.apache.logging.log4j:log4j-core:2.17.2'
     compile 'org.apache.logging.log4j:log4j:2.17.2'
 
+    compile 'org.bouncycastle:bcprov-jdk15on:1.46'
     compile 'javax.servlet:javax.servlet-api:3.1.0'
-    compile 'org.json:json:20220924'
+    compile 'org.json:json:20230227'
     compile 'xerces:xercesImpl:[2.12.2,)'
     compile 'org.jdom:jdom2:2.0.6.1'
-    compile 'org.springframework:spring-jdbc:5.2.22.RELEASE'
+    //compile 'org.springframework:spring-jdbc:5.2.22.RELEASE'
+    compile 'org.springframework:spring-jdbc:5.2.24.RELEASE'
     compile 'org.apache.commons:commons-dbcp2:[2.8.0,2.9.0)'
 
     testCompile 'junit:junit:4.13'