Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Ensure compatibility with released EAP maven repo #6

Closed
wants to merge 3 commits into from

3 participants

Fred Bricon Lukáš Fryč Brian Leathem
Fred Bricon

This branch was created by forking the release/4.2.2.Final-1 branch
You need to cherry pick :

14308e7 Ensure compatibility with released EAP maven repo

This fix need to be released ASAP for integration with JBT/JBDS

Lukáš Fryč lfryc closed this March 13, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
6  kitchensink/pom.xml
@@ -6,19 +6,19 @@
6 6
     <parent>
7 7
         <groupId>org.richfaces</groupId>
8 8
         <artifactId>richfaces-root-parent</artifactId>
9  
-        <version>4.3.0-SNAPSHOT</version>
  9
+        <version>4.2.2.Final</version>
10 10
         <relativePath>../../build/parent/pom.xml</relativePath>
11 11
     </parent>
12 12
 
13 13
     <groupId>org.richfaces.archetypes</groupId>
14 14
     <artifactId>richfaces-archetype-kitchensink</artifactId>
15 15
     <packaging>maven-archetype</packaging>
16  
-    <version>4.3.0-SNAPSHOT</version>
  16
+    <version>4.2.2.Final-1</version>
17 17
 
18 18
     <name>RichFaces Archetypes Kitchen Sink Application</name>
19 19
 
20 20
     <properties>
21  
-        <richfaces-default-version>4.3.0-SNAPSHOT</richfaces-default-version>
  21
+        <richfaces-default-version>4.2.2.Final</richfaces-default-version>
22 22
     </properties>
23 23
 
24 24
     <dependencyManagement>
7  kitchensink/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -6,14 +6,17 @@
6 6
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
7 7
     <requiredProperties>
8 8
         <requiredProperty key="richfaces-version">
9  
-            <defaultValue>4.3.0-SNAPSHOT</defaultValue>
  9
+            <defaultValue>4.2.2.Final</defaultValue>
10 10
         </requiredProperty>
11 11
         <requiredProperty key="enterprise">
12 12
             <defaultValue>n</defaultValue>
13 13
         </requiredProperty>
14 14
         <requiredProperty key="richfaces-enterprise-version">
15  
-            <defaultValue>4.3.0-SNAPSHOT</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
 
5  kitchensink/src/test/resources/projects/basic/archetype.properties
@@ -3,6 +3,7 @@ package=it.pkg
3 3
 version=0.1-SNAPSHOT
4 4
 groupId=archetype.it
5 5
 artifactId=basic
6  
-richfaces-version=4.3.0-SNAPSHOT
  6
+richfaces-version=4.2.2.Final
7 7
 enterprise=n
8  
-richfaces-enterprise-version=4.3.0-SNAPSHOT-redhat-1
  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
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.