JavaEE7 API dependency should be checked before adding specific spec …

…dependencies
forge · Apr 7, 2014 · 52f3fbb · 52f3fbb
1 parent 6cad4a6
commit 52f3fbb
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 17 deletions.
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/AbstractJavaEEFacet.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/AbstractJavaEEFacet.java
@@ -24,10 +24,10 @@
 
 /**
  * A base facet implementation for Facets which require Java EE library APIs to be installed.
- * 
+ *
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
- * 
+ *
  */
 public abstract class AbstractJavaEEFacet extends AbstractFacet<Project> implements ProjectFacet
 {
@@ -36,6 +36,10 @@ public abstract class AbstractJavaEEFacet extends AbstractFacet<Project> impleme
             DependencyBuilder.create("org.jboss.spec:jboss-javaee-6.0").setScopeType("import")
                      .setPackaging("pom").setVersion("3.0.2.Final");
 
+   protected static final Dependency JAVAEE7 =
+            DependencyBuilder.create().setGroupId("javax").setArtifactId("javaee-api").setVersion("7.0")
+                     .setScopeType("provided");
+
    private final DependencyInstaller installer;
 
    @Inject

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/CDIFacetImpl_1_1.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/CDIFacetImpl_1_1.java
@@ -89,11 +89,11 @@ protected Map<Dependency, List<Dependency>> getRequiredDependencyOptions()
    {
       Map<Dependency, List<Dependency>> result = new LinkedHashMap<>();
 
-      result.put(CDI_API, Arrays.asList(CDI_API));
+      result.put(CDI_API, Arrays.asList(CDI_API, JAVAEE7));
       result.put(JAVAX_ANNOTATION_API,
-               Arrays.asList(JAVAX_ANNOTATION_API, JBOSS_ANNOTATION_API_1_1, JBOSS_ANNOTATION_API_1_2));
-      result.put(JAVAX_INJECT, Arrays.asList(JAVAX_INJECT));
-      result.put(JAVAX_INTERCEPTOR_API, Arrays.asList(JAVAX_INTERCEPTOR_API));
+               Arrays.asList(JAVAX_ANNOTATION_API, JBOSS_ANNOTATION_API_1_1, JBOSS_ANNOTATION_API_1_2, JAVAEE7));
+      result.put(JAVAX_INJECT, Arrays.asList(JAVAX_INJECT, JAVAEE7));
+      result.put(JAVAX_INTERCEPTOR_API, Arrays.asList(JAVAX_INTERCEPTOR_API, JAVAEE7));
 
       return result;
    }

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/ejb/EJBFacetImpl_3_2.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/ejb/EJBFacetImpl_3_2.java
@@ -44,7 +44,7 @@ protected Map<Dependency, List<Dependency>> getRequiredDependencyOptions()
    {
       Map<Dependency, List<Dependency>> result = new HashMap<Dependency, List<Dependency>>();
 
-      result.put(JAVAX_EJB_API, Arrays.asList(JAVAX_EJB_API));
+      result.put(JAVAX_EJB_API, Arrays.asList(JAVAX_EJB_API, JAVAEE7));
 
       return result;
 

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/faces/FacesFacetImpl_2_2.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/faces/FacesFacetImpl_2_2.java
@@ -25,20 +25,21 @@
 
 /**
  * Facets for the JSF 2.2 Implementation
- * 
+ *
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
 public class FacesFacetImpl_2_2 extends AbstractFacesFacetImpl<WebFacesConfigDescriptor> implements FacesFacet_2_2
 {
+
+   public static final Dependency FACES_2_2 = DependencyBuilder
+            .create("javax.faces:javax.faces-api:2.2").setScopeType("provided");
+
    @Inject
    public FacesFacetImpl_2_2(DependencyInstaller installer)
    {
       super(installer);
    }
 
-   public static final Dependency FACES_2_2 = DependencyBuilder
-            .create("javax.faces:javax.faces-api:2.2").setScopeType("provided");
-
    @Override
    public Version getSpecVersion()
    {
@@ -49,7 +50,7 @@ public Version getSpecVersion()
    protected Map<Dependency, List<Dependency>> getRequiredDependencyOptions()
    {
       Map<Dependency, List<Dependency>> result = new LinkedHashMap<>();
-      result.put(FACES_2_2, Arrays.asList(FACES_2_2));
+      result.put(FACES_2_2, Arrays.asList(FACES_2_2, JAVAEE7));
       return result;
    }
 

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/JPAFacetImpl_2_1.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/JPAFacetImpl_2_1.java
@@ -25,7 +25,7 @@
 import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
 
 /**
- * 
+ *
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
 public class JPAFacetImpl_2_1 extends AbstractJPAFacetImpl<PersistenceDescriptor> implements JPAFacet_2_1
@@ -48,7 +48,7 @@ public Version getSpecVersion()
    @Override
    protected Map<Dependency, List<Dependency>> getRequiredDependencyOptions()
    {
-      return Collections.singletonMap(JAVAX_PERSISTENCE, Arrays.asList(JAVAX_PERSISTENCE));
+      return Collections.singletonMap(JAVAX_PERSISTENCE, Arrays.asList(JAVAX_PERSISTENCE, JAVAEE7));
    }
 
    @Override

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/rest/RestFacetImpl_2_0.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/rest/RestFacetImpl_2_0.java
@@ -22,7 +22,7 @@
 
 /**
  * Implementation for JAX-RS 2.0
- * 
+ *
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
 public class RestFacetImpl_2_0 extends AbstractRestFacet implements RestFacet_2_0
@@ -40,7 +40,7 @@ public RestFacetImpl_2_0(DependencyInstaller installer)
    protected Map<Dependency, List<Dependency>> getRequiredDependencyOptions()
    {
       Map<Dependency, List<Dependency>> result = new LinkedHashMap<>();
-      result.put(JAX_RS_2_0, Arrays.asList(JAX_RS_2_0));
+      result.put(JAX_RS_2_0, Arrays.asList(JAX_RS_2_0, JAVAEE7));
       return result;
    }
 

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ServletFacetImpl_3_1.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ServletFacetImpl_3_1.java
@@ -48,7 +48,7 @@ public Version getSpecVersion()
    protected Map<Dependency, List<Dependency>> getRequiredDependencyOptions()
    {
       Map<Dependency, List<Dependency>> map = new LinkedHashMap<>();
-      map.put(JAVAX_SERVLET_API, Arrays.asList(JAVAX_SERVLET_API));
+      map.put(JAVAX_SERVLET_API, Arrays.asList(JAVAX_SERVLET_API, JAVAEE7));
       return map;
    }