Commit b2ab1bf
committed
Merge upstream/develop: Update slf4j-api to 2.0.17 for Jakarta EE 10 compatibility
- Resolved conflict: Keep slf4j-api 2.0.17 (required for Jakarta EE 10)
- Upstream tried to use 1.7.36 which is incompatible with Jakarta namespace
- Updated expected-pom.xml to reflect correct SLF4J 2.x version1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
415 | 415 | | |
416 | 416 | | |
417 | 417 | | |
418 | | - | |
| 418 | + | |
419 | 419 | | |
420 | 420 | | |
421 | 421 | | |
| |||
0 commit comments