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

Correct run behavior. Also makes sure code dependecies are available … #967

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Correct run behavior. Also makes sure code dependecies are available … #967

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
7 changes: 3 additions & 4 deletions cwms-data-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ configurations {
docker
baseLibs
tomcatLibs
testImplementation.extendsFrom(tomcatLibs)
}

configurations.implementation {
Expand Down Expand Up @@ -137,13 +138,12 @@ dependencies {
testImplementation(libs.rest.assured)
testImplementation(libs.hamcrest.all)

testImplementation(libs.bundles.tomcat.embedded)
testImplementation(libs.bundles.tomcat.support)
tomcatLibs(libs.bundles.tomcat.embedded)
tomcatLibs(libs.bundles.tomcat.support)
tomcatLibs(libs.google.flogger.api)
tomcatLibs(libs.google.flogger.backend)

testImplementation(libs.bundles.testcontainers)


testImplementation(libs.apache.commons.csv)
testImplementation(libs.cwms.tomcat.auth)
Expand Down Expand Up @@ -267,7 +267,6 @@ task integrationTests(type: Test) {
}
shouldRunAfter test
classpath += configurations.baseLibs
classpath += configurations.tomcatLibs
// The before all extension will take care of these properties
systemProperties += project.properties.findAll { k, v -> k.startsWith("RADAR") && !k.startsWith("RADAR_JDBC") }
systemProperties += project.properties.findAll { k, v -> k.startsWith("CDA") && !k.startsWith("CDA_JDBC") }
Expand Down
Loading