Skip to content

Commit 25c44c1

Browse files
committed
HV-752 Removing explicit excludes from cdi-api dependency. jboss-interceptors-api_1.1_spec does not need to be excluded anymore and exclusion of el-api is handles in the distribution assembly
1 parent a0ac9a7 commit 25c44c1

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

distribution/src/main/assembly/dist.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646
<include>javax.el:*</include>
4747
<include>org.glassfish.web:*</include>
4848
</includes>
49+
<excludes>
50+
<!-- unwanted transitive dependency from javax.enterprise:cdi-api -->
51+
<exclude>javax.el:el-api</exclude>
52+
</excludes>
4953
</dependencySet>
5054
<dependencySet>
5155
<outputDirectory>dist/lib/optional</outputDirectory>

pom.xml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -202,27 +202,17 @@
202202
<dependency>
203203
<groupId>javax.annotation</groupId>
204204
<artifactId>javax.annotation-api</artifactId>
205-
<version>1.2-b02</version>
205+
<version>1.2-b04</version>
206206
</dependency>
207207
<dependency>
208208
<groupId>org.jboss.spec.javax.interceptor</groupId>
209209
<artifactId>jboss-interceptors-api_1.2_spec</artifactId>
210-
<version>1.0.0.Alpha1</version>
210+
<version>1.0.0.Alpha3</version>
211211
</dependency>
212212
<dependency>
213213
<groupId>javax.enterprise</groupId>
214214
<artifactId>cdi-api</artifactId>
215215
<version>1.1-20130403</version>
216-
<exclusions>
217-
<exclusion>
218-
<groupId>org.jboss.spec.javax.interceptor</groupId>
219-
<artifactId>jboss-interceptors-api_1.1_spec</artifactId>
220-
</exclusion>
221-
<exclusion>
222-
<groupId>javax.el</groupId>
223-
<artifactId>el-api</artifactId>
224-
</exclusion>
225-
</exclusions>
226216
</dependency>
227217
<dependency>
228218
<groupId>org.jboss.weld</groupId>
@@ -443,7 +433,7 @@
443433
<plugin>
444434
<groupId>org.apache.maven.plugins</groupId>
445435
<artifactId>maven-javadoc-plugin</artifactId>
446-
<version>2.8.1</version>
436+
<version>2.9</version>
447437
<configuration>
448438
<docfilessubdirs>true</docfilessubdirs>
449439
<javadocDirectory>${project.basedir}/../src/main/javadoc</javadocDirectory>

0 commit comments

Comments
 (0)