Skip to content

Commit e7b14ea

Browse files
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

File tree

pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -884,6 +884,9 @@
884884
<batik-xml.version>${batik.version}</batik-xml.version>
885885
<xmlgraphics-commons.version>2.4</xmlgraphics-commons.version>
886886

887+
<!-- CDI - http://cdi-spec.org/ -->
888+
<cdi-api.version>1.2</cdi-api.version>
889+
887890
<!-- Commons BeanUtils - https://commons.apache.org/proper/commons-beanutils/ -->
888891
<commons-beanutils.version>1.9.4</commons-beanutils.version>
889892

@@ -3184,6 +3187,13 @@
31843187
<version>${xmlgraphics-commons.version}</version>
31853188
</dependency>
31863189

3190+
<!-- CDI - http://cdi-spec.org/ -->
3191+
<dependency>
3192+
<groupId>javax.enterprise</groupId>
3193+
<artifactId>cdi-api</artifactId>
3194+
<version>${cdi-api.version}</version>
3195+
</dependency>
3196+
31873197
<!-- Commons BeanUtils - https://commons.apache.org/proper/commons-beanutils/ -->
31883198
<dependency>
31893199
<groupId>commons-beanutils</groupId>

0 commit comments

Comments
 (0)