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

cavern: update cadc-util dependency for Initdatabase bug fix #247

Merged
merged 1 commit into from
Sep 13, 2024
Merged

cavern: update cadc-util dependency for Initdatabase bug fix #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cavern/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=0.7.11
VER=0.7.12
TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
unset VER
2 changes: 1 addition & 1 deletion cavern/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,)'
Expand Down
3 changes: 2 additions & 1 deletion cavern/src/main/java/org/opencadc/cavern/CavernInitAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
1 change: 1 addition & 0 deletions cavern/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading