FURNACE-142: Refined dependency hierarchy

forge · May 15, 2017 · c2c2d0f · c2c2d0f
1 parent 690d08a
commit c2c2d0f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 34 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -14,22 +14,10 @@
       <dependency>
          <groupId>javax.enterprise</groupId>
          <artifactId>cdi-api</artifactId>
-         <exclusions>
-            <!-- Excluding outdated jsr250-->
-            <exclusion>
-               <groupId>javax.annotation</groupId>
-               <artifactId>jsr250-api</artifactId>
-            </exclusion>
-            <!-- Excluding EL -->
-            <exclusion>
-               <artifactId>el-api</artifactId>
-               <groupId>javax.el</groupId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.annotation</groupId>
-         <artifactId>jboss-annotations-api_1.2_spec</artifactId>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
       </dependency>
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -32,24 +32,22 @@
          <artifactId>weld-se-core</artifactId>
          <exclusions>
             <exclusion>
-               <groupId>javax.el</groupId>
-               <artifactId>javax.el-api</artifactId>
+               <groupId>org.jboss.weld.probe</groupId>
+               <artifactId>weld-probe-core</artifactId>
             </exclusion>
             <exclusion>
-               <groupId>org.codehaus.groovy</groupId>
-               <artifactId>groovy-all</artifactId>
+               <groupId>org.jboss.spec.javax.el</groupId>
+               <artifactId>jboss-el-api_3.0_spec</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.interceptor</groupId>
+               <artifactId>jboss-interceptors-api_1.2_spec</artifactId>
             </exclusion>
          </exclusions>
       </dependency>
       <dependency>
-         <groupId>org.glassfish.web</groupId>
+         <groupId>org.glassfish</groupId>
          <artifactId>javax.el</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.el</groupId>
-               <artifactId>javax.el-api</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss</groupId>

diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
@@ -43,13 +44,13 @@
       <forge.scm.url>http://github.com/forge/furnace-cdi</forge.scm.url>
       <maven.compiler.target>1.8</maven.compiler.target>
       <maven.compiler.source>1.8</maven.compiler.source>
-      
+
       <!-- This version is bound to the Weld version -->
-      <version.annotations>1.0.0.Final</version.annotations>
+      <version.annotation>1.3</version.annotation>
       <version.cdi>2.0</version.cdi>
       <version.jandex>2.0.3.Final</version.jandex>
       <version.furnace>${project.version}</version.furnace>
-      <version.javax.el>2.2.4</version.javax.el>
+      <version.javax.el>3.0.1-b08</version.javax.el>
       <version.weld>3.0.0.Final</version.weld>
       <version.junit>4.12</version.junit>
    </properties>
@@ -105,11 +106,10 @@
             <artifactId>cdi-api</artifactId>
             <version>${version.cdi}</version>
          </dependency>
-         <!-- Common Annotations -->
          <dependency>
-            <groupId>org.jboss.spec.javax.annotation</groupId>
-            <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-            <version>${version.annotations}</version>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${version.annotation}</version>
          </dependency>
 
          <!-- Weld -->
@@ -119,7 +119,7 @@
             <version>${version.weld}</version>
          </dependency>
          <dependency>
-            <groupId>org.glassfish.web</groupId>
+            <groupId>org.glassfish</groupId>
             <artifactId>javax.el</artifactId>
             <version>${version.javax.el}</version>
          </dependency>