Merge branch 'wildfly9' of https://github.com/codylerum/FrameworkBenchmarks into pr1705

Conflicts:
	frameworks/Java/wildfly-ee7/setup.sh

frameworks/Java/wildfly-ee7/pom.xml

@@ -12,8 +12,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<version.compiler.plugin>3.1</version.compiler.plugin>
 		<version.war.plugin>2.4</version.war.plugin>
-		<version.wildfly>9.0.0.Beta2</version.wildfly>
-		<version.mysql.connector>5.1.34</version.mysql.connector>
+		<version.wildfly>9.0.1.Final</version.wildfly>
+		<version.mysql.connector>5.1.36</version.mysql.connector>
 		<version.javaee.api>7.0</version.javaee.api>
 		<version.jboss.spec.javaee.7.0>1.0.0.Final</version.jboss.spec.javaee.7.0>
 	</properties>
@@ -76,11 +76,11 @@
 			<scope>provided</scope>
 		</dependency>
 
-                <dependency>
-                        <groupId>io.undertow</groupId>
-                        <artifactId>undertow-servlet</artifactId>
-                        <scope>provided</scope>
-                </dependency>
+		<dependency>
+			<groupId>io.undertow</groupId>
+			<artifactId>undertow-servlet</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.jboss.spec.javax.ejb</groupId>

frameworks/Java/wildfly-ee7/setup.sh

@@ -5,4 +5,4 @@ fw_depends java7 maven
 export JAVA_OPTS="-Xms2g -Xmx2g -XX:MaxPermSize=256m -XX:+UseG1GC -XX:MaxGCPauseMillis=25 -verbosegc -Xloggc:/tmp/wildfly_gc.log"
 
 mvn clean initialize package -Pbenchmark -Ddatabase.host=${DBHOST}
-target/wildfly-9.0.0.Beta2/bin/standalone.sh -b 0.0.0.0 &
+target/wildfly-9.0.1.Final/bin/standalone.sh -b 0.0.0.0 &