HHH-5616 - Switch to Gradle for builds

hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java

@@ -34,8 +34,8 @@ import org.slf4j.LoggerFactory;
 
 import org.hibernate.engine.jdbc.batch.spi.Batch;
 import org.hibernate.engine.jdbc.batch.spi.BatchObserver;
-import org.hibernate.service.jdbc.spi.JdbcServices;
-import org.hibernate.service.jdbc.spi.LogicalConnectionImplementor;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
 import org.hibernate.engine.jdbc.proxy.ProxyBuilder;
 
 /**

hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilder.java

@@ -27,7 +27,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.hibernate.engine.jdbc.batch.spi.Batch;
-import org.hibernate.service.jdbc.spi.LogicalConnectionImplementor;
+import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
 
 /**
  * A builder for {@link Batch} instances.

hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java

@@ -31,7 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
-import org.hibernate.service.jdbc.spi.LogicalConnectionImplementor;
+import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
 import org.hibernate.jdbc.Expectation;
 
 /**

hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.hibernate.service.jdbc.spi.LogicalConnectionImplementor;
+import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
 import org.hibernate.jdbc.Expectation;
 
 /**

hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcResourceRegistryImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.internal;
+package org.hibernate.engine.jdbc.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -35,9 +35,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
-import org.hibernate.service.jdbc.spi.SQLExceptionHelper;
-import org.hibernate.service.jdbc.spi.JdbcResourceRegistry;
-import org.hibernate.service.jdbc.spi.InvalidatableWrapper;
+import org.hibernate.engine.jdbc.spi.SQLExceptionHelper;
+import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry;
+import org.hibernate.engine.jdbc.spi.InvalidatableWrapper;
 
 /**
  * Standard implementation of the {@link org.hibernate.engine.jdbc.spi.JdbcResourceRegistry} contract

hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.internal;
+package org.hibernate.engine.jdbc.internal;
 
 import java.lang.reflect.InvocationTargetException;
 import java.sql.Connection;
@@ -40,11 +40,11 @@ import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.service.jdbc.dialect.spi.DialectFactory;
-import org.hibernate.service.jdbc.spi.ExtractedDatabaseMetaData;
-import org.hibernate.service.jdbc.spi.JdbcServices;
-import org.hibernate.service.jdbc.spi.SQLExceptionHelper;
-import org.hibernate.service.jdbc.spi.SQLStatementLogger;
-import org.hibernate.service.jdbc.spi.SchemaNameResolver;
+import org.hibernate.engine.jdbc.spi.ExtractedDatabaseMetaData;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.engine.jdbc.spi.SQLExceptionHelper;
+import org.hibernate.engine.jdbc.spi.SQLStatementLogger;
+import org.hibernate.engine.jdbc.spi.SchemaNameResolver;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.internal.util.jdbc.TypeInfo;
 import org.hibernate.service.spi.Configurable;

hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java

@@ -21,11 +21,11 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.internal;
+package org.hibernate.engine.jdbc.internal;
 
 import java.util.Map;
 
-import org.hibernate.service.jdbc.spi.JdbcServices;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.service.spi.ServicesRegistry;
 import org.hibernate.service.spi.ServiceInitiator;
 

hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LogicalConnectionImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.internal;
+package org.hibernate.engine.jdbc.internal;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -34,10 +34,10 @@ import org.slf4j.LoggerFactory;
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
-import org.hibernate.service.jdbc.spi.JdbcResourceRegistry;
-import org.hibernate.service.jdbc.spi.JdbcServices;
-import org.hibernate.service.jdbc.spi.ConnectionObserver;
-import org.hibernate.service.jdbc.spi.LogicalConnectionImplementor;
+import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.engine.jdbc.spi.ConnectionObserver;
+import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
 
 /**
  * LogicalConnectionImpl implementation

hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/AbstractResultSetProxyHandler.java

@@ -32,8 +32,8 @@ import java.sql.Statement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.hibernate.service.jdbc.spi.JdbcResourceRegistry;
-import org.hibernate.service.jdbc.spi.JdbcServices;
+import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
 
 /**
  * Basic support for building {@link ResultSet}-based proxy handlers

hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/AbstractStatementProxyHandler.java

@@ -33,9 +33,9 @@ import java.sql.Statement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.hibernate.service.jdbc.spi.JdbcResourceRegistry;
-import org.hibernate.service.jdbc.spi.JdbcServices;
-import org.hibernate.service.jdbc.spi.LogicalConnectionImplementor;
+import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
 
 /**
  * Basic support for building {@link Statement}-based proxy handlers

hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/ConnectionProxyHandler.java

@@ -36,10 +36,10 @@ import java.sql.Statement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.hibernate.service.jdbc.spi.JdbcResourceRegistry;
-import org.hibernate.service.jdbc.spi.JdbcServices;
-import org.hibernate.service.jdbc.spi.ConnectionObserver;
-import org.hibernate.service.jdbc.spi.LogicalConnectionImplementor;
+import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.engine.jdbc.spi.ConnectionObserver;
+import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
 
 /**
  * The {@link InvocationHandler} for intercepting messages to {@link java.sql.Connection} proxies.

hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/ImplicitResultSetProxyHandler.java

@@ -28,8 +28,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import org.hibernate.service.jdbc.spi.JdbcResourceRegistry;
-import org.hibernate.service.jdbc.spi.JdbcServices;
+import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
 
 /**
  * Invocation handler for {@link java.sql.ResultSet} proxies obtained from other JDBC object proxies

hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/ProxyBuilder.java

@@ -31,9 +31,9 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Statement;
 
-import org.hibernate.service.jdbc.spi.JdbcWrapper;
-import org.hibernate.service.jdbc.spi.InvalidatableWrapper;
-import org.hibernate.service.jdbc.spi.LogicalConnectionImplementor;
+import org.hibernate.engine.jdbc.spi.JdbcWrapper;
+import org.hibernate.engine.jdbc.spi.InvalidatableWrapper;
+import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor;
 
 /**
  * Centralized builder for proxy instances

hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/ResultSetProxyHandler.java

@@ -26,8 +26,8 @@ package org.hibernate.engine.jdbc.proxy;
 import java.sql.ResultSet;
 import java.sql.Statement;
 
-import org.hibernate.service.jdbc.spi.JdbcResourceRegistry;
-import org.hibernate.service.jdbc.spi.JdbcServices;
+import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
 
 /**
  * Invocation handler for {@link java.sql.ResultSet} proxies

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ConnectionObserver.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.spi;
+package org.hibernate.engine.jdbc.spi;
 
 import java.sql.Connection;
 

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ExtractedDatabaseMetaData.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.spi;
+package org.hibernate.engine.jdbc.spi;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/InvalidatableWrapper.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.spi;
+package org.hibernate.engine.jdbc.spi;
 
 /**
  * Specialized {@link JdbcWrapper} contract for wrapped objects that can additioanlly be invalidated

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcResourceRegistry.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.spi;
+package org.hibernate.engine.jdbc.spi;
 
 import java.sql.ResultSet;
 import java.sql.Statement;

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java

@@ -21,11 +21,10 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.spi;
+package org.hibernate.engine.jdbc.spi;
 
 import java.sql.Connection;
 
-import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.service.spi.Service;

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcWrapper.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.spi;
+package org.hibernate.engine.jdbc.spi;
 
 /**
  * Generic contract for wrapped JDBC objects.

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/LogicalConnection.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.spi;
+package org.hibernate.engine.jdbc.spi;
 
 import java.sql.Connection;
 

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/LogicalConnectionImplementor.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.spi;
+package org.hibernate.engine.jdbc.spi;
 
 import org.hibernate.ConnectionReleaseMode;
 

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionHelper.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.spi;
+package org.hibernate.engine.jdbc.spi;
 
 import java.sql.Connection;
 import java.sql.SQLException;

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLStatementLogger.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.spi;
+package org.hibernate.engine.jdbc.spi;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.spi;
+package org.hibernate.engine.jdbc.spi;
 
 import java.sql.Connection;
 

pom.xml

@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
-        <relativePath>parent/pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.hibernate</groupId>
-    <artifactId>hibernate</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Hibernate Core Aggregator</name>
-    <description>Aggregator of the Hibernate Core modules.</description>
-
-    <properties>
-        <!-- Skip artifact deployment -->
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <modules>
-        <module>parent</module>
-        <module>core</module>
-        <module>testing</module>
-        <module>testsuite</module>
-        <module>entitymanager</module>
-        <module>envers</module>
-        <module>cache-ehcache</module>
-        <module>cache-jbosscache</module>
-        <module>cache-oscache</module>
-        <module>cache-swarmcache</module>
-        <module>connection-c3p0</module>
-        <module>connection-proxool</module>
-        <module>cache-infinispan</module>
-<!--
-    Need to scope bytecode providers first...
-        <module>bytecode-cglib</module>
-        <module>bytecode-javassist</module>
--->
-    </modules>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.0-beta-9</version>
-                <configuration>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                </configuration>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.5</version>
-<!--
-                    <configuration>
-                        <stylesheetfile>src/main/javadoc/hibernate-javadoc.css</stylesheetfile>
-                    </configuration>
--->
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>docs</id>
-            <activation>
-                <property>
-                    <name>disableDistribution</name>
-                    <value>!true</value>
-                </property>
-            </activation>
-            <modules>
-                <module>documentation</module>
-                <module>distribution</module>
-            </modules>
-        </profile>
-    </profiles>
-</project>