Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions argus/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ dependencies {
implementation 'org.opencadc:cadc-vosi:[1.4.12,2.0)'
implementation 'org.opencadc:cadc-dali:[1.2.28,)'
implementation 'org.opencadc:cadc-dali-pg:[0.4.0,)'
implementation 'org.opencadc:cadc-dali-parquet:[0.5.3,)'
implementation 'org.opencadc:cadc-cdp:[1.4.0,)'
implementation 'org.opencadc:cadc-gms:[1.0.0,)'
runtimeOnly 'org.opencadc:cadc-access-control-identity:[1.1.0,2.0)'
Expand All @@ -56,7 +55,11 @@ dependencies {
runtimeOnly 'com.nimbusds:nimbus-jose-jwt:[9.37.4,)'
// this breaks CI build on gradle 6 because of library variants
//runtimeOnly 'com.google.guava:guava:33.5.0-jre'


// parquet support currently disabled because of CVEs but needed for test code compile
//implementation 'org.opencadc:cadc-dali-parquet:[0.5.3,)'
testImplementation 'org.opencadc:cadc-dali-parquet:[0.5.3,)'

testImplementation 'org.opencadc:cadc-tap:[1.0,)'
testImplementation 'junit:junit:[4.1,5.0)'
testImplementation 'org.postgresql:postgresql:[42.0,)'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import static org.opencadc.argus.AuthQueryTest.syncURL;
import org.opencadc.tap.TapClient;
Expand All @@ -104,9 +105,10 @@ public ParquetOutputTest() {
}

@Test
@Ignore // disabled: see build.gradle comment
public void testParquetOutput() throws Exception {
TapClient tap = new TapClient(Constants.RESOURCE_ID);
final URL tapURL = tap.getSyncURL(Standards.SECURITY_METHOD_CERT);
final URL tapURL = tap.getSyncURL(Standards.SECURITY_METHOD_ANON);
log.info(" sync: " + syncURL);

// hits duplicate column name bug in ParquetWriter:
Expand Down
2 changes: 2 additions & 0 deletions argus/src/main/webapp/capabilities.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,12 @@
<alias>tsv</alias>
</outputFormat>

<!--
<outputFormat>
<mime>application/vnd.apache.parquet</mime>
<alias>parquet</alias>
</outputFormat>
-->

<uploadMethod ivo-id="ivo://ivoa.net/std/TAPRegExt#upload-inline"/>
<uploadMethod ivo-id="ivo://ivoa.net/std/TAPRegExt#upload-http"/>
Expand Down
Loading