From 4f9a75a4b7e00f4bdf273217e4a487d01c48f11a Mon Sep 17 00:00:00 2001
From: Patrick Dowler <pdowler.cadc@gmail.com>
Date: Thu, 12 Sep 2024 16:55:09 -0700
Subject: [PATCH] cavern: update cadc-util dependency for Initdatabase bug fix
 make sure InitDatabase is logged at info level on startup

---
 cavern/VERSION                                                 | 2 +-
 cavern/build.gradle                                            | 2 +-
 cavern/src/main/java/org/opencadc/cavern/CavernInitAction.java | 3 ++-
 cavern/src/main/webapp/WEB-INF/web.xml                         | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cavern/VERSION b/cavern/VERSION
index 64424992..2a1b4491 100644
--- a/cavern/VERSION
+++ b/cavern/VERSION
@@ -1,6 +1,6 @@
 ## deployable containers have a semantic and build tag
 # semantic version tag: major.minor
 # build version tag: timestamp
-VER=0.7.11
+VER=0.7.12
 TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
 unset VER
diff --git a/cavern/build.gradle b/cavern/build.gradle
index 4e00a171..4ca24b99 100644
--- a/cavern/build.gradle
+++ b/cavern/build.gradle
@@ -29,7 +29,7 @@ dependencies {
     providedCompile 'javax.servlet:javax.servlet-api:[3.1.0,)'
     implementation 'commons-net:commons-net:[2.0,)'
 
-    implementation 'org.opencadc:cadc-util:[1.11.2,)'
+    implementation 'org.opencadc:cadc-util:[1.11.4,)'
     implementation 'org.opencadc:cadc-util-fs:[1.1.2,)'
     implementation 'org.opencadc:cadc-log:[1.0,)'
     implementation 'org.opencadc:cadc-permissions:[0.3.3,)'
diff --git a/cavern/src/main/java/org/opencadc/cavern/CavernInitAction.java b/cavern/src/main/java/org/opencadc/cavern/CavernInitAction.java
index c7710dba..960fa577 100644
--- a/cavern/src/main/java/org/opencadc/cavern/CavernInitAction.java
+++ b/cavern/src/main/java/org/opencadc/cavern/CavernInitAction.java
@@ -109,10 +109,11 @@ public void doInit() {
     
     private void initDatabase() {
         try {
-            // Init UWS database
+            log.info("InitDatabaseUWS: START");
             DataSource uws = DBUtil.findJNDIDataSource("jdbc/uws");
             InitDatabaseUWS uwsi = new InitDatabaseUWS(uws, null, "uws");
             uwsi.doInit();
+            log.info("InitDatabaseUWS: OK");
         }  catch (Exception ex) {
             throw new RuntimeException("INIT FAIL", ex);
         }
diff --git a/cavern/src/main/webapp/WEB-INF/web.xml b/cavern/src/main/webapp/WEB-INF/web.xml
index f6b332aa..b9fe76e0 100644
--- a/cavern/src/main/webapp/WEB-INF/web.xml
+++ b/cavern/src/main/webapp/WEB-INF/web.xml
@@ -27,6 +27,7 @@
             <param-value>
             org.opencadc.cavern
             org.opencadc.vospace
+            ca.nrc.cadc.db.version
             ca.nrc.cadc.rest
             ca.nrc.cadc.vosi
             ca.nrc.cadc.auth