Permalink
Browse files

Strenghten compatibility with EAP version changes

Signed-off-by: Fred Bricon <fbricon@gmail.com>
  • Loading branch information...
fbricon committed Jun 19, 2012
1 parent 4a7b293 commit ee90b6377b0a34cb2219e2e56ee3f0c086e9b661
Showing with 58 additions and 24 deletions.
  1. +3 −0 jboss-javaee6-webapp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
  2. +6 −6 jboss-javaee6-webapp-archetype/src/main/resources/archetype-resources/pom.xml
  3. +1 −0 jboss-javaee6-webapp-archetype/src/test/resources/projects/basic/archetype.properties
  4. +1 −0 jboss-javaee6-webapp-archetype/src/test/resources/projects/enterprise/archetype.properties
  5. +3 −0 jboss-javaee6-webapp-blank-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
  6. +6 −6 jboss-javaee6-webapp-blank-archetype/src/main/resources/archetype-resources/pom.xml
  7. +1 −0 jboss-javaee6-webapp-blank-archetype/src/test/resources/projects/basic/archetype.properties
  8. +8 −0 jboss-javaee6-webapp-blank-archetype/src/test/resources/projects/enterprise/archetype.properties
  9. +1 −0 jboss-javaee6-webapp-blank-archetype/src/test/resources/projects/enterprise/goal.txt
  10. +3 −0 jboss-javaee6-webapp-ear-archetype/src/main/resources/META-INF/maven/archetype-metadata-blank.xml
  11. +3 −0 jboss-javaee6-webapp-ear-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
  12. +6 −6 jboss-javaee6-webapp-ear-archetype/src/main/resources/archetype-resources/pom.xml
  13. +1 −0 jboss-javaee6-webapp-ear-archetype/src/test/resources/projects/enterprise/archetype.properties
  14. +1 −0 jboss-javaee6-webapp-ear-archetype/src/test/resources/projects/multi/archetype.properties
  15. +6 −6 jboss-javaee6-webapp-ear-blank-archetype/src/main/resources/archetype-resources/pom.xml
  16. +6 −0 jboss-javaee6-webapp-ear-blank-archetype/src/test/resources/projects/enterprise/archetype.properties
  17. +1 −0 jboss-javaee6-webapp-ear-blank-archetype/src/test/resources/projects/enterprise/goal.txt
  18. +1 −0 jboss-javaee6-webapp-ear-blank-archetype/src/test/resources/projects/multi/archetype.properties
