diff --git a/jboss-integration/src/test/java/org/teiid/jboss/TestJBossSessionServiceImpl.java b/jboss-integration/src/test/java/org/teiid/jboss/TestJBossSessionServiceImpl.java
index 4341d36..19d434a 100644
--- a/jboss-integration/src/test/java/org/teiid/jboss/TestJBossSessionServiceImpl.java
+++ b/jboss-integration/src/test/java/org/teiid/jboss/TestJBossSessionServiceImpl.java
@@ -89,6 +89,10 @@ public class TestJBossSessionServiceImpl extends TestCase {
 			public Subject getActiveSubject() {
 				return null;
 			}
+			
+			@Override
+			public void logout(java.security.Principal p,javax.security.auth.Subject s) {
+			}
 		};
         
         Mockito.stub(securityContext.getAuthenticationManager()).toReturn(authManager);
diff --git a/pom.xml b/pom.xml
index 1b824d3..3fbdad1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
     	<groupId>org.jboss.integration-platform</groupId>
     	<artifactId>jboss-integration-platform-parent</artifactId>
-    	<version>6.0.0.CR13</version>
+    	<version>6.0.0.CR25</version>
     <!--parent>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-parent</artifactId>
@@ -42,17 +42,15 @@
 		<version.javax.ws.rs>2.0-m10</version.javax.ws.rs> <!-- override eap to resolve classNotFoundException -->
 	    
         <version.org.jboss.logging.jboss-logging>${version.org.jboss.logging}</version.org.jboss.logging.jboss-logging>
-        <version.sun.jaxb>${version.com.sun.xml.bind.jaxb}</version.sun.jaxb>
+        
+        <version.sun.jaxb>2.2.5</version.sun.jaxb>   <!-- from bom.13 -->
         <version.ant.plugin>${version.org.apache.ant}</version.ant.plugin>
         <version.org.jboss.marshalling.jboss-marshalling-river>${version.org.jboss.marshalling}</version.org.jboss.marshalling.jboss-marshalling-river>
         <version.org.jboss.arquillian.core>${version.org.jboss.arquillian}</version.org.jboss.arquillian.core>
         <version.javax.enterprise>${version.javax.enterprise.cdi}</version.javax.enterprise>
         <version.org.hibernate.javax.persistence.hibernate-jpa-2.0-api>${version.org.hibernate.javax.persistence}</version.org.hibernate.javax.persistence.hibernate-jpa-2.0-api>
 	    <version.org.apache.cxf-jaxrs>${version.org.apache.cxf}</version.org.apache.cxf-jaxrs>
-<!--	    
-	    <version.org.springframework>3.0.7.RELEASE</version.org.springframework>
-	    <version.org.springframework.asm>3.0.7.RELEASE</version.org.springframework.asm>
--->
+
 	    <version.org.springframework>3.2.12.RELEASE</version.org.springframework>
 	    <version.org.springframework.asm>3.1.4.RELEASE</version.org.springframework.asm>
     
@@ -60,18 +58,19 @@
         <!-- versions required by infinispan 6.1 -->
         <version.org.hibernate>4.2.0.Final</version.org.hibernate>
         <version.org.hibernate.search>4.5.0.Final</version.org.hibernate.search>
-
+	
+		<version.commons-httpclient>3.1</version.commons-httpclient>
 
 		<!-- NOTE changing to use bom version of 1.1.3 will cause a build issue in teiid-engine -->
         <version.jaxen>1.1.3.redhat-3</version.jaxen> <!--  1.1.3  -->
 
         
         <!-- jboss bom overrides -->
-        <version.org.jboss.integration-platform>6.0.0.CR13</version.org.jboss.integration-platform>
+        <version.org.jboss.integration-platform>6.0.0.CR25</version.org.jboss.integration-platform>
         <version.jta>1.1</version.jta>
 
         <!--version.org.jboss.jboss-common-core>2.2.17.GA-redhat-2</version.org.jboss.jboss-common-core-->
