Repository: deltaspike Updated Branches: refs/heads/master bbd5fa8b2 -> 9ab5c5cac
DELTASPIKE-1031 update profiles for WFLY Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/9ab5c5ca Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/9ab5c5ca Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/9ab5c5ca Branch: refs/heads/master Commit: 9ab5c5cac3a97c63e31858992f1046fa4fcd31cb Parents: bbd5fa8 Author: Matej Novotny <[email protected]> Authored: Fri Nov 20 13:13:20 2015 +0100 Committer: Rafael Benevides <[email protected]> Committed: Tue Nov 24 14:50:35 2015 -0500 ---------------------------------------------------------------------- deltaspike/parent/code/pom.xml | 12 ++++++------ .../src/main/resources/arquillian-jboss.xml | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9ab5c5ca/deltaspike/parent/code/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml index a83d54c..fd58c47 100644 --- a/deltaspike/parent/code/pom.xml +++ b/deltaspike/parent/code/pom.xml @@ -37,8 +37,8 @@ <properties> <container.unpack.directory>${java.io.tmpdir}/deltaspike-arquillian-containers</container.unpack.directory> <jboss.as.version>7.1.1.Final</jboss.as.version> - <wildfly.version>8.0.0.Final</wildfly.version> - <wildfly.arquillian.version>1.0.1.Final</wildfly.arquillian.version> + <wildfly.version>9.0.2.Final</wildfly.version> + <wildfly.arquillian.version>1.0.2.Final</wildfly.arquillian.version> <glassfish3.version>3.1.2.2</glassfish3.version> <glassfish4.version>4.0</glassfish4.version> <wls.version>12.1</wls.version> @@ -783,7 +783,7 @@ <!-- * WildFly has to be locally installed and must be started * - * JBOSS_HOME must be set for this work correctly! + * JBOSS_HOME must be set for this to work correctly! * * Start the build with: * $> mvn clean install -Pwildfly-managed @@ -828,7 +828,7 @@ <version>${maven.surefire.plugin.version}</version> <configuration> <systemProperties> - <arquillian.launch>jbossas-managed-7</arquillian.launch> + <arquillian.launch>wildfly-managed</arquillian.launch> <arquillian.xml>arquillian-jboss.xml</arquillian.xml> <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage> <cdicontainer.version>${cdicontainer.version}</cdicontainer.version> @@ -950,7 +950,7 @@ <profile> <id>wildfly-remote</id> - <!-- AS7 must be started manually for this work correctly - debug hints see arquillian.xml --> + <!-- Wildfly must be started manually for this work correctly - for debug hints see arquillian-jboss.xml --> <properties> <cdicontainer.version>wildfly-${wildfly.version}</cdicontainer.version> @@ -991,7 +991,7 @@ <version>${maven.surefire.plugin.version}</version> <configuration> <systemProperties> - <arquillian.launch>jbossas-remote-7</arquillian.launch> + <arquillian.launch>wildfly-remote</arquillian.launch> <arquillian.xml>arquillian-jboss.xml</arquillian.xml> <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage> <cdicontainer.version>${cdicontainer.version}</cdicontainer.version> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9ab5c5ca/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml ---------------------------------------------------------------------- diff --git a/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml b/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml index 3eb63a6..d2000ad 100644 --- a/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml +++ b/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml @@ -38,6 +38,15 @@ <property name="cdicontainer.version">${cdicontainer.version}</property> </configuration> </container> + + <container qualifier="wildfly-managed"> + <configuration> + <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m -Dcdicontainer.version=${cdicontainer.version} ${jacoco.agent}</property> + <property name="outputToConsole">false</property> + <property name="allowConnectingToRunningServer">true</property> + <property name="cdicontainer.version">${cdicontainer.version}</property> + </configuration> + </container> <container qualifier="jbossas-build-managed-7"> <configuration> @@ -58,8 +67,8 @@ </configuration> </container> - <container qualifier="jbossas-remote-7"> - <!-- + <!--Remote profiles + for remote debugging enable "remote socket debugging" - uncomment: set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n" in @@ -67,6 +76,12 @@ and connect to port 8787 --> + <container qualifier="jbossas-remote-7"> + + </container> + + <container qualifier="wildfly-remote"> + </container> </arquillian>
