sync with master

hibernate-core/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java

@@ -245,6 +245,6 @@ public AnnotationConfiguration setPersisterClassProvider(PersisterClassProvider
 	}
 
 	@Deprecated
-	protected class ExtendedMappingsImpl extends MappingsImpl implements ExtendedMappings {
+    protected class ExtendedMappingsImpl extends MappingsImpl {
 	}
 }

hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java

@@ -234,7 +234,8 @@ public boolean supportsLobValueChangePropogation() {
 		return false;
 	}
 	
-	public boolean supportsUnboundedLobLocatorMaterialization() {
+	@Override
+    public boolean supportsUnboundedLobLocatorMaterialization() {
 		return false;
 	}
 }

hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/ConnectionProviderInitiator.java

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.service.jdbc.connections.internal;
+
 import java.beans.BeanInfo;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;

hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.service.jdbc.connections.internal;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;

hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistry.java

@@ -23,7 +23,6 @@
  */
 package org.hibernate.service.spi;
 
-
 /**
  * The registry of services used by Hibernate
  *

hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.id;
+
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java

@@ -20,6 +20,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.ejb;
+
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;

hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA\
  */
 package org.hibernate.ejb;
+
 import java.util.Map;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.spi.LoadState;

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/query/QueryTest.java

@@ -1,11 +1,9 @@
 //$Id$
 package org.hibernate.ejb.test.query;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.HashSet;
-import java.util.Set;
-
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TemporalType;

hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/BasicMetadataGenerator.java

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.envers.configuration.metadata;
+
 import java.util.Properties;
 import org.dom4j.Element;
 import org.hibernate.envers.configuration.metadata.reader.PropertyAuditingData;

hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java

@@ -48,7 +48,7 @@ public void init(@Optional String auditStrategy) throws URISyntaxException {
 
         this.initMappings();
 
-		serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
+        serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry(Environment.getProperties());
 		sessionFactory = config.buildSessionFactory( serviceRegistry );
     }
 

hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.test.cache.infinispan;
+
 import static org.hibernate.TestLogger.LOG;
 import java.util.Set;
 import org.hibernate.cache.RegionFactory;

hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionManagerImpl.java

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.test.cache.infinispan.functional.cluster;
+
 import java.util.Hashtable;
 import javax.transaction.HeuristicMixedException;
 import javax.transaction.HeuristicRollbackException;