Aligned with WFK 2.4.0 but keeping community versions

richfaces · Sep 30, 2013 · aa58dfb · aa58dfb
1 parent 591281a
commit aa58dfb
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,3 @@
+richfaces-quickstarts: 
+======================
+Target Product: WFK
diff --git a/helloworld-rf/pom.xml b/helloworld-rf/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>org.jboss.quickstarts.wfk</groupId>
     <artifactId>jboss-helloworld-rf</artifactId>
-    <version>2.4.0-redhat-SNAPSHOT</version>
+    <version>2.4.0-build-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>JBoss WFK Quickstart: helloworld-rf</name>
     <description>JBoss WFK Quickstarts: Helloworld using RichFaces</description>
@@ -47,11 +47,6 @@
         <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
 
         <version.jboss.spec.javaee.6.0>3.0.2.Final</version.jboss.spec.javaee.6.0>
-        <!-- Alternatively, comment out the above line, and un-comment the
-            line below to use version 3.0.2.Final-redhat-3 which is a release certified
-            to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6
-            maven repository. -->
-        <!-- <version.jboss.spec.javaee.6.0>3.0.2.Final-redhat-3</version.jboss.spec.javaee.6.0> -->
 
         <version.richfaces>4.3.4.Final</version.richfaces>
 

diff --git a/kitchensink-rf/pom.xml b/kitchensink-rf/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>org.jboss.quickstarts.wfk</groupId>
     <artifactId>jboss-kitchensink-rf</artifactId>
-    <version>2.4.0-redhat-SNAPSHOT</version>
+    <version>2.4.0-build-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>JBoss WFK Quickstart: kitchensink-rf</name>
     <description>JBoss WFK Quickstart: Based on the kitchensink quickstart but adds RichFaces</description>
@@ -47,12 +47,9 @@
         <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom.eap>6.2.0-redhat-1</version.jboss.bom.eap>
-        <!-- Alternatively, comment out the above line, and un-comment the 
-            line below to use version 1.0.4.Final-redhat-4 which is a release certified 
-            to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
-            maven repository. -->
-        <!-- <version.jboss.bom.eap>1.0.4.Final-redhat-4</version.jboss.bom.eap> -->
+        <version.jboss.bom.eap>1.0.7.Final</version.jboss.bom.eap>
+        <version.jboss.bom.wfk>1.0.7.Final</version.jboss.bom.wfk>
+
 
         <version.richfaces>4.3.4.Final</version.richfaces>
 
@@ -77,14 +74,14 @@
                 stack you can read this as the JBoss stack of the Java EE 6 APIs, with extras
                 from the Hibernate family of projects) -->
             <dependency>
-                <groupId>org.jboss.bom.eap</groupId>
+                <groupId>org.jboss.bom</groupId>
                 <artifactId>jboss-javaee-6.0-with-tools</artifactId>
-                <version>${version.jboss.bom.eap}</version>
+                <version>${version.jboss.bom.wfk}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.jboss.bom.eap</groupId>
+                <groupId>org.jboss.bom</groupId>
                 <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
                 <version>${version.jboss.bom.eap}</version>
                 <type>pom</type>

diff --git a/pom.xml b/pom.xml
@@ -25,11 +25,11 @@
         <relativePath />
     </parent>
     <groupId>org.jboss.quickstarts.wfk</groupId>
-    <artifactId>jboss-as-quickstarts-parent</artifactId>
-    <version>2.4.0-redhat-SNAPSHOT</version>
+    <artifactId>jboss-richfaces-quickstarts-parent</artifactId>
+    <version>2.4.0-build-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>JBoss Quickstart: Parent</name>
-    <description>JBoss AS Quickstarts Parent</description>
+    <name>JBoss WFK Quickstart: richfaces-quickstarts-parent</name>
+    <description>JBoss Richfaces Quickstarts Parent</description>
     <url>http://www.jboss.org/jdf/quickstarts/get-started/</url>
 
     <licenses>
@@ -45,22 +45,13 @@
 
         <!-- JBoss dependency versions -->
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
-        <!-- Alternatively, comment out the above line, and un-comment the
-            line below to use version 7.2.0.Final-redhat-8 which is a release certified
-            to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6
-            maven repository. -->
-        <!-- <version.jboss.as>7.2.0.Final-redhat-8</version.jboss.as> -->
+        <version.jboss.as>7.2.1.Final</version.jboss.as>
 
         <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom>1.0.7.Final</version.jboss.bom>
-        <!-- Alternatively, comment out the above line, and un-comment the
-            line below to use version 1.0.4.Final-redhat-4 which is a release certified
-            to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6
-            maven repository. -->
-        <!-- <version.jboss.bom>1.0.4.Final-redhat-4</version.jboss.bom> -->
+        <version.jboss.bom.eap>1.0.7.Final</version.jboss.bom.eap>
+        <version.jboss.bom.wfk>1.0.7.Final</version.jboss.bom.wfk>
 
         <version.jboss.spec.javaee.6.0>3.0.2.Final</version.jboss.spec.javaee.6.0>
         <!-- Alternatively, comment out the above line, and un-comment the

diff --git a/richfaces-validation/pom.xml b/richfaces-validation/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>org.jboss.quickstarts.wfk</groupId>
     <artifactId>jboss-richfaces-validation</artifactId>
-    <version>2.4.0-redhat-SNAPSHOT</version>
+    <version>2.4.0-build-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>JBoss WFK Quickstart: richfaces-validation</name>
@@ -45,12 +45,8 @@
         <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom.eap>6.2.0-redhat-1</version.jboss.bom.eap>
-        <!-- Alternatively, comment out the above line, and un-comment the 
-            line below to use version 1.0.4.Final-redhat-4 which is a release certified 
-            to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
-            maven repository. -->
-        <!-- <version.jboss.bom.eap>1.0.4.Final-redhat-4</version.jboss.bom.eap> -->
+        <version.jboss.bom.wfk>1.0.7.Final</version.jboss.bom.wfk>
+        <version.jboss.bom.eap>1.0.7.Final</version.jboss.bom.eap>
 
         <version.richfaces>4.3.4.Final</version.richfaces>
 
@@ -72,14 +68,14 @@
                 the JBoss stack of the Java EE 6 APIs, with some extras tools for your project, such
                 as Arquillian for testing) -->
             <dependency>
-                <groupId>org.jboss.bom.eap</groupId>
+                <groupId>org.jboss.bom</groupId>
                 <artifactId>jboss-javaee-6.0-with-tools</artifactId>
-                <version>${version.jboss.bom.eap}</version>
+                <version>${version.jboss.bom.wfk}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.jboss.bom.eap</groupId>
+                <groupId>org.jboss.bom</groupId>
                 <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
                 <version>${version.jboss.bom.eap}</version>
                 <type>pom</type>