[JDF-827] Manage version of ejb and jms client-bom in the main eap bom

Update the BOM version to the 7.0.0-build-3 which includes the ejb and jms clients Remove usage of ejb and jms client BOMs for version management, and use the javaee eap bom instead
italoeduardo96 · Jun 17, 2015 · 2877ac6 · 2877ac6
1 parent a9b67ea
commit 2877ac6
Show file tree

Hide file tree

Showing 75 changed files with 335 additions and 660 deletions.
diff --git a/app-client/ear/pom.xml b/app-client/ear/pom.xml
@@ -44,12 +44,6 @@
             <type>ejb</type>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-ejb-client-bom</artifactId>
-            <scope>provided</scope>
-            <type>pom</type>
-        </dependency>
         <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>jboss-app-client-client-simple</artifactId>

diff --git a/app-client/pom.xml b/app-client/pom.xml
@@ -117,14 +117,13 @@
     <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <!-- JBoss dependency versions -->
+        <!-- EAP component version management BOM -->
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
+        <!-- Wildfly Maven plugin used for deploying to Wildfly or EAP 7 -->
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
-        <version.org.wildfly>10.0.0.Alpha3</version.org.wildfly>
 
-        <version.jboss.spec.javaee.7.0>1.0.3.Final</version.jboss.spec.javaee.7.0>
-
-    <!-- maven-compiler-plugin -->
+        <!-- maven-compiler-plugin -->
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
 
@@ -142,29 +141,18 @@
 
     <dependencyManagement>
         <dependencies>
