DM-49777: Remove ALMATableServlet and MaxRecValidatorImpl implementations (#139)

Author: stvoutsin

build.gradle

@@ -52,8 +52,9 @@ dependencies {
     implementation 'org.opencadc:cadc-log:[1.2.1,)'
     implementation 'org.opencadc:cadc-gms:[1.0.14,2.0)'
     implementation 'org.opencadc:cadc-rest:[1.3.20,)'
-    implementation 'org.opencadc:cadc-tap-schema:[1.2.5,)'
-    implementation 'org.opencadc:cadc-tap-server:[1.1.29,)'
+    implementation 'org.opencadc:cadc-tap-schema:1.2.5'
+    implementation 'org.opencadc:cadc-tap:1.1.18'
+    implementation 'org.opencadc:cadc-tap-server:1.1.29'
     implementation 'org.opencadc:cadc-tap-server-pg:1.1.0'
     implementation 'org.opencadc:cadc-tap-server-oracle:1.2.11'
     implementation 'org.opencadc:cadc-util:[1.11.2,)'

src/main/java/org/opencadc/tap/impl/ALMATableServlet.java

@@ -7,8 +7,6 @@ ca.nrc.cadc.tap.TapQuery.langValues = ADQL ADQL-2.0
 ADQL =     org.opencadc.tap.impl.AdqlQueryImpl
 ADQL-2.0 = org.opencadc.tap.impl.AdqlQueryImpl
 
-ca.nrc.cadc.tap.MaxRecValidator.impl = org.opencadc.tap.impl.MaxRecValidatorImpl
-
 #ca.nrc.cadc.tap.UploadManager = ca.nrc.cadc.tap.DefaultUploadManager
 
 ca.nrc.cadc.tap.TableWriter = org.opencadc.tap.impl.RubinTableWriter

src/main/java/org/opencadc/tap/impl/MaxRecValidatorImpl.java

@@ -59,6 +59,12 @@
         </init-param>
     </servlet>
 
+    <servlet>
+        <servlet-name>TableServlet</servlet-name>
+        <servlet-class>ca.nrc.cadc.vosi.TableServlet</servlet-class>
+        <load-on-startup>3</load-on-startup>
+    </servlet>
+
     <!-- synchronous access to JobManager service -->
     <servlet>
         <load-on-startup>2</load-on-startup>
@@ -118,12 +124,6 @@
 
     <!-- VOSI-tables provides an XML document describing the schema/tables/columns;
          This implementation uses the TAP_SCHEMA to find the required metadata -->
-    <servlet>
-        <servlet-name>TableServlet</servlet-name>
-        <servlet-class>org.opencadc.tap.impl.ALMATableServlet</servlet-class>
-        <load-on-startup>3</load-on-startup>
-    </servlet>
-
     <servlet>
         <servlet-name>ResultsServlet</servlet-name>
         <servlet-class>org.opencadc.tap.impl.ResultsServlet</servlet-class>