From 89bd5cc35c7c0a0c8e116b5128f2e1b77c019d80 Mon Sep 17 00:00:00 2001
From: Brian Leathem <bleathem@gmail.com>
Date: Mon, 14 May 2012 11:52:40 -0700
Subject: [PATCH 1/3] dropped the redhat-1 version classifier in the test
 source

---
 .../src/test/resources/projects/basic/archetype.properties      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kitchensink/src/test/resources/projects/basic/archetype.properties b/kitchensink/src/test/resources/projects/basic/archetype.properties
index 212e5fe..a8323f1 100644
--- a/kitchensink/src/test/resources/projects/basic/archetype.properties
+++ b/kitchensink/src/test/resources/projects/basic/archetype.properties
@@ -5,4 +5,4 @@ groupId=archetype.it
 artifactId=basic
 richfaces-version=4.3.0-SNAPSHOT
 enterprise=n
-richfaces-enterprise-version=4.3.0-SNAPSHOT-redhat-1
+richfaces-enterprise-version=4.3.0-SNAPSHOT

From dadf84b0fba2b55fb88f0eb8375b9faa1fa47843 Mon Sep 17 00:00:00 2001
From: Brian Leathem <bleathem@gmail.com>
Date: Mon, 14 May 2012 11:57:00 -0700
Subject: [PATCH 2/3] changing version to 4.2.2.Final-1

---
 kitchensink/pom.xml                                         | 6 +++---
 .../main/resources/META-INF/maven/archetype-metadata.xml    | 4 ++--
 .../src/test/resources/projects/basic/archetype.properties  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml
index 235b68a..bb774c9 100644
--- a/kitchensink/pom.xml
+++ b/kitchensink/pom.xml
@@ -6,19 +6,19 @@
     <parent>
         <groupId>org.richfaces</groupId>
         <artifactId>richfaces-root-parent</artifactId>
-        <version>4.3.0-SNAPSHOT</version>
+        <version>4.2.2.Final</version>
         <relativePath>../../build/parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.richfaces.archetypes</groupId>
     <artifactId>richfaces-archetype-kitchensink</artifactId>
     <packaging>maven-archetype</packaging>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.2.2.Final-1</version>
 
     <name>RichFaces Archetypes Kitchen Sink Application</name>
 
     <properties>
-        <richfaces-default-version>4.3.0-SNAPSHOT</richfaces-default-version>
+        <richfaces-default-version>4.2.2.Final</richfaces-default-version>
     </properties>
 
     <dependencyManagement>
diff --git a/kitchensink/src/main/resources/META-INF/maven/archetype-metadata.xml b/kitchensink/src/main/resources/META-INF/maven/archetype-metadata.xml
index 9099e27..4c6f861 100644
--- a/kitchensink/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/kitchensink/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -6,13 +6,13 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <requiredProperties>
         <requiredProperty key="richfaces-version">
-            <defaultValue>4.3.0-SNAPSHOT</defaultValue>
+            <defaultValue>4.2.2.Final</defaultValue>
         </requiredProperty>
         <requiredProperty key="enterprise">
             <defaultValue>n</defaultValue>
         </requiredProperty>
         <requiredProperty key="richfaces-enterprise-version">
-            <defaultValue>4.3.0-SNAPSHOT</defaultValue>
+            <defaultValue>4.2.2.Final</defaultValue>
         </requiredProperty>
     </requiredProperties>
     <fileSets>
diff --git a/kitchensink/src/test/resources/projects/basic/archetype.properties b/kitchensink/src/test/resources/projects/basic/archetype.properties
index a8323f1..326a41d 100644
--- a/kitchensink/src/test/resources/projects/basic/archetype.properties
+++ b/kitchensink/src/test/resources/projects/basic/archetype.properties
@@ -3,6 +3,6 @@ package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
 artifactId=basic
-richfaces-version=4.3.0-SNAPSHOT
+richfaces-version=4.2.2.Final
 enterprise=n
-richfaces-enterprise-version=4.3.0-SNAPSHOT
+richfaces-enterprise-version=4.2.2.Final

From 14308e75d65639d64537bc3508e62b548bafdaa9 Mon Sep 17 00:00:00 2001
From: Fred Bricon <fbricon@gmail.com>
Date: Tue, 19 Jun 2012 14:47:02 +0200
Subject: [PATCH 3/3] Ensure compatibility with released EAP maven repo

