diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 587db683a..3717d1a7b 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>hibernate-ogm-cassandra-parent</artifactId>
         <groupId>org.hibernate.ogm</groupId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>5.3.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/query/impl/CassandraParameterMetadataBuilder.java b/cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/query/impl/CassandraParameterMetadataBuilder.java
index 9f99fb300..cfc047b88 100644
--- a/cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/query/impl/CassandraParameterMetadataBuilder.java
+++ b/cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/query/impl/CassandraParameterMetadataBuilder.java
@@ -6,19 +6,18 @@
  */
 package org.hibernate.ogm.datastore.cassandra.query.impl;
 
-import java.util.Map;
-
+import com.datastax.driver.core.ColumnDefinitions;
+import com.datastax.driver.core.PreparedStatement;
+import com.datastax.driver.core.Session;
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.engine.query.spi.OrdinalParameterDescriptor;
-import org.hibernate.engine.query.spi.ParameterMetadata;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Table;
 import org.hibernate.ogm.dialect.query.spi.ParameterMetadataBuilder;
+import org.hibernate.query.internal.ParameterMetadataImpl;
 import org.hibernate.type.Type;
 
-import com.datastax.driver.core.ColumnDefinitions;
-import com.datastax.driver.core.PreparedStatement;
-import com.datastax.driver.core.Session;
+import java.util.Map;
 
 /**
  * {@link ParameterMetadataBuilder} for native Cassandra CQL queries.
@@ -37,7 +36,7 @@ public CassandraParameterMetadataBuilder(Session session, Map<String, Table> met
 	}
 
 	@Override
-	public ParameterMetadata buildParameterMetadata(String nativeQuery) {
+	public ParameterMetadataImpl buildParameterMetadata(String nativeQuery) {
 		PreparedStatement preparedStatement = session.prepare( nativeQuery );
 		ColumnDefinitions columnDefinitions = preparedStatement.getVariables();
 		OrdinalParameterDescriptor[] ordinalDescriptors = new OrdinalParameterDescriptor[columnDefinitions.size()];
@@ -61,6 +60,6 @@ public ParameterMetadata buildParameterMetadata(String nativeQuery) {
 			}
 		}
 
-		return new ParameterMetadata( ordinalDescriptors, null );
+		return new ParameterMetadataImpl( ordinalDescriptors, null );
 	}
 }
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 04965a191..3e2c76a30 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.hibernate.ogm</groupId>
         <artifactId>hibernate-ogm-cassandra-parent</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>5.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/examples/gettingstarted/pom.xml b/documentation/examples/gettingstarted/pom.xml
index 51709e25a..8a89a408e 100644
--- a/documentation/examples/gettingstarted/pom.xml
+++ b/documentation/examples/gettingstarted/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>hibernate-ogm-cassandra-documentation-examples</artifactId>
         <groupId>org.hibernate.ogm</groupId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>5.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hibernate-ogm-cassandra-documentation-examples-gettingstarted</artifactId>
diff --git a/documentation/examples/gettingstarted/src/main/java/org/hibernate/ogm/examples/gettingstarted/DogBreedRunner.java b/documentation/examples/gettingstarted/src/main/java/org/hibernate/ogm/examples/gettingstarted/DogBreedRunner.java
index 310a0395f..20d760813 100644
--- a/documentation/examples/gettingstarted/src/main/java/org/hibernate/ogm/examples/gettingstarted/DogBreedRunner.java
+++ b/documentation/examples/gettingstarted/src/main/java/org/hibernate/ogm/examples/gettingstarted/DogBreedRunner.java
@@ -15,10 +15,11 @@
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 import javax.transaction.TransactionManager;
+import java.lang.invoke.MethodHandles;
 
 public class DogBreedRunner {
 
-	private static final Log logger = LoggerFactory.make();
+	private static final Log logger = LoggerFactory.make( MethodHandles.lookup() );
 
 	public static void main(String[] args) {
 
diff --git a/documentation/examples/pom.xml b/documentation/examples/pom.xml
index a16e7e168..fd205db99 100644
--- a/documentation/examples/pom.xml
+++ b/documentation/examples/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>hibernate-ogm-cassandra-documentation</artifactId>
     <groupId>org.hibernate.ogm</groupId>
-    <version>5.2.0-SNAPSHOT</version>
+    <version>5.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>hibernate-ogm-cassandra-documentation-examples</artifactId>
diff --git a/documentation/javadoc/pom.xml b/documentation/javadoc/pom.xml
index c23f89e44..e6d15414a 100644
--- a/documentation/javadoc/pom.xml
+++ b/documentation/javadoc/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.hibernate.ogm</groupId>
         <artifactId>hibernate-ogm-cassandra-documentation</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>5.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/manual/pom.xml b/documentation/manual/pom.xml
index c7c0c5e78..61e0e4695 100644
--- a/documentation/manual/pom.xml
+++ b/documentation/manual/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.hibernate.ogm</groupId>
         <artifactId>hibernate-ogm-cassandra-parent</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>5.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/pom.xml b/documentation/pom.xml
index 7a86860ed..ea548c2b1 100644
--- a/documentation/pom.xml
+++ b/documentation/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.hibernate.ogm</groupId>
         <artifactId>hibernate-ogm-cassandra-parent</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>5.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 620a34a7e..27d0579cf 100644
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.hibernate.ogm</groupId>
         <artifactId>hibernate-ogm-cassandra-parent</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>5.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hibernate-ogm-cassandra-integrationtest</artifactId>
diff --git a/modules/pom.xml b/modules/pom.xml
index cb8a33ba2..a75bcb537 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.hibernate.ogm</groupId>
         <artifactId>hibernate-ogm-cassandra-parent</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>5.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 1a85321c5..8743be721 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.hibernate.ogm</groupId>
         <artifactId>hibernate-ogm-bom</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>5.3.0.Final</version>
     </parent>
 
     <artifactId>hibernate-ogm-cassandra-parent</artifactId>
@@ -48,17 +48,17 @@
         <skipUnitTests>false</skipUnitTests>
 
         <!-- Cassandra -->
-        <cassandraVersion>3.1.0</cassandraVersion>
+        <cassandraVersion>3.3.2</cassandraVersion>
         <!-- Update dependency versions accordingly when updating C*  -->
         <!--
              The following versions are required for the Cassandra driver; We don't expose a managed versions
              of these libraries through this BOM, these versions are for internal usage to make sure the right
              JARs end up in the C* driver WildFly module
         -->
-        <cassandraCodahaleMetricsVersion>3.1.2</cassandraCodahaleMetricsVersion>
+        <cassandraCodahaleMetricsVersion>3.3.2</cassandraCodahaleMetricsVersion>
 
         <!-- Guava version for Cassandra-->
-        <cassandraGuavaVersion>16.0.1</cassandraGuavaVersion>
+        <cassandraGuavaVersion>23.0</cassandraGuavaVersion>
 
         <!-- Target version of WildFly (for testing and JipiJapa integration) -->
         <version.wildfly>10.1.0.Final</version.wildfly>
@@ -744,11 +744,29 @@
         </pluginManagement>
     </build>
 
-    <repositories>
-        <!--
-        To build Hibernate OGM you have to add the JBoss Maven repository to your settings.xml
-        See also http://community.jboss.org/wiki/OverviewofHibernateOGM
-        -->
+  	<repositories>
+  		<repository>
+  			<id>jboss</id>
+  			<name>JBoss nexus</name>
+  			<url>http://repository.jboss.org/nexus/content/groups/public/</url>
+  			<releases>
+  				<enabled>true</enabled>
+  			</releases>
+  			<snapshots>
+  				<enabled>true</enabled>
+  			</snapshots>
+  		</repository>
+  		<repository>
+  			<id>jboss-snapshots</id>
+  			<name>JBoss snapshots</name>
+  			<url>https://snapshots.jboss.org/maven2/</url>
+  			<releases>
+  				<enabled>false</enabled>
+  			</releases>
+  			<snapshots>
+  				<enabled>true</enabled>
+  			</snapshots>
+  		</repository>
     </repositories>
 
     <profiles>