Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 7 additions & 0 deletions .github/workflows/Java_CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ jobs:
distribution: 'temurin'
cache: 'gradle'

- name: Ensure old Lookup library is not resolved
shell: bash
run: |
./gradlew -PcvmUserId="dwr-wrims-build" -PcvmPassword="${{ secrets.WRIMS_ENGINE_DEPENDENCIES_TOKEN }}" \
:wrims-core:dependencyInsight --dependency lookup --configuration runtimeClasspath \
| grep -qE "^mil\.army\.usace\.hec:lookup:[^:\s]+$" && exit 1 || exit 0

- name: Build with Gradle
run: |
./gradlew clean -PcvmUserId="dwr-wrims-build" -PcvmPassword="${{ secrets.WRIMS_ENGINE_DEPENDENCIES_TOKEN }}"
Expand Down
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,12 @@ tasks.register('copyDependencies', Copy) {
allprojects {
group = 'gov.ca.water'
version = versionLabel(versionDetails())

// JDK 21+ resolution for Lookup library bug: Issue #194
configurations.configureEach {
resolutionStrategy.dependencySubstitution {substitution ->
substitution.substitute(module("mil.army.usace.hec:lookup")).using(module(libs.lookup.compat.get().toString()))
.because("WRIMS uses upstream NetBeans Lookup for Java 21 Compatibility.")
}
}
}
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
hec-monolith = "6.0.0"
#dssgui is not used by wrims-engine, but is is being included in the wrims-engine bom and should be kept in sync with hec-monolith for downstream projects.
dssgui = "3.4.18"
lookup = "4.0.0"
guava = "33.4.8-jre"
commons-io = "2.1"
xstream = "1.4.3"
Expand Down Expand Up @@ -36,6 +37,7 @@ azure-storage-blob = "12.28.0"
hec-monolith = { module = "mil.army.usace.hec:hec-monolith", version.ref = "hec-monolith" }
hec-monolith-bom = { module = "mil.army.usace.hec:hec-monolith-bom", version.ref = "hec-monolith" }
dssgui = { module = "mil.army.usace.hec:dssgui", version.ref = "dssgui" }
lookup-compat = { module = "mil.army.usace.hec:lookup-compat", version.ref = "lookup" }
guava = { module = "com.google.guava:guava", version.ref = "guava" }
commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
xstream = { module = "com.thoughtworks.xstream:xstream", version.ref = "xstream" }
Expand Down
8 changes: 4 additions & 4 deletions wrims-comparison-test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,24 +102,24 @@ From repository root (where `gradlew.bat` resides):

- Run only the Azure Cucumber suite:
```
./gradlew.bat :wrims-engine:wrims-comparison-test:runAzureCucumberTests
./gradlew.bat :wrims-comparison-test:runAzureCucumberTests
```
- Ensure `.env.cucumber` exists or pass a token explicitly, e.g.:
```
./gradlew.bat :wrims-engine:wrims-comparison-test:runAzureCucumberTests -Dwrims.azure.sas="sv=...&sig=..."
./gradlew.bat :wrims-comparison-test:runAzureCucumberTests -Dwrims.azure.sas="sv=...&sig=..."
```

- Generate compute and comparison report locally (CalLite example):
```
./gradlew.bat :wrims-engine:wrims-comparison-test:testReport
./gradlew.bat :wrims-comparison-test:testReport
```
- Outputs:
- `wrims-engine/wrims-comparison-test/build/testProjects/Callite_update_compare_6_6.pdf`
- Optional: `..._VALIDATION_FAILURES.csv` if validations fail.

- Clear temporary extracted projects:
```
./gradlew.bat :wrims-engine:wrims-comparison-test:clear-tmp-projects
./gradlew.bat :wrims-comparison-test:clear-tmp-projects
```

---
Expand Down
Loading