From a1b880bdab5d7e4fbe1dd68ee7fcbba149994569 Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Fri, 6 Dec 2024 11:39:52 +0100 Subject: [PATCH] [CONVERSION COMMIT] Use EAP in tests --- pom.xml | 10 +++++ tests/bootable-tests/pom.xml | 5 +++ .../test-project/package-bootable-pom.xml | 10 ++++- .../package-bootable-root-pom.xml | 10 ++++- tests/domain-tests/pom.xml | 41 +++++++++++++++++++ .../resources/test-project/provision-pom.xml | 10 ++++- tests/pom.xml | 13 +++++- ...stractProvisionConfiguredMojoTestCase.java | 15 +++++++ .../test-project/package-channel-pom.xml | 7 ++-- .../package-default-config-pom.xml | 10 ++++- .../package-invalid-deployment-pom.xml | 10 ++++- .../package-invalid-deployment2-pom.xml | 10 ++++- ...ckage-multiple-deployments-missing-pom.xml | 10 ++++- .../package-multiple-deployments-pom.xml | 10 ++++- .../package-no-deployment-pom.xml | 10 ++++- .../resources/test-project/package-pom.xml | 10 ++++- .../resources/test-project/provision-pom.xml | 10 ++++- 17 files changed, 185 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 6ce9a299..9e2073d9 100644 --- a/pom.xml +++ b/pom.xml @@ -122,6 +122,11 @@ true 5.1 ${project.basedir}/../docs/releases/${release.short.version} + + + org.jboss.eap:wildfly-ee-galleon-pack + org.jboss.eap.channels + eap-8.0 @@ -137,6 +142,11 @@ JBoss Public Repository Group https://repository.jboss.org/nexus/content/groups/public/ + + jboss-enterprise-maven-repository + JBoss Enterprise Maven Repository + https://maven.repository.redhat.com/ga/ + diff --git a/tests/bootable-tests/pom.xml b/tests/bootable-tests/pom.xml index 949f499e..6393ee17 100644 --- a/tests/bootable-tests/pom.xml +++ b/tests/bootable-tests/pom.xml @@ -72,6 +72,11 @@ maven-resolver-util test + + org.wildfly.channel + channel-core + test + org.jboss.slf4j diff --git a/tests/bootable-tests/src/test/resources/test-project/package-bootable-pom.xml b/tests/bootable-tests/src/test/resources/test-project/package-bootable-pom.xml index cb749042..685dd6f7 100644 --- a/tests/bootable-tests/src/test/resources/test-project/package-bootable-pom.xml +++ b/tests/bootable-tests/src/test/resources/test-project/package-bootable-pom.xml @@ -30,9 +30,17 @@ org.jboss.eap.plugins eap-maven-plugin + + + + CHANNEL_GROUP_ID + CHANNEL_ARTIFACT_ID + + + - wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION + SERVER_PRODUCER diff --git a/tests/bootable-tests/src/test/resources/test-project/package-bootable-root-pom.xml b/tests/bootable-tests/src/test/resources/test-project/package-bootable-root-pom.xml index b3439655..5f053c68 100644 --- a/tests/bootable-tests/src/test/resources/test-project/package-bootable-root-pom.xml +++ b/tests/bootable-tests/src/test/resources/test-project/package-bootable-root-pom.xml @@ -30,9 +30,17 @@ org.jboss.eap.plugins eap-maven-plugin + + + + CHANNEL_GROUP_ID + CHANNEL_ARTIFACT_ID + + + - wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION + SERVER_PRODUCER diff --git a/tests/domain-tests/pom.xml b/tests/domain-tests/pom.xml index ba5c0ac0..d20a3c28 100644 --- a/tests/domain-tests/pom.xml +++ b/tests/domain-tests/pom.xml @@ -31,6 +31,47 @@ ${project.version} test + + org.apache.maven.resolver + maven-resolver-api + test + + + org.apache.maven.resolver + maven-resolver-spi + test + + + org.apache.maven.resolver + maven-resolver-impl + test + + + org.apache.maven.resolver + maven-resolver-connector-basic + test + + + org.apache.maven.resolver + maven-resolver-transport-wagon + test + + + + org.apache.maven.wagon + wagon-http + test + + + org.apache.maven.resolver + maven-resolver-util + test + + + org.wildfly.channel + channel-core + test + junit junit diff --git a/tests/domain-tests/src/test/resources/test-project/provision-pom.xml b/tests/domain-tests/src/test/resources/test-project/provision-pom.xml index ed49f02e..dbc33ee3 100644 --- a/tests/domain-tests/src/test/resources/test-project/provision-pom.xml +++ b/tests/domain-tests/src/test/resources/test-project/provision-pom.xml @@ -16,9 +16,17 @@ org.jboss.eap.plugins eap-maven-plugin + + + + CHANNEL_GROUP_ID + CHANNEL_ARTIFACT_ID + + + - wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION + SERVER_PRODUCER true true diff --git a/tests/pom.xml b/tests/pom.xml index 0c2b6815..16d8447c 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -44,9 +44,17 @@ package + + + + ${wildfly.channel.groupId} + ${wildfly.channel.artifactId} + + + - wildfly@maven(org.jboss.universe:community-universe)#${version.org.wildfly} + ${wildfly.test.server.producer} ${project.build.directory}/wildfly @@ -65,6 +73,9 @@ ${jboss.home} ${jboss.home} ${version.org.wildfly} + ${wildfly.test.server.producer} + ${wildfly.channel.groupId} + ${wildfly.channel.artifactId} 10099 ${wildfly.test.config.dir} diff --git a/tests/shared/src/main/java/org/wildfly/plugin/tests/AbstractProvisionConfiguredMojoTestCase.java b/tests/shared/src/main/java/org/wildfly/plugin/tests/AbstractProvisionConfiguredMojoTestCase.java index 5ecbe2de..dc598237 100644 --- a/tests/shared/src/main/java/org/wildfly/plugin/tests/AbstractProvisionConfiguredMojoTestCase.java +++ b/tests/shared/src/main/java/org/wildfly/plugin/tests/AbstractProvisionConfiguredMojoTestCase.java @@ -67,8 +67,14 @@ @RunWith(JUnit4.class) public abstract class AbstractProvisionConfiguredMojoTestCase extends AbstractMojoTestCase { private static final String TEST_REPLACE_WF_VERSION = "WF_VERSION"; + private static final String TEST_REPLACE_SERVER_PRODUCER = "SERVER_PRODUCER"; + private static final String TEST_REPLACE_CHANNEL_GROUP_ID = "CHANNEL_GROUP_ID"; + private static final String TEST_REPLACE_CHANNEL_ARTIFACT_ID = "CHANNEL_ARTIFACT_ID"; private static final String TEST_REPLACE_BASE_DIR_ABSOLUTE_URL = "WF_BASE_DIR_ABSOLUTE_URL"; static final String WILDFLY_VERSION = "wildfly.test.version"; + static final String WILDFLY_SERVER_PRODUCER = "wildfly.test.server.producer"; + static final String WILDFLY_CHANNEL_GROUP_ID = "wildfly.test.channel.groupId"; + static final String WILDFLY_CHANNEL_ARTIFACT_ID = "wildfly.test.channel.artifactId"; private final String artifactId; protected AbstractProvisionConfiguredMojoTestCase(String artifactId) { @@ -151,6 +157,15 @@ protected Mojo lookupConfiguredMojo(final Path pom, final String goal) throws Ex private void patchPomFile(final Path pom) throws IOException { StringBuilder content = new StringBuilder(); for (String s : Files.readAllLines(pom)) { + if (s.contains(TEST_REPLACE_CHANNEL_GROUP_ID)) { + s = s.replace(TEST_REPLACE_CHANNEL_GROUP_ID, System.getProperty(WILDFLY_CHANNEL_GROUP_ID)); + } + if (s.contains(TEST_REPLACE_CHANNEL_ARTIFACT_ID)) { + s = s.replace(TEST_REPLACE_CHANNEL_ARTIFACT_ID, System.getProperty(WILDFLY_CHANNEL_ARTIFACT_ID)); + } + if (s.contains(TEST_REPLACE_SERVER_PRODUCER)) { + s = s.replace(TEST_REPLACE_SERVER_PRODUCER, System.getProperty(WILDFLY_SERVER_PRODUCER)); + } if (s.contains(TEST_REPLACE_WF_VERSION)) { s = s.replace(TEST_REPLACE_WF_VERSION, System.getProperty(WILDFLY_VERSION)); } diff --git a/tests/standalone-tests/src/test/resources/test-project/package-channel-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-channel-pom.xml index 32a5fdf3..36b09655 100644 --- a/tests/standalone-tests/src/test/resources/test-project/package-channel-pom.xml +++ b/tests/standalone-tests/src/test/resources/test-project/package-channel-pom.xml @@ -19,15 +19,14 @@ - org.wildfly.channels - wildfly - WF_VERSION + CHANNEL_GROUP_ID + CHANNEL_ARTIFACT_ID - org.wildfly:wildfly-galleon-pack:WF_VERSION + SERVER_PRODUCER diff --git a/tests/standalone-tests/src/test/resources/test-project/package-default-config-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-default-config-pom.xml index 7ad6116e..94d101c5 100644 --- a/tests/standalone-tests/src/test/resources/test-project/package-default-config-pom.xml +++ b/tests/standalone-tests/src/test/resources/test-project/package-default-config-pom.xml @@ -16,9 +16,17 @@ org.jboss.eap.plugins eap-maven-plugin + + + + CHANNEL_GROUP_ID + CHANNEL_ARTIFACT_ID + + + - wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION + SERVER_PRODUCER true diff --git a/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment-pom.xml index a75c31ab..2747b71f 100644 --- a/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment-pom.xml +++ b/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment-pom.xml @@ -16,9 +16,17 @@ org.jboss.eap.plugins eap-maven-plugin + + + + CHANNEL_GROUP_ID + CHANNEL_ARTIFACT_ID + + + - wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION + SERVER_PRODUCER diff --git a/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment2-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment2-pom.xml index a1a32a6a..790e7427 100644 --- a/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment2-pom.xml +++ b/tests/standalone-tests/src/test/resources/test-project/package-invalid-deployment2-pom.xml @@ -17,9 +17,17 @@ org.jboss.eap.plugins eap-maven-plugin + + + + CHANNEL_GROUP_ID + CHANNEL_ARTIFACT_ID + + + - wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION + SERVER_PRODUCER diff --git a/tests/standalone-tests/src/test/resources/test-project/package-multiple-deployments-missing-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-multiple-deployments-missing-pom.xml index 44d4b4f9..ea62007c 100644 --- a/tests/standalone-tests/src/test/resources/test-project/package-multiple-deployments-missing-pom.xml +++ b/tests/standalone-tests/src/test/resources/test-project/package-multiple-deployments-missing-pom.xml @@ -32,9 +32,17 @@ org.foo:bar:war + + + + CHANNEL_GROUP_ID + CHANNEL_ARTIFACT_ID + + + - wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION + SERVER_PRODUCER diff --git a/tests/standalone-tests/src/test/resources/test-project/package-multiple-deployments-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-multiple-deployments-pom.xml index 56984052..46129b4a 100644 --- a/tests/standalone-tests/src/test/resources/test-project/package-multiple-deployments-pom.xml +++ b/tests/standalone-tests/src/test/resources/test-project/package-multiple-deployments-pom.xml @@ -52,9 +52,17 @@ ::jar test + + + + CHANNEL_GROUP_ID + CHANNEL_ARTIFACT_ID + + + - wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION + SERVER_PRODUCER diff --git a/tests/standalone-tests/src/test/resources/test-project/package-no-deployment-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-no-deployment-pom.xml index a6b9d131..d1fd5d53 100644 --- a/tests/standalone-tests/src/test/resources/test-project/package-no-deployment-pom.xml +++ b/tests/standalone-tests/src/test/resources/test-project/package-no-deployment-pom.xml @@ -16,9 +16,17 @@ org.jboss.eap.plugins eap-maven-plugin + + + + CHANNEL_GROUP_ID + CHANNEL_ARTIFACT_ID + + + - wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION + SERVER_PRODUCER false false diff --git a/tests/standalone-tests/src/test/resources/test-project/package-pom.xml b/tests/standalone-tests/src/test/resources/test-project/package-pom.xml index ec12de70..86d7d805 100644 --- a/tests/standalone-tests/src/test/resources/test-project/package-pom.xml +++ b/tests/standalone-tests/src/test/resources/test-project/package-pom.xml @@ -16,9 +16,17 @@ org.jboss.eap.plugins eap-maven-plugin + + + + CHANNEL_GROUP_ID + CHANNEL_ARTIFACT_ID + + + - wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION + SERVER_PRODUCER diff --git a/tests/standalone-tests/src/test/resources/test-project/provision-pom.xml b/tests/standalone-tests/src/test/resources/test-project/provision-pom.xml index 6c89b623..6d09a5c8 100644 --- a/tests/standalone-tests/src/test/resources/test-project/provision-pom.xml +++ b/tests/standalone-tests/src/test/resources/test-project/provision-pom.xml @@ -16,9 +16,17 @@ org.jboss.eap.plugins eap-maven-plugin + + + + CHANNEL_GROUP_ID + CHANNEL_ARTIFACT_ID + + + - wildfly@maven(org.jboss.universe:community-universe)#WF_VERSION + SERVER_PRODUCER