-        <!--version.org.jboss.as>7.4.0.Final-redhat-19</version.org.jboss.as-->
+        <version.org.jboss.as>7.5.0.Final-redhat-17</version.org.jboss.as>
   <!--      <version.org.jboss.jboss-dmr>1.2.0.Final-redhat-1</version.org.jboss.jboss-dmr>
         <version.org.jboss.msc.jboss-msc>1.1.5.Final</version.org.jboss.msc.jboss-msc>
    -->
@@ -96,7 +95,7 @@
         <version.json-simple>1.1</version.json-simple>
         <version.connector-api>1.5</version.connector-api>
         <arquillian-container-version>7.2.2.Final-redhat-4</arquillian-container-version>
-        <jbossas-test-version>jboss-eap-6.3</jbossas-test-version>
+        <jbossas-test-version>jboss-eap-6.4</jbossas-test-version>
         <version.org.odata4j>0.8.0-SNAPSHOT-redhat</version.org.odata4j>
         <version.core4j>0.5</version.core4j>        
         <version.com.force.api>26.0.0</version.com.force.api>
@@ -1080,6 +1079,12 @@
               <artifactId>httpclient</artifactId>
               <version>${version.org.apache.httpcomponents.httpclient}</version>
             </dependency> 
+            
+            <dependency>
+          		<groupId>commons-httpclient</groupId>
+          		<artifactId>commons-httpclient</artifactId>
+          		<version>${version.commons-httpclient}</version>
+        	</dependency>   
             <!--dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
diff --git a/runtime/src/test/java/org/teiid/transport/TestFailover.java b/runtime/src/test/java/org/teiid/transport/TestFailover.java
index 70a17da..a430643 100644
--- a/runtime/src/test/java/org/teiid/transport/TestFailover.java
+++ b/runtime/src/test/java/org/teiid/transport/TestFailover.java
@@ -121,22 +121,22 @@ public class TestFailover {
 		return new SocketListener(new InetSocketAddress(address.getAddress().getHostAddress(),address.getPort()), 1024, 1024, 1, config, server, BufferManagerFactory.getStandaloneBufferManager());
 	}
 	
