Commit e7b14ea
committed
Manage cdi-api at version 1.2
This avoids a conflict where:
1. org.sonatype.sisu:sisu-inject-bean:2.6.0
depends on javax.enterprise:cdi-api:1.0
depends on javax.annotation:jsr250-api:1.0
2. org.eclipse.jetty:jetty-annotations:9.4.26.v20200117
depends on javax.annotation:javax.annotation-api:1.3
with jsr250-api and javax.annotation-api having the same classes.1 parent 973aaab commit e7b14ea
1 file changed
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
884 | 884 | | |
885 | 885 | | |
886 | 886 | | |
| 887 | + | |
| 888 | + | |
| 889 | + | |
887 | 890 | | |
888 | 891 | | |
889 | 892 | | |
| |||
3184 | 3187 | | |
3185 | 3188 | | |
3186 | 3189 | | |
| 3190 | + | |
| 3191 | + | |
| 3192 | + | |
| 3193 | + | |
| 3194 | + | |
| 3195 | + | |
| 3196 | + | |
3187 | 3197 | | |
3188 | 3198 | | |
3189 | 3199 | | |
| |||
0 commit comments