Permalink
Browse files

Fix compatibility with EAP ER6/7 repo

Signed-off-by: Fred Bricon <fbricon@gmail.com>
  • Loading branch information...
1 parent e7b7d78 commit 00a1893e78aa9ee4c14a63c049d0db5764e92ad6 @fbricon fbricon committed May 11, 2012
@@ -53,6 +53,13 @@
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
@@ -72,4 +79,19 @@
</pluginManagement>
</build>
+ <properties>
+ <enterprise.available>false</enterprise.available>
+ </properties>
+
+
+ <profiles>
+ <!-- Build with -Penterprise to test against an EAP repository -->
+ <profile>
+ <id>enterprise</id>
+ <properties>
+ <enterprise.available>true</enterprise.available>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
@@ -10,7 +10,7 @@
#if ($name != "")
<name>${name}</name>
#end
- <description>A starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6, generated from the jboss-javaee6-webapp archetype</description>
+ <description>A starter Java EE 6 webapp project for use on JBoss AS 7.1 / EAP 6, generated from the jboss-javaee6-webapp archetype</description>
<properties>
<!-- Explicitly declaring the source encoding eliminates the following
@@ -22,17 +22,17 @@
to import. -->
#if ($enterprise == "true" || $enterprise == "y" || $enterprise == "yes" )
<!-- Certified version of the JBoss EAP components we want to use -->
- <jboss.bom.version>1.0.0.M6-redhat-1</jboss.bom.version>
+ <jboss.bom.version>1.0.0.M7-redhat-1</jboss.bom.version>
<!-- Alternatively, comment out the above line, and un-comment the
- line below to use version 1.0.0M5 which is based on community built dependencies. -->
- <!-- <jboss.bom.version>1.0.0.M6</jboss.bom.version> -->
+ line below to use version 1.0.0M7 which is based on community built dependencies. -->
+ <!-- <jboss.bom.version>1.0.0.M7</jboss.bom.version> -->
#else
- <jboss.bom.version>1.0.0.M6</jboss.bom.version>
+ <jboss.bom.version>1.0.0.M7</jboss.bom.version>
<!-- Alternatively, comment out the above line, and un-comment the
- line below to use version 1.0.0.M6-redhat-1 which is a release certified
+ line below to use version 1.0.0.M7-redhat-1 which is a release certified
to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6
maven repository. -->
- <!-- <jboss.bom.version>1.0.0.M6-redhat-1</jboss.bom.version>> -->
+ <!-- <jboss.bom.version>1.0.0.M7-redhat-1</jboss.bom.version>> -->
#end
</properties>
@@ -128,7 +128,7 @@
in JBoss AS 7 -->
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -1 +1 @@
-clean package
+clean verify
@@ -0,0 +1,7 @@
+#Mon Nov 14 16:24:40 EST 2011
+package=it.pkg
+version=0.1-SNAPSHOT
+name=Java EE 6 Enterprise webapp project
+groupId=archetype.it
+artifactId=enterprise
+enterprise=${enterprise.available}

0 comments on commit 00a1893

Please sign in to comment.