Merge pull request #589 from pdowler/main

luskan: fix availability to test the jdbc/uws pool
opencadc · Sep 4, 2024 · 85e1db5 · 85e1db5
2 parents afa9d16 + 5626f97
commit 85e1db5
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/luskan/VERSION b/luskan/VERSION
@@ -1,6 +1,6 @@
 ## deployable containers have a semantic and build tag
 # semantic version tag: major.minor
 # build version tag: timestamp
-VER=1.0.2
+VER=1.0.3
 TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
 unset VER
diff --git a/luskan/src/main/java/org/opencadc/luskan/ServiceAvailability.java b/luskan/src/main/java/org/opencadc/luskan/ServiceAvailability.java
@@ -132,7 +132,7 @@ public Availability getStatus() {
             cr = new CheckDataSource("jdbc/tapadm", TAP_TEST);
             cr.check();
 
-            cr = new CheckDataSource("jdbc/tapadm", UWS_TEST);
+            cr = new CheckDataSource("jdbc/uws", UWS_TEST);
             cr.check();
 
             // check other services we depend on

diff --git a/storage-inventory-dm/src/main/resources/storage-inventory-0.1-vodml.xml b/storage-inventory-dm/src/main/resources/storage-inventory-0.1-vodml.xml
@@ -50,7 +50,7 @@
 *  or FITNESS FOR A PARTICULAR          ni d’ADÉQUATION À UN OBJECTIF
 *  PURPOSE.                             PARTICULIER. 
 -->
-<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema" version="1.0">
+<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema">
     <name>si</name>
     <description>a general purpose data model for managing storage inventory</description>
     <identifier/>

diff --git a/storage-inventory-dm/src/main/resources/storage-inventory-0.2-vodml.xml b/storage-inventory-dm/src/main/resources/storage-inventory-0.2-vodml.xml
@@ -50,7 +50,7 @@
 *  or FITNESS FOR A PARTICULAR          ni d’ADÉQUATION À UN OBJECTIF
 *  PURPOSE.                             PARTICULIER. 
 -->
-<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema" version="1.0">
+<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema">
     <name>si</name>
     <description>a general purpose data model for managing storage inventory</description>
     <identifier/>

diff --git a/storage-inventory-dm/src/main/resources/storage-inventory-0.3-vodml.xml b/storage-inventory-dm/src/main/resources/storage-inventory-0.3-vodml.xml
@@ -50,7 +50,7 @@
 *  or FITNESS FOR A PARTICULAR          ni d’ADÉQUATION À UN OBJECTIF
 *  PURPOSE.                             PARTICULIER. 
 -->
-<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema" version="1.0">
+<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema">
     <name>si</name>
     <description>a general purpose data model for managing storage inventory</description>
     <identifier/>

diff --git a/storage-inventory-dm/src/main/resources/storage-inventory-0.4-vodml.xml b/storage-inventory-dm/src/main/resources/storage-inventory-0.4-vodml.xml
@@ -50,7 +50,7 @@
 *  or FITNESS FOR A PARTICULAR          ni d’ADÉQUATION À UN OBJECTIF
 *  PURPOSE.                             PARTICULIER. 
 -->
-<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema" version="1.0">
+<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema">
     <name>si</name>
     <description>a general purpose data model for managing storage inventory</description>
     <identifier/>

diff --git a/storage-inventory-dm/src/main/resources/storage-inventory-0.5-vodml.xml b/storage-inventory-dm/src/main/resources/storage-inventory-0.5-vodml.xml
@@ -50,7 +50,7 @@
 *  or FITNESS FOR A PARTICULAR          ni d’ADÉQUATION À UN OBJECTIF
 *  PURPOSE.                             PARTICULIER. 
 -->
-<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema" version="1.0">
+<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema">
     <name>si</name>
     <description>a general purpose data model for managing storage inventory</description>
     <identifier/>

diff --git a/storage-inventory-dm/src/main/resources/storage-inventory-0.6-vodml.xml b/storage-inventory-dm/src/main/resources/storage-inventory-0.6-vodml.xml
@@ -50,7 +50,7 @@
 *  or FITNESS FOR A PARTICULAR          ni d’ADÉQUATION À UN OBJECTIF
 *  PURPOSE.                             PARTICULIER. 
 -->
-<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema" version="1.0">
+<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema">
     <name>si</name>
     <description>a general purpose data model for managing storage inventory</description>
     <identifier/>

diff --git a/storage-inventory-dm/src/main/resources/vospace-storage-inventory-0.1-vodml.xml b/storage-inventory-dm/src/main/resources/vospace-storage-inventory-0.1-vodml.xml
@@ -50,7 +50,7 @@
 *  or FITNESS FOR A PARTICULAR          ni d’ADÉQUATION À UN OBJECTIF
 *  PURPOSE.                             PARTICULIER. 
 -->
-<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema" version="1.0">
+<vo-dml:model xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema">
     <name>vos</name>
     <description>vospace data model layed on storage inventory</description>
     <identifier/>