Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cutout extension fix #583

Merged
merged 2 commits into from
Jun 19, 2024
Merged

Cutout extension fix #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71d18eb
Upgrade nom-tam-fits.
at88mph Jun 13, 2024
82ca7ff
Availability fixes, JDK version, and date command compatibility fix w…
at88mph Jun 18, 2024
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
4 changes: 2 additions & 2 deletions luskan/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## deployable containers have a semantic and build tag
# semantic version tag: major.minor
# build version tag: timestamp
VER=1.0.0
TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")"
VER=1.0.1
TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
unset VER
2 changes: 1 addition & 1 deletion luskan/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repositories {

apply from: '../opencadc.gradle'

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

Expand Down
2 changes: 1 addition & 1 deletion luskan/src/main/java/org/opencadc/luskan/ServiceAvailability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public Availability getStatus() {
URI usersURI = null;
try {
usersURI = localAuthority.getServiceURI(Standards.UMS_USERS_01.toString());
URL url = reg.getServiceURL(credURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
URL url = reg.getServiceURL(usersURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
if (url != null) {
CheckResource checkResource = new CheckWebService(url);
checkResource.check();
Expand Down
4 changes: 2 additions & 2 deletions minoc/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# tags with and without build number so operators use the versioned
# tag but we always keep a timestamped tag in case a semantic tag gets
# replaced accidentally
VER=1.0.4
TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")"
VER=1.0.5
TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
unset VER
46 changes: 23 additions & 23 deletions minoc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repositories {

apply from: '../opencadc.gradle'

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

Expand All @@ -26,33 +26,33 @@ war {
}

dependencies {
compile 'org.opencadc:cadc-util:[1.10.2,2.0)'
compile 'org.opencadc:cadc-log:[1.1.6,2.0)'
compile 'org.opencadc:cadc-registry:[1.7,)'
compile 'org.opencadc:cadc-vosi:[1.4.3,2.0)'
compile 'org.opencadc:cadc-rest:[1.3.14,)'
compile 'org.opencadc:cadc-cdp:[1.0,)'
compile 'org.opencadc:cadc-data-ops-fits:[0.3.0,)'
compile 'org.opencadc:cadc-gms:[1.0.0,)'
compile 'org.opencadc:cadc-inventory:[1.0,2.0)'
compile 'org.opencadc:cadc-inventory-db:[1.0,2.0)'
compile 'org.opencadc:cadc-soda-server:[1.2.0,2.0.0)'
compile 'org.opencadc:cadc-storage-adapter:[1.0,)'
compile 'org.opencadc:cadc-permissions:[0.3.1,)'
compile 'org.opencadc:cadc-permissions-client:[0.3,)'
compile 'org.opencadc:cadc-gms:[1.0,)'
implementation 'org.opencadc:cadc-util:[1.10.2,2.0)'
implementation 'org.opencadc:cadc-log:[1.1.6,2.0)'
implementation 'org.opencadc:cadc-registry:[1.7,)'
implementation 'org.opencadc:cadc-vosi:[1.4.3,2.0)'
implementation 'org.opencadc:cadc-rest:[1.3.14,)'
implementation 'org.opencadc:cadc-cdp:[1.0,)'
implementation 'org.opencadc:cadc-data-ops-fits:[0.4.0,)'
implementation 'org.opencadc:cadc-gms:[1.0.0,)'
implementation 'org.opencadc:cadc-inventory:[1.0,2.0)'
implementation 'org.opencadc:cadc-inventory-db:[1.0,2.0)'
implementation 'org.opencadc:cadc-soda-server:[1.2.0,2.0.0)'
implementation 'org.opencadc:cadc-storage-adapter:[1.0,)'
implementation 'org.opencadc:cadc-permissions:[0.3.1,)'
implementation 'org.opencadc:cadc-permissions-client:[0.3,)'
implementation 'org.opencadc:cadc-gms:[1.0,)'

compile 'gov.nasa.gsfc.heasarc:nom-tam-fits:1.18.0'
implementation 'gov.nasa.gsfc.heasarc:nom-tam-fits:1.20.0'

testCompile 'junit:junit:[4.0,)'
testCompile 'org.opencadc:cadc-storage-adapter-fs:[0.9.3,)'
testImplementation 'junit:junit:[4.0,)'
testImplementation 'org.opencadc:cadc-storage-adapter-fs:[0.9.3,)'

intTestCompile 'org.opencadc:cadc-test-vosi:[1.0.11,)'

runtime 'org.opencadc:cadc-access-control-identity:[1.2.1,2.0)'
runtime 'org.opencadc:cadc-storage-adapter-fs:[0.9.3,)'
runtime 'org.opencadc:cadc-storage-adapter-ad:[0.7.0,)'
runtime 'org.opencadc:cadc-storage-adapter-swift:[0.8.7,)'
runtimeOnly 'org.opencadc:cadc-access-control-identity:[1.2.1,2.0)'
runtimeOnly 'org.opencadc:cadc-storage-adapter-fs:[0.9.3,)'
runtimeOnly 'org.opencadc:cadc-storage-adapter-ad:[0.7.0,)'
runtimeOnly 'org.opencadc:cadc-storage-adapter-swift:[0.8.7,)'
}

configurations {
Expand Down
2 changes: 1 addition & 1 deletion minoc/src/main/java/org/opencadc/minoc/ServiceAvailability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public Availability getStatus() {
URI usersURI = null;
try {
usersURI = localAuthority.getServiceURI(Standards.UMS_USERS_01.toString());
URL url = reg.getServiceURL(credURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
URL url = reg.getServiceURL(usersURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
if (url != null) {
CheckResource checkResource = new CheckWebService(url);
checkResource.check();
Expand Down
2 changes: 1 addition & 1 deletion vault/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
# tag but we always keep a timestamped tag in case a semantic tag gets
# replaced accidentally
VER=1.0.6
TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")"
TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
unset VER
2 changes: 1 addition & 1 deletion vault/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repositories {

apply from: '../opencadc.gradle'

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

Expand Down
2 changes: 1 addition & 1 deletion vault/src/main/java/org/opencadc/vault/ServiceAvailability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public Availability getStatus() {
URI usersURI = null;
try {
usersURI = localAuthority.getServiceURI(Standards.UMS_USERS_01.toString());
URL url = reg.getServiceURL(credURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
URL url = reg.getServiceURL(usersURI, Standards.VOSI_AVAILABILITY, AuthMethod.ANON);
if (url != null) {
CheckResource checkResource = new CheckWebService(url);
checkResource.check();
Expand Down
Loading