Skip to content
This repository has been archived by the owner on Nov 17, 2017. It is now read-only.

Ensure compatibility with released EAP maven repo #6

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions kitchensink/pom.xml
Expand Up @@ -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>
Expand Down
Expand Up @@ -6,14 +6,17 @@
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-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">
Expand Down
14 changes: 7 additions & 7 deletions kitchensink/src/main/resources/archetype-resources/pom.xml
Expand Up @@ -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
Expand Down Expand Up @@ -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>

Expand Down
Expand Up @@ -3,6 +3,7 @@ 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-redhat-1
richfaces-enterprise-version=4.2.2.Final-redhat-1
javaee6-with-tools-enterprise-version=1.0.0.M12-redhat-1
1 change: 1 addition & 0 deletions kitchensink/src/test/resources/projects/basic/goal.txt
@@ -0,0 +1 @@
clean verify