Skip to content

Commit

Permalink
Unify Maven profiles for WildFly
Browse files Browse the repository at this point in the history
  • Loading branch information
@jharting
jharting committed Apr 1, 2015
1 parent 23f1391 commit 0bbc2be
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 439 deletions.
6 changes: 3 additions & 3 deletions examples/pom.xml
View file
Expand Up @@ -430,7 +430,7 @@
</activation>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<scope>test</scope>
</dependency>
Expand All @@ -447,7 +447,7 @@
</activation>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-remote</artifactId>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -561,7 +561,7 @@
</activation>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<scope>test</scope>
</dependency>
Expand Down
228 changes: 20 additions & 208 deletions jboss-tck-runner/pom.xml
View file
Expand Up @@ -292,9 +292,15 @@
</dependency>
<!-- Because we need this to compile the exception transformer and resource manager -->
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-common</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.logmanager</groupId>
<artifactId>log4j-jboss-logmanager</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
Expand Down Expand Up @@ -337,7 +343,7 @@
</activation>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<scope>test</scope>
<exclusions>
Expand All @@ -349,10 +355,10 @@
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.logmanager</groupId>
<artifactId>log4j-jboss-logmanager</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.logmanager</groupId>
<artifactId>log4j-jboss-logmanager</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -380,6 +386,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludedGroups>${excluded.groups}</excludedGroups>
<systemPropertyVariables>
<!-- Silencing the broken code in getActiveConfiguration(),
see https://github.com/arquillian/arquillian/blob/master/impl-base/src/main/java/org/jboss/arquillian/impl/client/container/ContainerRegistryCreator.java -->
Expand All @@ -399,214 +406,19 @@
</build>
</profile>

<!-- Run the TCK in the managed container (Web Profile) -->
<profile>
<id>incontainer-webprofile</id>
<activation>
<activeByDefault>false</activeByDefault>
<property>
<name>incontainer</name>
<value>webprofile</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-spi</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
<version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/test/resources</directory>
</resource>
<resource>
<directory>src/test/wildfly8</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludedGroups>javaee-full</excludedGroups>
<systemPropertyVariables>
<!-- Silencing the broken code in getActiveConfiguration(),
see https://github.com/arquillian/arquillian/blob/master/impl-base/src/main/java/org/jboss/arquillian/impl/client/container/ContainerRegistryCreator.java -->
<arquillian.launch>wildfly-8</arquillian.launch>
<!-- Specified system properties are not
available during in-container test execution -->
<org.jboss.cdi.tck.libraryDirectory>target/dependency/lib</org.jboss.cdi.tck.libraryDirectory>
<org.jboss.cdi.tck.testDataSource>java:jboss/datasources/ExampleDS</org.jboss.cdi.tck.testDataSource>
</systemPropertyVariables>
<systemProperties>
<jacoco.agent>${jacoco.agent}</jacoco.agent>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<!-- Run the TCK in the remote container (full Java EE platform) -->
<profile>
<id>incontainer-remote</id>
<activation>
<activeByDefault>false</activeByDefault>
<property>
<name>incontainer</name>
<value>remote</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-remote</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-spi</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.logmanager</groupId>
<artifactId>log4j-jboss-logmanager</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
<version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/test/resources</directory>
</resource>
<resource>
<directory>src/test/wildfly8</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<!-- Silencing the broken code in getActiveConfiguration(),
see https://github.com/arquillian/arquillian/blob/master/impl-base/src/main/java/org/jboss/arquillian/impl/client/container/ContainerRegistryCreator.java -->
<arquillian.launch>wildfly-8</arquillian.launch>
<!-- Specified system properties are not
available during in-container test execution -->
<org.jboss.cdi.tck.libraryDirectory>target/dependency/lib</org.jboss.cdi.tck.libraryDirectory>
<org.jboss.cdi.tck.testDataSource>java:jboss/datasources/ExampleDS</org.jboss.cdi.tck.testDataSource>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<!-- WildFly 9.x -->
<!-- Run only web profile tests -->
<profile>
<id>wildfly9</id>
<id>webprofile</id>
<activation>
<activeByDefault>false</activeByDefault>
<property>
<name>incontainer</name>
<value>wildfly9</value>
<name>webprofile</name>
<value>true</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-spi</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.logmanager</groupId>
<artifactId>log4j-jboss-logmanager</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
<version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/test/resources</directory>
</resource>
<resource>
<directory>src/test/wildfly8</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<!-- Silencing the broken code in getActiveConfiguration(),
see https://github.com/arquillian/arquillian/blob/master/impl-base/src/main/java/org/jboss/arquillian/impl/client/container/ContainerRegistryCreator.java -->
<arquillian.launch>wildfly-8</arquillian.launch>
<!-- Specified system properties are not
available during in-container test execution -->
<org.jboss.cdi.tck.libraryDirectory>target/dependency/lib</org.jboss.cdi.tck.libraryDirectory>
<org.jboss.cdi.tck.testDataSource>java:jboss/datasources/ExampleDS</org.jboss.cdi.tck.testDataSource>
</systemPropertyVariables>
<systemProperties>
<jacoco.agent>${jacoco.agent}</jacoco.agent>
<additional.vm.args>${additional.vm.args}</additional.vm.args>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<excluded.groups>javaee-full</excluded.groups>
</properties>
</profile>

<profile>
Expand Down
25 changes: 5 additions & 20 deletions pom.xml
View file
Expand Up @@ -69,7 +69,6 @@
<shrinkwrap.descriptors.version>1.1.0-beta-1</shrinkwrap.descriptors.version>
<testng.version>5.10</testng.version>
<weld.api.version>3.0.Alpha5</weld.api.version>
<wildfly.version>8.0.0.Final</wildfly.version>
<wildfly.arquillian.version>1.0.0.Alpha2</wildfly.arquillian.version>
</properties>

Expand Down Expand Up @@ -276,34 +275,20 @@
<version>${arquillian.glassfish.version}</version>
</dependency>

<!-- WildFly Arquillian container -->
<!-- WildFly -->
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-common</artifactId>
<version>${wildfly.version}</version>
</dependency>

<dependency>
<groupId>org.wildfly</groupId>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<version>${wildfly.version}</version>
</dependency>

<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-remote</artifactId>
<version>${wildfly.version}</version>
<version>${wildfly.arquillian.version}</version>
</dependency>

<!-- WildFly 9.x -->
<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<artifactId>wildfly-arquillian-protocol-jmx</artifactId>
<version>${wildfly.arquillian.version}</version>
</dependency>
<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-protocol-jmx</artifactId>
<artifactId>wildfly-arquillian-common</artifactId>
<version>${wildfly.arquillian.version}</version>
</dependency>

Expand Down

0 comments on commit 0bbc2be

Please sign in to comment.