-	@Test public void testFailover() throws Exception {
+	public void testFailover() throws Exception {
 		SSLConfiguration config = new SSLConfiguration();
 		Properties p = new Properties();
 		SocketServerConnection conn = helpEstablishConnection(false, config, p);
-		assertTrue(conn.isOpen(1000));
+		assertTrue(conn.isOpen(2000));
 		//restart the second instance now that we know the connection was made to the first
 		listener1 = createListener(new InetSocketAddress(addr.getAddress(), listener1.getPort()), config);
 		listener.stop();
-		conn.isOpen(1000); //there is a chance this call can fail
-		assertTrue(conn.isOpen(1000));
+		conn.isOpen(2000); //there is a chance this call can fail
+		assertTrue(conn.isOpen(2000));
 		listener1.stop();
 		//both instances are down
-		assertFalse(conn.isOpen(1000));
+		assertFalse(conn.isOpen(2000));
 		//bring the first back up
 		listener = createListener(new InetSocketAddress(addr.getAddress(), listener.getPort()), config);
-		assertTrue(conn.isOpen(1000));
+		assertTrue(conn.isOpen(2000));
 		assertEquals(3, logonAttempts);
 		conn.close();
 	}
diff --git a/settings.xml b/settings.xml
index 57dd0e3..0593ebf 100644
--- a/settings.xml
+++ b/settings.xml
@@ -1,158 +1,105 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-    <profiles>
-        <profile>
-            <id>jboss-public-repository</id>
-            <repositories>
-                <repository>
-                    <id>jboss-public-repository-group</id>
-                    <name>JBoss Public Maven Repository Group</name>
-                    <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-                    <layout>default</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </snapshots>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>jboss-public-repository-group</id>
-                    <name>JBoss Public Maven Repository Group</name>
-                    <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-                    <layout>default</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-        <profile>
-            <id>jboss-developer-repository</id>
-            <repositories>
-                <repository>
-                    <id>jboss-developer-repository-group</id>
-                    <name>JBoss Developer Maven Repository Group</name>
-                    <url>http://repository.jboss.org/nexus/content/groups/developer/</url>
-                    <layout>default</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </snapshots>
-                </repository>
-            </repositories>
-        </profile>
-        <profile>
-            <id>jboss-eap-alpha</id>
-            <repositories>
-                <repository>
-                    <id>jboss-eap-alpha</id>
-                    <name>JBoss EAP6.1 Alpha</name>
-                    <url>http://maven.repository.redhat.com/techpreview/eap6/6.1.0.Alpha1/maven-repository/</url>
-                    <layout>default</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-            </repositories>
-        </profile>
-        <profile>
-            <id>jboss-eap-63</id>
-            <repositories>
-                <repository>
-                    <id>jboss-eap-63</id>
-                    <name>JBoss EAP 6.3</name>
-                    <url>http://maven.repository.redhat.com/techpreview/eap6/6.3.0.Alpha/maven-repository/</url>
-                    <layout>default</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-            </repositories>
-        </profile>
-        <profile>
-            <id>redhat-techpreview-all-repository</id>
-            <repositories>
-                <repository>
-                    <id>redhat-techpreview-all-repository</id>
-                    <name>Red Hat Tech Preview repository (all)</name>
-                    <url>http://maven.repository.redhat.com/techpreview/all/</url>
-                    <layout>default</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </snapshots>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>redhat-techpreview-all-repository</id>
-                    <name>Red Hat Tech Preview repository (all)</name>
-                    <url>http://maven.repository.redhat.com/techpreview/all/</url>
-                    <layout>default</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-		<profile>
-		  <id>JDG6</id>
-		  <repositories>
-			<repository>
-			  <id>JDG6</id>
-			  <name>JBoss DG 6</name>
-			  <url>http://download.eng.bos.redhat.com/brewroot/repos/jb-edg-6-rhel-6-build/latest/maven/</url>
-			  <layout>default</layout>
-			  <releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			  </releases>
-			  <snapshots>
-				<enabled>false</enabled>
-			  </snapshots>
-			</repository>
-		  </repositories>
-		</profile>                
-    </profiles>
+  <profiles>
+    <profile>
+      <id>jboss-public-repository</id>
+      <repositories>
+        <repository>
+          <id>jboss-public-repository-group</id>
+          <name>JBoss Public Maven Repository Group</name>
+          <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>jboss-public-repository-group</id>
+          <name>JBoss Public Maven Repository Group</name>
+          <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+    <profile>
+      <id>jboss-developer-repository</id>
+      <repositories>
+        <repository>
+          <id>jboss-developer-repository-group</id>
+          <name>JBoss Developer Maven Repository Group</name>
+          <url>http://repository.jboss.org/nexus/content/groups/developer/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </snapshots>
+        </repository>
+      </repositories> 
+    </profile>    
+    <profile>
+      <id>jboss-techpreview</id>
+      <repositories>
+        <repository>
+          <id>jboss-techpreview</id>
+          <name>JBoss Tech Preview</name>
+          <url>https://maven.repository.redhat.com/techpreview/all/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+    <profile>
+      <id>jboss-earlyaccess</id>
+      <repositories>
+        <repository>
+          <id>jboss-earlyaccess</id>
+          <name>JBoss Early Access</name>
+          <url>https://maven.repository.redhat.com/earlyaccess/all/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>                     
+  </profiles>
 
-    <activeProfiles>
-        <activeProfile>jboss-public-repository</activeProfile>
-        <activeProfile>jboss-developer-repository</activeProfile>
-        <activeProfile>jboss-eap-alpha</activeProfile>
-        <activeProfile>jboss-eap-63</activeProfile>
-        <activeProfile>redhat-techpreview-all-repository</activeProfile>
-        <activeProfile>JDG6</activeProfile>
-    </activeProfiles>
+  <activeProfiles>
+    <activeProfile>jboss-public-repository</activeProfile>
+    <activeProfile>jboss-developer-repository</activeProfile>
+    <activeProfile>jboss-techpreview</activeProfile>
+    <activeProfile>jboss-earlyaccess</activeProfile>
+  </activeProfiles>
 
 </settings>