Merge pull request #28 from lsst-sqre/tickets/DM-44607

Bump cadc dependency versions & switch to using cadc-tomcat image
lsst-sqre · Jun 7, 2024 · 00817d0 · 00817d0
2 parents 8e141c8 + 642f5d1
commit 00817d0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/docker/tap/Dockerfile b/docker/tap/Dockerfile
@@ -1,4 +1,6 @@
-FROM tomcat:9.0
+FROM images.opencadc.org/library/cadc-tomcat:1
+
+LABEL org.opencontainers.image.source = "https://github.com/lsst-sqre/tap-postgres"
+
+COPY *.war /usr/share/tomcat/webapps
 
-RUN rm -rf webapps/*
-ADD *.war webapps/
diff --git a/tap/build.gradle b/tap/build.gradle
@@ -17,25 +17,32 @@ version = '1.1'
 
 dependencies {
     implementation 'log4j:log4j:1.2.+'
-    implementation 'org.opencadc:cadc-adql:1.1.13'
-    implementation 'org.opencadc:cadc-cdp:1.3.7'
-    implementation 'org.opencadc:cadc-dali:1.2.17'
+    implementation 'org.opencadc:cadc-log:1.2.1'
+    implementation 'org.opencadc:cadc-util:1.11.2'
+    implementation 'org.opencadc:cadc-dali:1.2.18'
+    implementation 'org.opencadc:cadc-uws:1.0.5'
+    implementation 'org.opencadc:cadc-uws-server:1.2.20'
+    implementation 'org.opencadc:cadc-tap-server:1.1.24'
+    implementation 'org.opencadc:cadc-vosi:1.4.6'
+    implementation 'org.opencadc:cadc-adql:1.1.14'
+    implementation 'org.opencadc:cadc-cdp:1.4.0'
     implementation 'org.opencadc:cadc-dali-pg:0.3.1'
     implementation 'org.opencadc:cadc-gms:1.0.12'
     implementation 'org.opencadc:cadc-jsqlparser-compat:0.6.5'
     implementation 'org.opencadc:cadc-log:1.2.1'
     implementation 'org.opencadc:cadc-registry:1.7.6'
-    implementation 'org.opencadc:cadc-rest:1.3.18'
+    implementation 'org.opencadc:cadc-rest:1.3.20'
     implementation 'org.opencadc:cadc-tap:1.1.16'
     implementation 'org.opencadc:cadc-tap-schema:1.1.32'
     implementation 'org.opencadc:cadc-tap-server:1.1.23'
-    implementation 'org.opencadc:cadc-tap-server-pg:1.0.5'
+    implementation 'org.opencadc:cadc-tap-server-pg:1.1.0'
     implementation 'org.opencadc:cadc-util:1.10.6'
     implementation 'org.opencadc:cadc-uws:1.0.5'
     implementation 'org.opencadc:cadc-uws-server:1.2.20'
     implementation 'org.opencadc:cadc-tap-server:1.1.23'
     implementation 'org.opencadc:cadc-vosi:1.4.4'
     implementation 'org.opencadc:cadc-adql:1.1.13'
+
     // Switch out this to use any supported database instead of PostgreSQL.
     // ## START CUSTOM DATABASE ##
     implementation group: 'mysql', name: 'mysql-connector-java', version: '8.0.13'