@@ -9,6 +9,9 @@
<requiredProperty key="enterprise">
<defaultValue>false</defaultValue>
</requiredProperty>
+ <requiredProperty key="jboss-bom-enterprise-version">
+ <defaultValue>1.0.0.M12-redhat-1</defaultValue>
+ </requiredProperty>
</requiredProperties>
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
@@ -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.M7-redhat-1</jboss.bom.version>
+ <jboss.bom.version>${jboss-bom-enterprise-version}</jboss.bom.version>
<!-- Alternatively, comment out the above line, and un-comment the
- 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> -->
+ line below to use version 1.0.0.Final which is based on community built dependencies. -->
+ <!-- <jboss.bom.version>1.0.0.Final</jboss.bom.version> -->
#else
- <jboss.bom.version>1.0.0.M7</jboss.bom.version>
+ <jboss.bom.version>1.0.0.Final</jboss.bom.version>
<!-- Alternatively, comment out the above line, and un-comment the
- line below to use version 1.0.0.M7-redhat-1 which is a release certified
+ line below to use version ${jboss-bom-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. -->
- <!-- <jboss.bom.version>1.0.0.M7-redhat-1</jboss.bom.version>> -->
+ <!-- <jboss.bom.version>${jboss-bom-enterprise-version}</jboss.bom.version>> -->
#end
</properties>
@@ -5,3 +5,4 @@ name=Java EE 6 webapp project
groupId=archetype.it
artifactId=basic
enterprise=false
+jboss-bom-enterprise-version=1.0.0.M12-redhat-1
@@ -5,3 +5,4 @@ name=Java EE 6 Enterprise webapp project
groupId=archetype.it
artifactId=enterprise
enterprise=${enterprise.available}
+jboss-bom-enterprise-version=1.0.0.M12-redhat-1
@@ -9,6 +9,9 @@
<requiredProperty key="enterprise">
<defaultValue>false</defaultValue>
</requiredProperty>
+ <requiredProperty key="jboss-bom-enterprise-version">
+ <defaultValue>1.0.0.M12-redhat-1</defaultValue>
+ </requiredProperty>
</requiredProperties>
<fileSets>
<fileSet encoding="UTF-8">
@@ -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.M7-redhat-1</jboss.bom.version>
+ <jboss.bom.version>${jboss-bom-enterprise-version}</jboss.bom.version>
<!-- Alternatively, comment out the above line, and un-comment the
- 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> -->
+ line below to use version 1.0.0.Final which is based on community built dependencies. -->
+ <!-- <jboss.bom.version>1.0.0.Final</jboss.bom.version> -->
#else
- <jboss.bom.version>1.0.0.M7</jboss.bom.version>
+ <jboss.bom.version>1.0.0.Final</jboss.bom.version>
<!-- Alternatively, comment out the above line, and un-comment the
- line below to use version 1.0.0.M7-redhat-1 which is a release certified
+ line below to use version ${jboss-bom-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. -->
- <!-- <jboss.bom.version>1.0.0.M7-redhat-1</jboss.bom.version>> -->
+ <!-- <jboss.bom.version>${jboss-bom-enterprise-version}</jboss.bom.version>> -->
#end
</properties>
@@ -5,3 +5,4 @@ name=Java EE 6 webapp project
groupId=archetype.it
artifactId=basic
enterprise=false
+jboss-bom-enterprise-version=1.0.0.M12-redhat-1
@@ -0,0 +1,8 @@
+#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}
+jboss-bom-enterprise-version=1.0.0.M12-redhat-1
@@ -12,6 +12,9 @@
<requiredProperty key="enterprise">
<defaultValue>false</defaultValue>
</requiredProperty>
+ <requiredProperty key="jboss-bom-enterprise-version">
+ <defaultValue>1.0.0.M12-redhat-1</defaultValue>
+ </requiredProperty>
</requiredProperties>
<fileSets>
<fileSet filtered="false" packaged="false">
@@ -12,6 +12,9 @@
<requiredProperty key="enterprise">
<defaultValue>false</defaultValue>
</requiredProperty>
+ <requiredProperty key="jboss-bom-enterprise-version">
+ <defaultValue>1.0.0.M12-redhat-1</defaultValue>
+ </requiredProperty>
</requiredProperties>
<fileSets>
<fileSet filtered="true" packaged="false">
@@ -28,17 +28,17 @@ $symbol_escape = '\' )
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.M7-redhat-1</jboss.bom.version>
+ <jboss.bom.version>${jboss-bom-enterprise-version}</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.M7</jboss.bom.version> -->
+ line below to use version 1.0.0.Final which is based on community built dependencies. -->
+ <!-- <jboss.bom.version>1.0.0.Final</jboss.bom.version> -->
#else
- <jboss.bom.version>1.0.0.M7</jboss.bom.version>
+ <jboss.bom.version>1.0.0.Final</jboss.bom.version>
<!-- Alternatively, comment out the above line, and un-comment the
- line below to use version 1.0.0.M7-redhat-1 which is a release certified
+ line below to use version ${jboss-bom-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. -->
- <!-- <jboss.bom.version>1.0.0.M7-redhat-1</jboss.bom.version>> -->
+ <!-- <jboss.bom.version>${jboss-bom-enterprise-version}</jboss.bom.version>> -->
#end
</properties>
@@ -3,3 +3,4 @@ artifactId=enterprise
version=0.0.1-SNAPSHOT
package=foo.bar.enterprise
enterprise=${enterprise.available}
+jboss-bom-enterprise-version=1.0.0.M12-redhat-1
@@ -3,3 +3,4 @@ artifactId=multi
version=0.0.1-SNAPSHOT
package=foo.bar.multi
enterprise=false
+jboss-bom-enterprise-version=1.0.0.M12-redhat-1
@@ -28,17 +28,17 @@ $symbol_escape = '\' )
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.M7-redhat-1</jboss.bom.version>
+ <jboss.bom.version>${jboss-bom-enterprise-version}</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.M7</jboss.bom.version> -->
+ line below to use version 1.0.0.Final which is based on community built dependencies. -->
+ <!-- <jboss.bom.version>1.0.0.Final</jboss.bom.version> -->
#else
- <jboss.bom.version>1.0.0.M7</jboss.bom.version>
+ <jboss.bom.version>1.0.0.Final</jboss.bom.version>
<!-- Alternatively, comment out the above line, and un-comment the
- line below to use version 1.0.0.M7-redhat-1 which is a release certified
+ line below to use version ${jboss-bom-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. -->
- <!-- <jboss.bom.version>1.0.0.M7-redhat-1</jboss.bom.version>> -->
+ <!-- <jboss.bom.version>${jboss-bom-enterprise-version}</jboss.bom.version>> -->
#end
</properties>
@@ -0,0 +1,6 @@
+groupId=foo.bar
+artifactId=enterprise
+version=0.0.1-SNAPSHOT
+package=foo.bar.enterprise
+enterprise=${enterprise.available}
+jboss-bom-enterprise-version=1.0.0.M12-redhat-1
@@ -3,3 +3,4 @@ artifactId=multi
version=0.0.1-SNAPSHOT
package=foo.bar.multi
enterprise=false
+jboss-bom-enterprise-version=1.0.0.M12-redhat-1

1 comment on commit ee90b63

Contributor

fbricon commented on ee90b63 Jun 19, 2012

Using a jboss-bom-enterprise-version property allows JBoss Tools to quickly react to EAP repo changes without needing to respin new archetypes

Please sign in to comment.