Merge pull request #26 from lsst-sqre/tickets/DM-17872

[DM-17872] Add in cadc-adql dependency with math typing
lsst-sqre · Feb 22, 2024 · 242407d · 242407d
2 parents c7f79b2 + 2db2053
commit 242407d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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

diff --git 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 ##