Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Ensure compatibility with released EAP maven repo

Signed-off-by: Fred Bricon <fbricon@gmail.com>
  • Loading branch information...
commit 14308e75d65639d64537bc3508e62b548bafdaa9 1 parent dadf84b
Fred Bricon authored June 19, 2012
5  kitchensink/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -12,8 +12,11 @@
12 12
             <defaultValue>n</defaultValue>
13 13
         </requiredProperty>
14 14
         <requiredProperty key="richfaces-enterprise-version">
15  
-            <defaultValue>4.2.2.Final</defaultValue>
  15
+            <defaultValue>4.2.2.Final-redhat-1</defaultValue>
16 16
         </requiredProperty>
  17
+        <requiredProperty key="javaee6-with-tools-enterprise-version">
  18
+            <defaultValue>1.0.0.M12-redhat-1</defaultValue>
  19
+        </requiredProperty>        
17 20
     </requiredProperties>
18 21
     <fileSets>
19 22
         <fileSet filtered="true" packaged="true" encoding="UTF-8">
14  kitchensink/src/main/resources/archetype-resources/pom.xml
@@ -18,18 +18,18 @@
18 18
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19 19
         <!-- Define the version of JBoss' Java EE 6 APIs and Tools we want to import.  -->
20 20
         #if ($enterprise == "true" || $enterprise == "y" || $enterprise == "yes" )
21  
-        <javaee6.with.tools.version>1.0.0.M7-redhat-1</javaee6.with.tools.version>
22  
-        <!-- Alternatively, comment out the above line, and un-comment the line below to use the community version 1.0.0.M7 -->
  21
+        <javaee6.with.tools.version>${javaee6-with-tools-enterprise-version}</javaee6.with.tools.version>
  22
+        <!-- Alternatively, comment out the above line, and un-comment the line below to use the community version 1.0.0.Final -->
23 23
         <!--
24  
-        <javaee6.with.tools.version>1.0.0.M7</javaee6.with.tools.version>
  24
+        <javaee6.with.tools.version>1.0.0.Final</javaee6.with.tools.version>
25 25
         -->
26 26
         <org.richfaces.bom.version>${richfaces-enterprise-version}</org.richfaces.bom.version>
27 27
         #else
28  
-        <javaee6.with.tools.version>1.0.0.M7</javaee6.with.tools.version>
29  
-        <!-- Alternatively, comment out the above line, and un-comment the line below to use version 1.0.0.M7-redhat-1
  28
+        <javaee6.with.tools.version>1.0.0.Final</javaee6.with.tools.version>
  29
+        <!-- Alternatively, comment out the above line, and un-comment the line below to use version ${javaee6-with-tools-enterprise-version}
30 30
         which is a release certified to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 maven repository. -->
31 31
         <!--
32  
-        <javaee6.with.tools.version>1.0.0.M7-redhat-1</javaee6.with.tools.version>
  32
+        <javaee6.with.tools.version>${javaee6-with-tools-enterprise-version}</javaee6.with.tools.version>
33 33
         -->
34 34
         <org.richfaces.bom.version>${richfaces-version}</org.richfaces.bom.version>
35 35
         #end
@@ -166,7 +166,7 @@
166 166
         <dependency>
167 167
             <groupId>org.hibernate</groupId>
168 168
             <artifactId>hibernate-jpamodelgen</artifactId>
169  
-            <version>1.1.1.Final</version>
  169
+            <version>1.2.0.Final</version>
170 170
             <scope>provided</scope>
171 171
         </dependency>
172 172
 
3  kitchensink/src/test/resources/projects/basic/archetype.properties
@@ -5,4 +5,5 @@ groupId=archetype.it
5 5
 artifactId=basic
6 6
 richfaces-version=4.2.2.Final
7 7
 enterprise=n
8  
-richfaces-enterprise-version=4.2.2.Final
  8
+richfaces-enterprise-version=4.2.2.Final-redhat-1
  9
+javaee6-with-tools-enterprise-version=1.0.0.M12-redhat-1
1  kitchensink/src/test/resources/projects/basic/goal.txt
... ...
@@ -0,0 +1 @@
  1
+clean verify

0 notes on commit 14308e7

Please sign in to comment.
Something went wrong with that request. Please try again.