Signed-off-by: Fred Bricon <fbricon@gmail.com>
---
 .../META-INF/maven/archetype-metadata.xml          |  5 ++++-
 .../src/main/resources/archetype-resources/pom.xml | 14 +++++++-------
 .../resources/projects/basic/archetype.properties  |  3 ++-
 .../src/test/resources/projects/basic/goal.txt     |  1 +
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/kitchensink/src/main/resources/META-INF/maven/archetype-metadata.xml b/kitchensink/src/main/resources/META-INF/maven/archetype-metadata.xml
index 4c6f861..7b9e4a5 100644
--- a/kitchensink/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/kitchensink/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -12,8 +12,11 @@
             <defaultValue>n</defaultValue>
         </requiredProperty>
         <requiredProperty key="richfaces-enterprise-version">
-            <defaultValue>4.2.2.Final</defaultValue>
+            <defaultValue>4.2.2.Final-redhat-1</defaultValue>
         </requiredProperty>
+        <requiredProperty key="javaee6-with-tools-enterprise-version">
+            <defaultValue>1.0.0.M12-redhat-1</defaultValue>
+        </requiredProperty>        
     </requiredProperties>
     <fileSets>
         <fileSet filtered="true" packaged="true" encoding="UTF-8">
diff --git a/kitchensink/src/main/resources/archetype-resources/pom.xml b/kitchensink/src/main/resources/archetype-resources/pom.xml
index dc7573e..4875ed1 100644
--- a/kitchensink/src/main/resources/archetype-resources/pom.xml
+++ b/kitchensink/src/main/resources/archetype-resources/pom.xml
@@ -18,18 +18,18 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Define the version of JBoss' Java EE 6 APIs and Tools we want to import.  -->
         #if ($enterprise == "true" || $enterprise == "y" || $enterprise == "yes" )
-        <javaee6.with.tools.version>1.0.0.M7-redhat-1</javaee6.with.tools.version>
-        <!-- Alternatively, comment out the above line, and un-comment the line below to use the community version 1.0.0.M7 -->
+        <javaee6.with.tools.version>${javaee6-with-tools-enterprise-version}</javaee6.with.tools.version>
+        <!-- Alternatively, comment out the above line, and un-comment the line below to use the community version 1.0.0.Final -->
         <!--
-        <javaee6.with.tools.version>1.0.0.M7</javaee6.with.tools.version>
+        <javaee6.with.tools.version>1.0.0.Final</javaee6.with.tools.version>
         -->
         <org.richfaces.bom.version>${richfaces-enterprise-version}</org.richfaces.bom.version>
         #else
-        <javaee6.with.tools.version>1.0.0.M7</javaee6.with.tools.version>
-        <!-- Alternatively, comment out the above line, and un-comment the line below to use version 1.0.0.M7-redhat-1
+        <javaee6.with.tools.version>1.0.0.Final</javaee6.with.tools.version>
+        <!-- Alternatively, comment out the above line, and un-comment the line below to use version ${javaee6-with-tools-enterprise-version}
         which is a release certified to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 maven repository. -->
         <!--
-        <javaee6.with.tools.version>1.0.0.M7-redhat-1</javaee6.with.tools.version>
+        <javaee6.with.tools.version>${javaee6-with-tools-enterprise-version}</javaee6.with.tools.version>
         -->
         <org.richfaces.bom.version>${richfaces-version}</org.richfaces.bom.version>
         #end
@@ -166,7 +166,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-jpamodelgen</artifactId>
-            <version>1.1.1.Final</version>
+            <version>1.2.0.Final</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/kitchensink/src/test/resources/projects/basic/archetype.properties b/kitchensink/src/test/resources/projects/basic/archetype.properties
index 326a41d..553e76a 100644
--- a/kitchensink/src/test/resources/projects/basic/archetype.properties
+++ b/kitchensink/src/test/resources/projects/basic/archetype.properties
@@ -5,4 +5,5 @@ groupId=archetype.it
 artifactId=basic
 richfaces-version=4.2.2.Final
 enterprise=n
-richfaces-enterprise-version=4.2.2.Final
+richfaces-enterprise-version=4.2.2.Final-redhat-1
+javaee6-with-tools-enterprise-version=1.0.0.M12-redhat-1
\ No newline at end of file
diff --git a/kitchensink/src/test/resources/projects/basic/goal.txt b/kitchensink/src/test/resources/projects/basic/goal.txt
index e69de29..d59d337 100644
--- a/kitchensink/src/test/resources/projects/basic/goal.txt
+++ b/kitchensink/src/test/resources/projects/basic/goal.txt
@@ -0,0 +1 @@
+clean verify
\ No newline at end of file