Skip to content

Commit

Permalink
ISPN-5886 Upgrade WildFly to 10.0.0.CR4
Browse files Browse the repository at this point in the history
  • Loading branch information
@tristantarrant
tristantarrant committed Oct 26, 2015
1 parent 8c119a7 commit c8d6802
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 30 deletions.
14 changes: 7 additions & 7 deletions integrationtests/as-integration-embedded/pom.xml
View file
Expand Up @@ -159,15 +159,15 @@
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${version.wildfly}</version>
<version>${version.org.wildfly}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/node1</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${version.wildfly}</version>
<version>${version.org.wildfly}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/node2</outputDirectory>
Expand All @@ -178,15 +178,15 @@
<version>${project.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/node1/wildfly-${version.wildfly}/modules</outputDirectory>
<outputDirectory>${project.build.directory}/node1/wildfly-${version.org.wildfly}/modules</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-as-embedded-modules</artifactId>
<version>${project.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/node2/wildfly-${version.wildfly}/modules</outputDirectory>
<outputDirectory>${project.build.directory}/node2/wildfly-${version.org.wildfly}/modules</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
Expand All @@ -206,7 +206,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/node2/wildfly-${version.wildfly}</outputDirectory>
<outputDirectory>${project.build.directory}/node2/wildfly-${version.org.wildfly}</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
Expand All @@ -222,7 +222,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/node1/wildfly-${version.wildfly}</outputDirectory>
<outputDirectory>${project.build.directory}/node1/wildfly-${version.org.wildfly}</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
Expand All @@ -235,4 +235,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
14 changes: 7 additions & 7 deletions integrationtests/as-lucene-directory/pom.xml
View file
Expand Up @@ -168,15 +168,15 @@
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${version.wildfly}</version>
<version>${version.org.wildfly}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/node1</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${version.wildfly}</version>
<version>${version.org.wildfly}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/node2</outputDirectory>
Expand All @@ -187,15 +187,15 @@
<version>${project.version}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/node1/wildfly-${version.wildfly}/modules</outputDirectory>
<outputDirectory>${project.build.directory}/node1/wildfly-${version.org.wildfly}/modules</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-as-embedded-modules</artifactId>
<version>${project.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/node2/wildfly-${version.wildfly}/modules</outputDirectory>
<outputDirectory>${project.build.directory}/node2/wildfly-${version.org.wildfly}/modules</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
Expand All @@ -214,7 +214,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/node1/wildfly-${version.wildfly}</outputDirectory>
<outputDirectory>${project.build.directory}/node1/wildfly-${version.org.wildfly}</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
Expand All @@ -230,7 +230,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/node2/wildfly-${version.wildfly}</outputDirectory>
<outputDirectory>${project.build.directory}/node2/wildfly-${version.org.wildfly}</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
Expand Down Expand Up @@ -263,4 +263,4 @@
</profile>
</profiles>

</project>
</project>
8 changes: 4 additions & 4 deletions integrationtests/security-it/pom.xml
View file
Expand Up @@ -132,23 +132,23 @@
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${version.wildfly}</version>
<version>${version.org.wildfly}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/testnode</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${version.wildfly}</version>
<version>${version.org.wildfly}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/node0</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${version.wildfly}</version>
<version>${version.org.wildfly}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/node1</outputDirectory>
Expand Down Expand Up @@ -179,4 +179,4 @@
</build>
</profile>
</profiles>
</project>
</project>
18 changes: 10 additions & 8 deletions parent/pom.xml
View file
Expand Up @@ -172,10 +172,12 @@
<version.webdav.servlet>2.0.1</version.webdav.servlet>
<version.weld>1.1.13.Final</version.weld>

<version.wildfly>10.0.0.CR2</version.wildfly>
<version.wildfly.arquillian>1.0.0.Final</version.wildfly.arquillian>
<version.wildfly.core>2.0.0.CR1</version.wildfly.core>
<version.wildfly.maven.plugin>1.1.0.Alpha3</version.wildfly.maven.plugin>
<version.org.wildfly>10.0.0.CR4</version.org.wildfly>
<version.org.wildfly.core>2.0.0.CR8</version.org.wildfly.core>
<version.org.wildfly.arquillian>1.0.1.Final</version.org.wildfly.arquillian>
<version.org.wildfly.build-tools>1.1.0.CR2</version.org.wildfly.build-tools>
<version.org.wildfly.maven-plugin>1.1.0.Alpha4</version.org.wildfly.maven-plugin>

<version.javassist>3.18.1-GA</version.javassist>
<version.maven.buildhelper>1.8</version.maven.buildhelper>
<version.maven.bundle>2.4.0</version.maven.bundle>
Expand Down Expand Up @@ -547,13 +549,13 @@
<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<version>${version.wildfly.arquillian}</version>
<version>${version.org.wildfly.arquillian}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller</artifactId>
<version>${version.wildfly.core}</version>
<version>${version.org.wildfly.core}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
Expand Down Expand Up @@ -894,7 +896,7 @@
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-testsuite-shared</artifactId>
<version>${version.wildfly.core}</version>
<version>${version.org.wildfly.core}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -1399,7 +1401,7 @@
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<version>${version.wildfly.maven.plugin}</version>
<version>${version.org.wildfly.maven-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
8 changes: 4 additions & 4 deletions server/integration/versions/pom.xml
View file
Expand Up @@ -40,10 +40,10 @@
<version.org.slf4j>1.7.2</version.org.slf4j>
<version.org.apache.logging.log4j>2.3</version.org.apache.logging.log4j>

<version.org.wildfly>10.0.0.CR2</version.org.wildfly>
<version.wildfly.core>2.0.0.CR5</version.wildfly.core>
<version.org.wildfly>10.0.0.CR4</version.org.wildfly>
<version.org.wildfly.core>2.0.0.CR8</version.org.wildfly.core>
<version.org.wildfly.arquillian>1.0.1.Final</version.org.wildfly.arquillian>
<version.org.wildfly.build-tools>1.1.0.CR1</version.org.wildfly.build-tools>
<version.org.wildfly.build-tools>1.1.0.CR2</version.org.wildfly.build-tools>

<version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.1_spec>1.0.0.Final</version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.1_spec>

Expand Down Expand Up @@ -125,7 +125,7 @@
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller</artifactId>
<version>${version.wildfly.core}</version>
<version>${version.org.wildfly.core}</version>
</dependency>

<dependency>
Expand Down

0 comments on commit c8d6802

Please sign in to comment.