modules/plugins/jboss-as-7/pom.xml
| 84 ----------
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java
| 8
pom.xml
| 2
3 files changed, 4 insertions(+), 90 deletions(-)
New commits:
commit 3b1e22ae89819d89a64c7d319099f53df85bfca3
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jun 19 15:20:09 2012 -0400
add support for EAP 6.0.0 (GA) and remove support for all the EAP 6.0 ER's
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index e9f877a..16eb982 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -240,92 +240,12 @@
</profile>
<profile>
- <id>eap600Beta1.itest.setup</id>
+ <id>eap600.itest.setup</id>
<activation>
<property>
<name>as7.version</name>
- <value>6.0.0.Beta1</value>
- </property>
- </activation>
-
- <properties>
- <as7.url>Please set the as7.url system property to the location of the EAP
${as7.version} distribution zipfile.</as7.url>
-
<jboss-as-arquillian-container-managed.version>7.1.1.Final</jboss-as-arquillian-container-managed.version>
- </properties>
- </profile>
-
- <profile>
- <id>eap600ER4.itest.setup</id>
-
- <activation>
- <property>
- <name>as7.version</name>
- <value>6.0.0.ER4</value>
- </property>
- </activation>
-
- <properties>
- <as7.url>Please set the as7.url system property to the location of the EAP
${as7.version} distribution zipfile.</as7.url>
-
<jboss-as-arquillian-container-managed.version>7.1.1.Final</jboss-as-arquillian-container-managed.version>
- </properties>
- </profile>
-
- <profile>
- <id>eap600ER5.itest.setup</id>
-
- <activation>
- <property>
- <name>as7.version</name>
- <value>6.0.0.ER5</value>
- </property>
- </activation>
-
- <properties>
- <as7.url>Please set the as7.url system property to the location of the EAP
${as7.version} distribution zipfile.</as7.url>
-
<jboss-as-arquillian-container-managed.version>7.1.1.Final</jboss-as-arquillian-container-managed.version>
- </properties>
- </profile>
-
- <profile>
- <id>eap600ER7.itest.setup</id>
-
- <activation>
- <property>
- <name>as7.version</name>
- <value>6.0.0.ER7</value>
- </property>
- </activation>
-
- <properties>
- <as7.url>Please set the as7.url system property to the location of the EAP
${as7.version} distribution zipfile.</as7.url>
-
<jboss-as-arquillian-container-managed.version>7.1.1.Final</jboss-as-arquillian-container-managed.version>
- </properties>
- </profile>
-
- <profile>
- <id>eap600ER8.itest.setup</id>
-
- <activation>
- <property>
- <name>as7.version</name>
- <value>6.0.0.ER8</value>
- </property>
- </activation>
-
- <properties>
- <as7.url>Please set the as7.url system property to the location of the EAP
${as7.version} distribution zipfile.</as7.url>
-
<jboss-as-arquillian-container-managed.version>7.1.1.Final</jboss-as-arquillian-container-managed.version>
- </properties>
- </profile>
-
- <profile>
- <id>eap600CR1.itest.setup</id>
-
- <activation>
- <property>
- <name>as7.version</name>
- <value>6.0.0.CR1</value>
+ <value>6.0.0</value>
</property>
</activation>
diff --git
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java
index a1e26e2..f6f1502 100644
---
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java
+++
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java
@@ -61,13 +61,7 @@ public abstract class AbstractServerComponentTest extends
AbstractJBossAS7Plugin
private static final Map<String, String> EAP6_VERSION_TO_AS7_VERSION_MAP = new
HashMap<String, String>();
static {
- EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.Beta1",
"7.1.0.Final-redhat-1");
- EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.ER4",
"7.1.1.Final-redhat-1");
- EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.ER5",
"7.1.1.Final-redhat-1");
- EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.ER6",
"7.1.1.Final-redhat-1");
- EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.ER7",
"7.1.1.Final-redhat-1");
- EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.ER8",
"7.1.2.Final-redhat-1");
- EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.CR1",
"7.1.2.Final-redhat-1");
+ EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0",
"7.1.2.Final-redhat-1");
}
private static final String RELEASE_VERSION_TRAIT_NAME =
"_skm:release-version";
commit 970df9f180e9de788b8e85d6a3f9ae6a01e3ec25
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jun 19 15:19:12 2012 -0400
upgrade Arquillian bom from 1.0.0.Final to 1.0.1.Final
diff --git a/pom.xml b/pom.xml
index 4799e55..210b697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
<resteasy.version>2.3.3.Final</resteasy.version>
<freemarker.version>2.3.18</freemarker.version>
<powermock.version>1.4.11</powermock.version>
- <arquillian.version>1.0.0.Final</arquillian.version>
+ <arquillian.version>1.0.1.Final</arquillian.version>
<animal.sniffer.version>1.7</animal.sniffer.version>
<xercesImpl.version>2.9.1-jbossas-2</xercesImpl.version> <!-- see
BZ-820629 and CVE-2009-2625 -->
Show replies by date