FORGE-1752: Added provided scope to JavaEE dependencies

forge · Apr 10, 2014 · ee93332 · ee93332
1 parent 8fec118
commit ee93332
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 32 deletions.
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/CDIFacetImpl_1_0.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/CDIFacetImpl_1_0.java
@@ -26,22 +26,25 @@
 
 /**
  * Implementation of {@link CDIFacet} for spec version 1.0
- * 
+ *
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
- * 
+ *
  */
 public class CDIFacetImpl_1_0 extends AbstractCDIFacetImpl<BeansDescriptor> implements CDIFacet_1_0
 {
    private static final Dependency JBOSS_ANNOTATION_API_1_1 = DependencyBuilder
-            .create("org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec");
+            .create("org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec").setScopeType("provided");
    private static final Dependency JBOSS_ANNOTATION_API_1_2 = DependencyBuilder
-            .create("org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec");
+            .create("org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec").setScopeType("provided");
    private static final Dependency JAVAX_INTERCEPTOR_API = DependencyBuilder
-            .create("org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec");
-   private static final Dependency JAVAX_INJECT = DependencyBuilder.create("javax.inject:javax.inject:1");
-   private static final Dependency JAVAX_ANNOTATION_API = DependencyBuilder.create("javax.annotation:jsr250-api:1.0");
-   private static final Dependency CDI_API = DependencyBuilder.create("javax.enterprise:cdi-api:[1.0,1.1)");
+            .create("org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec").setScopeType("provided");
+   private static final Dependency JAVAX_INJECT = DependencyBuilder.create("javax.inject:javax.inject:1").setScopeType(
+            "provided");
+   private static final Dependency JAVAX_ANNOTATION_API = DependencyBuilder.create("javax.annotation:jsr250-api:1.0")
+            .setScopeType("provided");
+   private static final Dependency CDI_API = DependencyBuilder.create("javax.enterprise:cdi-api:1.0-SP4").setScopeType(
+            "provided");
 
    @Inject
    public CDIFacetImpl_1_0(DependencyInstaller installer)

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
@@ -32,14 +32,16 @@
 public class CDIFacetImpl_1_1 extends AbstractCDIFacetImpl<BeansDescriptor> implements CDIFacet_1_1
 {
    private static final Dependency JBOSS_ANNOTATION_API_1_1 = DependencyBuilder
-            .create("org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec");
+            .create("org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec").setScopeType("provided");
    private static final Dependency JBOSS_ANNOTATION_API_1_2 = DependencyBuilder
-            .create("org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec");
+            .create("org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec").setScopeType("provided");
    private static final Dependency JAVAX_INTERCEPTOR_API = DependencyBuilder
-            .create("org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec");
-   private static final Dependency JAVAX_INJECT = DependencyBuilder.create("javax.inject:javax.inject:1");
+            .create("org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec").setScopeType("provided");
+   private static final Dependency JAVAX_INJECT = DependencyBuilder.create("javax.inject:javax.inject:1").setScopeType(
+            "provided");
    private static final Dependency JAVAX_ANNOTATION_API = DependencyBuilder.create("javax.annotation:jsr250-api:1.0");
-   private static final Dependency CDI_API = DependencyBuilder.create("javax.enterprise:cdi-api:1.1");
+   private static final Dependency CDI_API = DependencyBuilder.create("javax.enterprise:cdi-api:1.1").setScopeType(
+            "provided");
 
    @Inject
    public CDIFacetImpl_1_1(DependencyInstaller installer)

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/ejb/EJBFacetImpl_3_1.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/ejb/EJBFacetImpl_3_1.java
@@ -26,8 +26,9 @@
 public class EJBFacetImpl_3_1 extends AbstractEJBFacetImpl implements EJBFacet_3_1
 {
    private static final Dependency JBOSS_EJB_API = DependencyBuilder
-            .create("org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec");
-   private static final Dependency GLASSFISH_EJB_API = DependencyBuilder.create("org.glassfish:javax.ejb::3.1");
+            .create("org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec").setScopeType("provided");
+   private static final Dependency GLASSFISH_EJB_API = DependencyBuilder.create("org.glassfish:javax.ejb::3.1")
+            .setScopeType("provided");
 
    @Inject
    public EJBFacetImpl_3_1(final DependencyInstaller installer)

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
@@ -25,7 +25,8 @@
  */
 public class EJBFacetImpl_3_2 extends AbstractEJBFacetImpl implements EJBFacet_3_2
 {
-   private static final Dependency JAVAX_EJB_API = DependencyBuilder.create("javax.ejb:javax.ejb-api:3.2");
+   private static final Dependency JAVAX_EJB_API = DependencyBuilder.create("javax.ejb:javax.ejb-api:3.2")
+            .setScopeType("provided");
 
    @Inject
    public EJBFacetImpl_3_2(final DependencyInstaller installer)

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/JPAFacetImpl_2_0.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/JPAFacetImpl_2_0.java
@@ -25,13 +25,13 @@
 import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
 
 /**
- * 
+ *
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
 public class JPAFacetImpl_2_0 extends AbstractJPAFacetImpl<PersistenceDescriptor> implements JPAFacet_2_0
 {
    private final Dependency JAVAX_PERSISTENCE = DependencyBuilder
-            .create("org.hibernate.javax.persistence:hibernate-jpa-2.0-api");
+            .create("org.hibernate.javax.persistence:hibernate-jpa-2.0-api").setScopeType("provided");
 
    @Inject
    public JPAFacetImpl_2_0(DependencyInstaller installer)

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
@@ -31,7 +31,7 @@
 public class JPAFacetImpl_2_1 extends AbstractJPAFacetImpl<PersistenceDescriptor> implements JPAFacet_2_1
 {
    private final Dependency JAVAX_PERSISTENCE = DependencyBuilder
-            .create("org.hibernate.javax.persistence:hibernate-jpa-2.1-api");
+            .create("org.hibernate.javax.persistence:hibernate-jpa-2.1-api").setScopeType("provided");
 
    @Inject
    public JPAFacetImpl_2_1(DependencyInstaller installer)

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jta/JTAFacetImpl_1_1.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jta/JTAFacetImpl_1_1.java
@@ -21,14 +21,14 @@
 
 /**
  * Implementation of {@link JTAFacet}
- * 
+ *
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
- * 
+ *
  */
 public class JTAFacetImpl_1_1 extends AbstractJTAFacetImpl implements JTAFacet_1_1
 {
    private static final Dependency JBOSS_JTA_API = DependencyBuilder
-            .create("org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec");
+            .create("org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec").setScopeType("provided");
 
    @Inject
    public JTAFacetImpl_1_1(DependencyInstaller installer)

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jta/JTAFacetImpl_1_2.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jta/JTAFacetImpl_1_2.java
@@ -21,14 +21,14 @@
 
 /**
  * Implementation of {@link JTAFacet}
- * 
+ *
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
- * 
+ *
  */
 public class JTAFacetImpl_1_2 extends AbstractJTAFacetImpl implements JTAFacet_1_2
 {
    private static final Dependency JTA_API = DependencyBuilder
-            .create("javax.transaction:javax.transaction-api:1.2");
+            .create("javax.transaction:javax.transaction-api:1.2").setScopeType("provided");
 
    @Inject
    public JTAFacetImpl_1_2(DependencyInstaller installer)

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/rest/RestFacetImpl_1_1.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/rest/RestFacetImpl_1_1.java
@@ -22,13 +22,13 @@
 
 /**
  * Implementation for JAX-RS 1.1
- * 
+ *
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
 public class RestFacetImpl_1_1 extends AbstractRestFacet implements RestFacet_1_1
 {
    private static final Dependency JAX_RS_1_1 = DependencyBuilder
-            .create("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_1.1_spec");
+            .create("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_1.1_spec").setScopeType("provided");
 
    @Inject
    public RestFacetImpl_1_1(DependencyInstaller installer)

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
@@ -28,7 +28,7 @@
 public class RestFacetImpl_2_0 extends AbstractRestFacet implements RestFacet_2_0
 {
    private static final Dependency JAX_RS_2_0 = DependencyBuilder
-            .create("javax.ws.rs:javax.ws.rs-api:2.0");
+            .create("javax.ws.rs:javax.ws.rs-api:2.0").setScopeType("provided");
 
    @Inject
    public RestFacetImpl_2_0(DependencyInstaller installer)

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ServletFacetImpl_2_5.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ServletFacetImpl_2_5.java
@@ -31,7 +31,7 @@
 public class ServletFacetImpl_2_5 extends AbstractServletFacet<WebAppDescriptor> implements ServletFacet_2_5
 {
    private static final Dependency JAVAX_SERVLET_API = DependencyBuilder
-            .create("org.jboss.spec.javax.servlet:jboss-servlet-api_2.5_spec:1.0.1.Final");
+            .create("org.jboss.spec.javax.servlet:jboss-servlet-api_2.5_spec:1.0.1.Final").setScopeType("provided");
 
    @Inject
    public ServletFacetImpl_2_5(DependencyInstaller installer)

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ServletFacetImpl_3_0.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ServletFacetImpl_3_0.java
@@ -30,7 +30,7 @@
 public class ServletFacetImpl_3_0 extends AbstractServletFacet<WebAppDescriptor> implements ServletFacet_3_0
 {
    private static final Dependency JAVAX_SERVLET_API = DependencyBuilder
-            .create("org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec");
+            .create("org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec").setScopeType("provided");
 
    @Inject
    public ServletFacetImpl_3_0(DependencyInstaller installer)

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
@@ -30,7 +30,7 @@
 public class ServletFacetImpl_3_1 extends AbstractServletFacet<WebAppDescriptor> implements ServletFacet_3_1
 {
    private static final Dependency JAVAX_SERVLET_API = DependencyBuilder
-            .create("javax.servlet:javax.servlet-api:3.1.0");
+            .create("javax.servlet:javax.servlet-api:3.1.0").setScopeType("provided");
 
    @Inject
    public ServletFacetImpl_3_1(DependencyInstaller installer)

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/validation/ValidationFacetImpl.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/validation/ValidationFacetImpl.java
@@ -32,7 +32,7 @@
 public class ValidationFacetImpl extends AbstractJavaEEFacet implements ValidationFacet
 {
    private final Dependency JAVAX_VALIDATION_API = DependencyBuilder
-            .create("javax.validation:validation-api");
+            .create("javax.validation:validation-api").setScopeType("provided");
 
    @Inject
    public ValidationFacetImpl(final DependencyInstaller installer)