diff --git a/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client-microprofile/main/module.xml b/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client-microprofile/main/module.xml index b0221ae..7b7e124 100755 --- a/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client-microprofile/main/module.xml +++ b/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client-microprofile/main/module.xml @@ -18,7 +18,6 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - @@ -36,6 +35,8 @@ + + diff --git a/testsuite/integration-tests/pom.xml b/testsuite/integration-tests/pom.xml index 936823d..b1a6aa4 100644 --- a/testsuite/integration-tests/pom.xml +++ b/testsuite/integration-tests/pom.xml @@ -34,6 +34,16 @@ ${project.build.directory}${file.separator}wildfly + + + org.wildfly + wildfly-galleon-pack + ${version.org.wildfly} + + org.jboss.resteasy + galleon-feature-pack + ${version.org.jboss.resteasy} + org.jboss.resteasy.microprofile galleon-feature-pack ${project.version} @@ -181,6 +191,16 @@ passive+ + + ${wildfly.feature.pack.groupId} + ${wildfly.feature.pack.artifactId} + ${wildfly.feature.pack.version} + + + ${resteasy.feature.pack.groupId} + ${resteasy.feature.pack.artifactId} + ${resteasy.feature.pack.version} + ${feature.pack.groupId} ${feature.pack.artifactId} @@ -266,6 +286,8 @@ + wildfly-preview-feature-pack + galleon-preview-feature-pack galleon-preview-feature-pack diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/microprofile/test/config/ConfigConfigurationFactoryTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/microprofile/test/config/ConfigConfigurationFactoryTest.java index c41b56f..a24f004 100644 --- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/microprofile/test/config/ConfigConfigurationFactoryTest.java +++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/microprofile/test/config/ConfigConfigurationFactoryTest.java @@ -22,11 +22,14 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.resteasy.microprofile.config.ConfigConfiguration; +import org.jboss.resteasy.microprofile.test.config.resource.MicroProfileConfigResource; +import org.jboss.resteasy.microprofile.test.config.resource.TestConfigApplication; import org.jboss.resteasy.microprofile.test.util.TestEnvironment; import org.jboss.resteasy.spi.config.ConfigurationFactory; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,11 +40,13 @@ * @author James R. Perkins */ @RunWith(Arquillian.class) +@Ignore("This breaks with WildFly 27 and RESTEasy 6.2.3.Final. Once WildFly 28 is released, this can be re-enabled.") public class ConfigConfigurationFactoryTest { @Deployment public static WebArchive deployment() { return TestEnvironment.createWar(ConfigConfigurationFactoryTest.class) + .addClasses(TestConfigApplication.class, MicroProfileConfigResource.class) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); }