Skip to content

Commit

Permalink
Remove oldest WildFly versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@astefanutti
astefanutti committed May 12, 2017
1 parent c3f64f5 commit d66caa5
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 166 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ install:
script:
- mvn -B test -Pjacoco -Pweld -Pstandalone
- mvn -B test -Pjacoco -Powb -pl envs/se
- mvn -B test -Pjacoco -Pwildfly-8.x -pl envs/ee
- mvn -B test -Pjacoco -Pwildfly-9.x -pl envs/ee
- mvn -B test -Pjacoco -Pwildfly-10.x -pl envs/ee
- mvn -B test -Pjacoco -Pwildfly -pl envs/ee
- mvn -B test -Pjacoco -Pwildfly-camel -pl envs/ee
- mvn -B test -Pjacoco -Pkaraf,weld -pl envs/osgi/
# OpenWebBeans faces class proxying issues in OSGi, see OWB-1103
Expand Down
128 changes: 7 additions & 121 deletions envs/ee/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</profile>

<profile>
<id>wildfly-8.x</id>
<id>wildfly</id>
<build>
<plugins>
<plugin>
Expand All @@ -108,7 +108,7 @@
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${wildfly-8.version}</version>
<version>${wildfly.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
Expand All @@ -125,121 +125,7 @@
<configuration>
<excludedGroups>org.apache.camel.cdi.ee.category.WildFlyCamel</excludedGroups>
<systemPropertyVariables>
<arquillian.launch>wildfly-8-managed</arquillian.launch>
<jacoco.agent>${argLine}</jacoco.agent>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>

<!-- provided dependencies -->

<!-- test dependencies -->

<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
</dependency>

</dependencies>
</profile>

<profile>
<id>wildfly-9.x</id>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-wildfly</id>
<phase>generate-test-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${wildfly-9.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludedGroups>org.apache.camel.cdi.ee.category.WildFlyCamel</excludedGroups>
<systemPropertyVariables>
<arquillian.launch>wildfly-9-managed</arquillian.launch>
<jacoco.agent>${argLine}</jacoco.agent>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>

<!-- provided dependencies -->

<!-- test dependencies -->

<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
</dependency>

</dependencies>
</profile>

<profile>
<id>wildfly-10.x</id>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-wildfly</id>
<phase>generate-test-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${wildfly-10.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludedGroups>org.apache.camel.cdi.ee.category.WildFlyCamel</excludedGroups>
<systemPropertyVariables>
<arquillian.launch>wildfly-10-managed</arquillian.launch>
<arquillian.launch>wildfly-managed</arquillian.launch>
<jacoco.agent>${argLine}</jacoco.agent>
</systemPropertyVariables>
</configuration>
Expand Down Expand Up @@ -280,7 +166,7 @@
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${wildfly-10.version}</version>
<version>${wildfly.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/wildfly-camel</outputDirectory>
Expand All @@ -290,7 +176,7 @@
<artifactId>wildfly-camel-patch</artifactId>
<type>tar.gz</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/wildfly-camel/wildfly-${wildfly-10.version}</outputDirectory>
<outputDirectory>${project.build.directory}/wildfly-camel/wildfly-${wildfly.version}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
Expand All @@ -307,7 +193,7 @@
<groupId>io.astefanutti.camel.cdi</groupId>
<artifactId>camel-cdi</artifactId>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/wildfly-camel/wildfly-${wildfly-10.version}/modules/system/layers/fuse/org/apache/camel/component/cdi/main/</outputDirectory>
<outputDirectory>${project.build.directory}/wildfly-camel/wildfly-${wildfly.version}/modules/system/layers/fuse/org/apache/camel/component/cdi/main/</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
Expand All @@ -327,7 +213,7 @@
<goal>replace</goal>
</goals>
<configuration>
<file>${project.build.directory}/wildfly-camel/wildfly-${wildfly-10.version}/modules/system/layers/fuse/org/apache/camel/component/cdi/main/module.xml</file>
<file>${project.build.directory}/wildfly-camel/wildfly-${wildfly.version}/modules/system/layers/fuse/org/apache/camel/component/cdi/main/module.xml</file>
<unescape>false</unescape>
<regex>true</regex>
<replacements>
Expand Down
26 changes: 3 additions & 23 deletions envs/ee/src/test/resources/arquillian.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">

<container qualifier="wildfly-8-managed" default="false">
<container qualifier="wildfly-managed" default="false">
<configuration>
<property name="jbossHome">${project.build.directory}/wildfly-${wildfly-8.version}</property>
<property name="outputToConsole">true</property>
<property name="allowConnectingToRunningServer">false</property>
<property name="javaVmArguments">-Xms128m -Xmx256m ${jacoco.agent}</property>
<!--<property name="javaVmArguments">-Xmx256m -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</property>-->
</configuration>
</container>

<container qualifier="wildfly-9-managed" default="false">
<configuration>
<property name="jbossHome">${project.build.directory}/wildfly-${wildfly-9.version}</property>
<property name="outputToConsole">true</property>
<property name="allowConnectingToRunningServer">false</property>
<property name="javaVmArguments">-Xms128m -Xmx256m ${jacoco.agent}</property>
<!--<property name="javaVmArguments">-Xmx256m -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</property>-->
</configuration>
</container>

<container qualifier="wildfly-10-managed" default="false">
<configuration>
<property name="jbossHome">${project.build.directory}/wildfly-${wildfly-10.version}</property>
<property name="jbossHome">${project.build.directory}/wildfly-${wildfly.version}</property>
<property name="outputToConsole">true</property>
<property name="allowConnectingToRunningServer">false</property>
<property name="javaVmArguments">-Xms128m -Xmx256m ${jacoco.agent}</property>
Expand All @@ -36,7 +16,7 @@

<container qualifier="wildfly-camel-managed" default="false">
<configuration>
<property name="jbossHome">${project.build.directory}/wildfly-camel/wildfly-${wildfly-10.version}</property>
<property name="jbossHome">${project.build.directory}/wildfly-camel/wildfly-${wildfly.version}</property>
<property name="serverConfig">standalone-camel.xml</property>
<property name="outputToConsole">true</property>
<property name="allowConnectingToRunningServer">false</property>
Expand Down
21 changes: 2 additions & 19 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,7 @@
<log4j.version>2.7</log4j.version>
<weld.version>3.0.0.Beta1</weld.version>
<owb.version>1.7.0</owb.version>
<wildfly-8.version>8.2.1.Final</wildfly-8.version>
<wildfly-9.version>9.0.2.Final</wildfly-9.version>
<wildfly-10.version>10.1.0.Final</wildfly-10.version>
<wildfly.version>10.1.0.Final</wildfly.version>
<wildfly-camel.version>4.3.0</wildfly-camel.version>
<arquillian.version>1.1.11.Final</arquillian.version>
<arquillian-osgi.version>2.1.0.CR18</arquillian-osgi.version>
Expand Down Expand Up @@ -472,22 +470,7 @@
<scope>test</scope>
</dependency>

<!-- WildFly 8 Arquillian adapter -->

<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<version>${wildfly-8.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.logmanager</groupId>
<artifactId>log4j-jboss-logmanager</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- WildFly 9+ Arquillian adapter -->
<!-- WildFly Arquillian adapter -->

<dependency>
<groupId>org.wildfly.arquillian</groupId>
Expand Down

0 comments on commit d66caa5

Please sign in to comment.