From 73af6c43d2950fa6caf54e85f8a75f5a444ee19f Mon Sep 17 00:00:00 2001 From: Kabir Khan Date: Wed, 5 Sep 2018 14:45:07 +0100 Subject: [PATCH] [WFCORE-4085] Temporarily use WF14 as the transformation target for EAP 7.2.0. Once EAP 7.2.0 is released there is a follow up task to switch it to use EAP 7.2.0 proper in WFCORE-4089 --- .../core/model/test/util/TransformersTestParameter.java | 1 + .../jboss/as/model/test/ModelTestControllerVersion.java | 8 +++++++- pom.xml | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core-model-test/tests/src/test/java/org/jboss/as/core/model/test/util/TransformersTestParameter.java b/core-model-test/tests/src/test/java/org/jboss/as/core/model/test/util/TransformersTestParameter.java index c40b966e113..d1e4195f248 100644 --- a/core-model-test/tests/src/test/java/org/jboss/as/core/model/test/util/TransformersTestParameter.java +++ b/core-model-test/tests/src/test/java/org/jboss/as/core/model/test/util/TransformersTestParameter.java @@ -66,6 +66,7 @@ public static List setupVersions(){ //code legacy controller has some issues atm data.add(new TransformersTestParameter(ModelVersion.create(4, 1, 0), ModelTestControllerVersion.EAP_7_0_0)); data.add(new TransformersTestParameter(ModelVersion.create(5, 0, 0), ModelTestControllerVersion.EAP_7_1_0)); + data.add(new TransformersTestParameter(ModelVersion.create(8, 0, 0), ModelTestControllerVersion.EAP_7_2_0_TEMP)); return data; } diff --git a/model-test/src/main/java/org/jboss/as/model/test/ModelTestControllerVersion.java b/model-test/src/main/java/org/jboss/as/model/test/ModelTestControllerVersion.java index cb4562ccf18..47e71babf1a 100644 --- a/model-test/src/main/java/org/jboss/as/model/test/ModelTestControllerVersion.java +++ b/model-test/src/main/java/org/jboss/as/model/test/ModelTestControllerVersion.java @@ -43,7 +43,13 @@ public enum ModelTestControllerVersion { EAP_6_4_0 ("7.5.0.Final-redhat-21", true, "7.5.0", "6.4.0"), //EAP 6.4 is the earliest version we support for transformers EAP_6_4_7 ("7.5.7.Final-redhat-3", true, "7.5.0", "6.4.7"), //this one is special as it has model change in micro release EAP_7_0_0 ("7.0.0.GA-redhat-2", true, "10.0.0", "2.1.0.Final", "7.0.0"), - EAP_7_1_0 ("7.1.0.GA-redhat-11", true, "11.0.0", "3.0.10.Final", "7.1.0") + EAP_7_1_0 ("7.1.0.GA-redhat-11", true, "11.0.0", "3.0.10.Final", "7.1.0"), + + // TODO https://issues.jboss.org/browse/WFCORE-4089 Get rid of EAP_7_2_0_TEMP and enable EAP_7_2_0, once + // 7.2.0.GA-redhat-xx version is known + EAP_7_2_0_TEMP("11.0.0.Final", false, "14.0.0", "6.0.1.Final", "wf14"), + // WildFly legacy test will need to rename the *-wf14.dmr files to *-7.2.0.dmr + //EAP_7_2_0("7.2.0.Final-redhat-??", true, "14.0.0", "6.0.1.Final", "7.2.0"), ; private final String mavenGavVersion; diff --git a/pom.xml b/pom.xml index 622dfb30bda..b43a37280fa 100644 --- a/pom.xml +++ b/pom.xml @@ -198,7 +198,7 @@ 1.0.1.Final 1.4.0.Final 1.1.1.Final - 3.0.0.Final + 4.0.0.Final 1.0.6.Final ${version.org.wildfly.openssl} ${version.org.wildfly.openssl.natives}