fix: fix tomcat vulnerability

.gitignore

@@ -0,0 +1,3 @@
+.gradle
+.idea
+**/build

caom2-meta-ui/CHANGELOG.md

@@ -1,6 +1,10 @@
-# December 11th, 2017
+# CAOM-2 Meta UI (1.1.0)
 
-* Create link from Provenance reference URL on page.
-* Code clean up.
-* Browser test updates.
-* Add identifying CSS classes to HTML Table rows.
+## April 14th, 2025 (1.1.0)
+- Critical bug fix for Tomcat.
+
+## December 11th, 2017
+- Create link from Provenance reference URL on page.
+- Code clean up.
+- Browser test updates.
+- Add identifying CSS classes to HTML Table rows.

caom2-meta-ui/Dockerfile

@@ -1,4 +1,4 @@
-FROM cadc-tomcat:1
+FROM images.opencadc.org/library/cadc-tomcat:1.3
 
 # Web resources are in the caom2-search-server JAR file, so enable scanning of it.
 RUN sed -i 's/tomcat.util.scan.StandardJarScanFilter.jarsToScan=\\/tomcat.util.scan.StandardJarScanFilter.jarsToScan=\\\ncaom2-ui-server*\.jar,\\/' /etc/tomcat/catalina.properties

caom2-meta-ui/VERSION

@@ -1,4 +1,4 @@
 ## deployable containers have a semantic and build tag
 # semantic version tag: major.minor[.patch]
 # build version tag: timestamp
-TAGS="1.0-$(date -u +"%Y%m%dT%H%M%S")"
+TAGS="1.1.0 1.1.0-$(date -u +"%Y%m%dT%H%M%S")"

caom2-meta-ui/build.gradle

@@ -28,7 +28,9 @@ dependencies {
 
 apply from: '../int_test.gradle'
 
-sourceCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+}
 
 def git_url = 'https://github.com/opencadc/caom2ui'
 

caom2-search-lib/build.gradle

@@ -10,19 +10,24 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.jdom:jdom2:2.0.6'
-    implementation 'commons-io:commons-io:2.6'
+    implementation 'org.jdom:jdom2:2.0.6.1'
+    implementation 'commons-io:commons-io:2.14.0'
 
-    implementation 'org.opencadc:cadc-dali:[1.2,1.3)'
-    implementation 'org.opencadc:cadc-util:[1.5.7,2.0)'
-    implementation 'org.opencadc:cadc-uws-server:[1.2.5,1.3)'
+    implementation 'org.opencadc:cadc-dali:[1.2.25,1.3.0)'
+    implementation 'org.opencadc:cadc-registry:[1.7.7,1.8.0)'
+    implementation 'org.opencadc:cadc-util:[1.12.2,2.0)'
+    implementation 'org.opencadc:cadc-uws-server:[1.2.24,1.3)'
     implementation 'org.opencadc:jsky:[1.0,2.0)'
 
     testImplementation 'junit:junit:[4.0,5.0)'
     testImplementation 'org.mockito:mockito-core:[2.0,)'
     testImplementation 'org.easymock:easymock:[3.6,)'
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+}
+
 apply from: '../opencadc.gradle'
 
 def git_url = 'https://github.com/opencadc/caom2ui'

caom2-search-lib/src/main/java/ca/nrc/cadc/search/nameresolver/NameResolverData.java

@@ -31,7 +31,6 @@
 
 import ca.nrc.cadc.astro.CoordUtil;
 import ca.nrc.cadc.search.nameresolver.exception.ClientException;
-import ca.nrc.cadc.stc.CoordPair;
 
 import java.util.Properties;
 

opencadc.gradle

@@ -1,4 +1,3 @@
-sourceCompatibility = 1.8
 group = 'org.opencadc'
 
 def git_url = 'https://github.com/opencadc/caom2ui'