From c3f1fc7211961fe2992f9254c48af6090678be13 Mon Sep 17 00:00:00 2001 From: Christine Banek Date: Thu, 22 Feb 2024 13:33:06 -0700 Subject: [PATCH 1/2] [DM-17872] Add in cadc-adql dependency with math typing --- tap/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tap/build.gradle b/tap/build.gradle index e87b59f..2a435d5 100644 --- a/tap/build.gradle +++ b/tap/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation 'org.opencadc:cadc-uws-server:[1.2,)' implementation 'org.opencadc:cadc-tap-server:[1.1.5,)' implementation 'org.opencadc:cadc-vosi:[1.0,)' - implementation 'org.opencadc:cadc-adql:[1.1,)' + implementation 'org.opencadc:cadc-adql:[1.1.13,)' // Switch out this to use any supported database instead of PostgreSQL. // ## START CUSTOM DATABASE ## From 2db2053d26637a459bb4429e2614fdb0f7c12059 Mon Sep 17 00:00:00 2001 From: Christine Banek Date: Thu, 22 Feb 2024 14:23:41 -0700 Subject: [PATCH 2/2] [DM-17872] Fix mock pg build It was failing where that file was no longer available on disk, with errors mentioning it couldn't read the gpg file for PGDG. --- docker/cadc-postgresql-dev/Dockerfile.pg12 | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/cadc-postgresql-dev/Dockerfile.pg12 b/docker/cadc-postgresql-dev/Dockerfile.pg12 index 473e85e..543f6ca 100644 --- a/docker/cadc-postgresql-dev/Dockerfile.pg12 +++ b/docker/cadc-postgresql-dev/Dockerfile.pg12 @@ -8,7 +8,6 @@ ARG PGSPHERE=https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/software/pgsphere12-1. RUN yum -y install centos-release-scl epel-release ${PGDG} \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo \ - && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG \ && rpm -q gpg-pubkey --qf '%{NAME}-%{VERSION}-%{RELEASE}\t%{SUMMARY}\n' # packages