Merge pull request #10942 from ctomc/version-matrix

WFLY-9911 Move dependency managment under separate bom
wildfly · Mar 28, 2018 · c3c2ae0 · c3c2ae0
2 parents b3d19e7 + 55a9a03
commit c3c2ae0
Show file tree

Hide file tree

Showing 19 changed files with 6,504 additions and 6,309 deletions.
diff --git a/clustering/common/pom.xml b/clustering/common/pom.xml
@@ -42,6 +42,10 @@
     <name>WildFly: Common code for clustering subsystems</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.jboss.msc</groupId>
+            <artifactId>jboss-msc</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>wildfly-clustering-service</artifactId>

diff --git a/component-matrix/pom.xml b/component-matrix/pom.xml
diff --git a/ee/pom.xml b/ee/pom.xml
@@ -34,6 +34,7 @@
         merge conflicts between commits changing the GA and those changing the V.
         -->
         <version>13.0.0.Alpha1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>wildfly-ee</artifactId>

diff --git a/ejb3/pom.xml b/ejb3/pom.xml
@@ -137,7 +137,6 @@ vi:ts=4:sw=4:expandtab
         <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jboss-iiop-client</artifactId>
-            <version>${version.org.jboss.iiop-client}</version>
         </dependency>
 
         <dependency>

diff --git a/jpa/eclipselink/pom.xml b/jpa/eclipselink/pom.xml
@@ -51,15 +51,7 @@
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
-            <version>${version.org.eclipselink.version}</version>
             <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>javax.persistence</artifactId>
-                </exclusion>
-            </exclusions>
-
         </dependency>
 
 

diff --git a/jpa/hibernate5/pom.xml b/jpa/hibernate5/pom.xml
@@ -89,14 +89,12 @@
         <dependency>
             <groupId>org.hibernate.common</groupId>
             <artifactId>hibernate-commons-annotations</artifactId>
-            <version>${version.org.hibernate.commons.annotations}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>${version.org.hibernate}</version>
             <scope>provided</scope>
             <exclusions>
               <exclusion>
@@ -110,7 +108,6 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>${version.org.hibernate}</version>
             <scope>provided</scope>
             <exclusions>
               <exclusion>
@@ -130,7 +127,6 @@
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>${version.org.hibernate.validator}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/jpa/openjpa/pom.xml b/jpa/openjpa/pom.xml
@@ -33,21 +33,18 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>${version.org.apache.openjpa}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-lib</artifactId>
-            <version>${version.org.apache.openjpa}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence</artifactId>
-            <version>${version.org.apache.openjpa}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/jsf/multi-jsf-installer/pom.xml b/jsf/multi-jsf-installer/pom.xml
@@ -41,25 +41,14 @@
     <name>WildFly: JSF Multi-JSF installer</name>
     <description>Creates a CLI deployment archive that can install new JSF versions to WildFly.</description>
 
-    <!-- All properties can be overridden on the command line.  If you override version.jboss.as then
-         you should also override version.weld.core for whatever weld version ships with the WildFly
-         server you are targeting. -->
-    <properties>
-        <version.jboss.as>${project.version}</version.jboss.as>
-        <version.weld.core>${version.org.jboss.weld.weld}</version.weld.core>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>wildfly-jsf-injection</artifactId>
-            <version>${version.jboss.as}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.weld.module</groupId>
             <artifactId>weld-jsf</artifactId>
-            <version>${version.weld.core}</version>
         </dependency>
     </dependencies>
 
@@ -68,13 +57,12 @@
             <id>mojarra-2.x</id>
             <properties>
                 <jsf-impl-name>mojarra</jsf-impl-name>
-                <jsf-version>2.1.25</jsf-version>
+                <jsf-version>2.3.3.SP1</jsf-version>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>com.sun.faces</groupId>
-                    <artifactId>jsf-api</artifactId>
-                    <version>${jsf-version}</version>
+                    <groupId>org.jboss.spec.javax.faces</groupId>
+                    <artifactId>jboss-jsf-api_2.2_spec</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>com.sun.faces</groupId>
@@ -111,19 +99,16 @@
             </activation>
             <properties>
                 <jsf-impl-name>myfaces</jsf-impl-name>
-                <jsf-version>${version.org.apache.myfaces.core}</jsf-version>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.myfaces.core</groupId>
                     <artifactId>myfaces-impl</artifactId>
-                    <version>${jsf-version}</version>
                 </dependency>
 
                 <dependency>
                     <groupId>org.apache.myfaces.core</groupId>
                     <artifactId>myfaces-api</artifactId>
-                    <version>${jsf-version}</version>
                 </dependency>
 
                 <dependency>

diff --git a/naming/pom.xml b/naming/pom.xml
@@ -34,6 +34,7 @@
         merge conflicts between commits changing the GA and those changing the V.
         -->
         <version>13.0.0.Alpha1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>wildfly-naming</artifactId>