-      <!-- Define the version of the JBoss Java EE APIs we want to import. Any 
-        dependencies from org.jboss.spec will have their version defined by this 
-        BOM -->
-      <!-- JBoss distributes a complete set of Java EE APIs including a Bill 
-        of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection) 
-        of artifacts. We use this here so that we always get the correct versions 
-        of artifacts. Here we use the jboss-javaee-7.0 stack (you can read this as 
-        the JBoss stack of the Java EE APIs). You can actually use this stack with 
-        any version of JBoss EAP that implements Java EE. -->
+            <!-- JBoss distributes a complete set of Java EE APIs including a Bill
+                of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
+                of artifacts. We use this here so that we always get the correct versions
+                of artifacts. Here we use the jboss-javaee-7.0-eap stack (you can
+                read this as the JBoss stack of the Java EE APIs and related components.  -->
             <dependency>
-                <groupId>org.jboss.spec</groupId>
-                <artifactId>jboss-javaee-7.0</artifactId>
-                <version>${version.jboss.spec.javaee.7.0}</version>
+                <groupId>org.jboss.bom</groupId>
+                <artifactId>jboss-javaee-7.0-eap</artifactId>
+                <version>${version.jboss.bom.eap}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.wildfly</groupId>
-                <artifactId>wildfly-ejb-client-bom</artifactId>
-                <version>${version.org.wildfly}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
@@ -48,7 +48,7 @@
 
         <!-- Define the version of the JBoss BOMs we want to import to specify 
             tested stacks. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- other plugin versions -->
         <version.compiler.plugin>3.1</version.compiler.plugin>

diff --git a/bean-validation-custom-constraint/pom.xml b/bean-validation-custom-constraint/pom.xml
@@ -120,7 +120,7 @@
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- other plugin versions -->
         <version.surefire.plugin>2.10</version.surefire.plugin>

diff --git a/bean-validation/pom.xml b/bean-validation/pom.xml
@@ -120,7 +120,7 @@
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- other plugin versions -->
         <version.surefire.plugin>2.10</version.surefire.plugin>

diff --git a/cdi-add-interceptor-binding/pom.xml b/cdi-add-interceptor-binding/pom.xml
@@ -127,7 +127,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
 
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
     </properties>
 
     <dependencyManagement>

diff --git a/cdi-interceptors/pom.xml b/cdi-interceptors/pom.xml
@@ -123,7 +123,7 @@
         <version.war.plugin>2.1.1</version.war.plugin>
 
         <!-- Define the version of the JBoss Java EE APIs and Tools we want to import. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- other plugin versions -->
         <version.surefire.plugin>2.10</version.surefire.plugin>

diff --git a/cdi-portable-extension/pom.xml b/cdi-portable-extension/pom.xml
@@ -120,7 +120,7 @@
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- other plugin versions -->
         <version.surefire.plugin>2.10</version.surefire.plugin>

diff --git a/cdi-stereotype/pom.xml b/cdi-stereotype/pom.xml
@@ -123,7 +123,7 @@
         <version.war.plugin>2.1.1</version.war.plugin>
 
         <!-- Define the version of the JBoss Java EE APIs and Tools we want to import. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- maven-compiler-plugin -->
         <maven.compiler.target>1.8</maven.compiler.target>

diff --git a/cdi-veto/pom.xml b/cdi-veto/pom.xml
@@ -120,7 +120,7 @@
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- other plugin versions -->
         <version.surefire.plugin>2.10</version.surefire.plugin>

diff --git a/cluster-ha-singleton/pom.xml b/cluster-ha-singleton/pom.xml
@@ -40,13 +40,11 @@
             resources, i.e. build is platform dependent! -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <!-- JBoss dependency versions -->
-
-        <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
-
-        <version.org.wildfly>10.0.0.Alpha3</version.org.wildfly>
+        <!-- EAP component version management BOM -->
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
-        <version.jboss.spec.javaee.7.0>1.0.3.Final</version.jboss.spec.javaee.7.0>
+        <!-- Wildfly Maven plugin used for deploying to Wildfly or EAP 7 -->
+        <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- other plugin versions -->
         <version.ejb.plugin>2.3</version.ejb.plugin>
@@ -63,29 +61,18 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- Define the version of the JBoss Java EE APIs we want to import. 
-                Any dependencies from org.jboss.spec will have their version defined by this 
-                BOM -->
-            <!-- JBoss distributes a complete set of Java EE APIs including a Bill 
-                of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection) 
-                of artifacts. We use this here so that we always get the correct versions 
-                of artifacts. Here we use the jboss-javaee-7.0 stack (you can read this as 
-                the JBoss stack of the Java EE APIs). You can actually use this stack with 
-                any version of JBoss EAP that implements Java EE. -->
+            <!-- JBoss distributes a complete set of Java EE APIs including a Bill
+                of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
+                of artifacts. We use this here so that we always get the correct versions
+                of artifacts. Here we use the jboss-javaee-7.0-eap stack (you can
+                read this as the JBoss stack of the Java EE APIs and related components.  -->
             <dependency>
-                <groupId>org.jboss.spec</groupId>
-                <artifactId>jboss-javaee-7.0</artifactId>
-                <version>${version.jboss.spec.javaee.7.0}</version>
+                <groupId>org.jboss.bom</groupId>
+                <artifactId>jboss-javaee-7.0-eap</artifactId>
+                <version>${version.jboss.bom.eap}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.wildfly</groupId>
-                <artifactId>wildfly-ejb-client-bom</artifactId>
-                <version>${version.org.wildfly}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/cmt/pom.xml b/cmt/pom.xml
@@ -121,7 +121,7 @@
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- other plugin versions -->
         <version.war.plugin>2.1.1</version.war.plugin>

diff --git a/contacts-jquerymobile/pom.xml b/contacts-jquerymobile/pom.xml
@@ -82,7 +82,7 @@
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- Other dependency versions -->
         <version.ro.isdc.wro4j>1.4.4</version.ro.isdc.wro4j>

diff --git a/deltaspike-authorization/functional-tests/pom.xml b/deltaspike-authorization/functional-tests/pom.xml
@@ -46,7 +46,7 @@
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import. The JBoss BOMs specify tested stacks. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- other plugin versions -->
         <version.surefire.plugin>2.10</version.surefire.plugin>

diff --git a/deltaspike-authorization/pom.xml b/deltaspike-authorization/pom.xml
@@ -127,7 +127,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
 
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
     </properties>
 
     <dependencyManagement>

diff --git a/deltaspike-beanbuilder/pom.xml b/deltaspike-beanbuilder/pom.xml
@@ -128,7 +128,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
 
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
     </properties>
 
     <dependencyManagement>

diff --git a/deltaspike-beanmanagerprovider/functional-tests/pom.xml b/deltaspike-beanmanagerprovider/functional-tests/pom.xml
@@ -46,7 +46,7 @@
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import. The JBoss BOMs specify tested stacks. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- other plugin versions -->
         <version.surefire.plugin>2.10</version.surefire.plugin>

diff --git a/deltaspike-beanmanagerprovider/pom.xml b/deltaspike-beanmanagerprovider/pom.xml
@@ -119,7 +119,7 @@
         <!-- JBoss dependency versions -->
 
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- maven-compiler-plugin -->
         <maven.compiler.target>1.8</maven.compiler.target>

diff --git a/deltaspike-deactivatable/pom.xml b/deltaspike-deactivatable/pom.xml
@@ -128,7 +128,7 @@
         <version.war.plugin>2.1.1</version.war.plugin>
         <version.surefire.plugin>2.10</version.surefire.plugin>
 
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
     </properties>
 
     <dependencyManagement>

diff --git a/deltaspike-exception-handling/functional-tests/pom.xml b/deltaspike-exception-handling/functional-tests/pom.xml
@@ -46,7 +46,7 @@
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import. The JBoss BOMs specify tested stacks. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- other plugin versions -->
         <version.surefire.plugin>2.10</version.surefire.plugin>

diff --git a/deltaspike-exception-handling/pom.xml b/deltaspike-exception-handling/pom.xml
@@ -127,7 +127,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
 
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
     </properties>
 
     <dependencyManagement>

diff --git a/deltaspike-helloworld-jms/functional-tests/pom.xml b/deltaspike-helloworld-jms/functional-tests/pom.xml
@@ -46,7 +46,7 @@
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import. The JBoss BOMs specify tested stacks. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- other plugin versions -->
         <version.surefire.plugin>2.10</version.surefire.plugin>

diff --git a/deltaspike-helloworld-jms/pom.xml b/deltaspike-helloworld-jms/pom.xml
@@ -120,16 +120,14 @@
 
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
-        <version.org.wildfly>10.0.0.Alpha3</version.org.wildfly>
-
         <!-- maven-compiler-plugin -->
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
 
         <!-- other plugin versions -->
         <version.war.plugin>2.1.1</version.war.plugin>
 
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
     </properties>
 
     <dependencyManagement>
@@ -151,14 +149,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <dependency>
-                <groupId>org.wildfly</groupId>
-                <artifactId>wildfly-jms-client-bom</artifactId>
-                <version>${version.org.wildfly}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 

diff --git a/deltaspike-partialbean-advanced/pom.xml b/deltaspike-partialbean-advanced/pom.xml
@@ -128,7 +128,7 @@
         <version.war.plugin>2.1.1</version.war.plugin>
         <version.surefire.plugin>2.10</version.surefire.plugin>
 
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
     </properties>
 
     <dependencyManagement>

diff --git a/deltaspike-partialbean-basic/pom.xml b/deltaspike-partialbean-basic/pom.xml
@@ -128,7 +128,7 @@
         <version.war.plugin>2.1.1</version.war.plugin>
         <version.surefire.plugin>2.10</version.surefire.plugin>
 
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
     </properties>
 
     <dependencyManagement>

diff --git a/deltaspike-projectstage/functional-tests/pom.xml b/deltaspike-projectstage/functional-tests/pom.xml
@@ -46,7 +46,7 @@
         <version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import. The JBoss BOMs specify tested stacks. -->
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
 
         <!-- other plugin versions -->
         <version.surefire.plugin>2.10</version.surefire.plugin>

diff --git a/deltaspike-projectstage/pom.xml b/deltaspike-projectstage/pom.xml
@@ -126,7 +126,7 @@
         <!-- other plugin versions -->
         <version.war.plugin>2.1.1</version.war.plugin>
 
-        <version.jboss.bom.eap>7.0.0-build-2</version.jboss.bom.eap>
+        <version.jboss.bom.eap>7.0.0-build-3</version.jboss.bom.eap>
     </properties>
 
     <dependencyManagement>