Merge pull request #1 from hibernate/master

Pulling latest from hibernate-orm

Author: ryan2049

.gitignore

@@ -11,6 +11,7 @@
 /build
 */build
 testdb
+lib
 
 # IntelliJ specific files/directories
 out

CONTRIBUTING.md

@@ -1,9 +1,11 @@
 # Guidelines for Contributing
+
 Contributions from the community are essential in keeping Hibernate (any Open Source
 project really) strong and successful.  While we try to keep requirements for
 contributing to a minimum, there are a few guidelines we ask that you mind.
 
 ## Getting Started
+
 If you are just getting started with Git, GitHub and/or contributing to Hibernate via
 GitHub there are a few pre-requisite steps.
 
@@ -18,13 +20,15 @@ the linked page, this also includes:
 or [Eclipse](https://community.jboss.org/wiki/ContributingToHibernateUsingEclipse).
 
 ## Create the working (topic) branch
+
 Create a [topic branch](http://git-scm.com/book/en/Git-Branching-Branching-Workflows#Topic-Branches) on which you
 will work.  The convention is to name the branch using the JIRA issue key.  If there is not already a JIRA issue
 covering the work you want to do, create one.  Assuming you will be working from the master branch and working
 on the JIRA HHH-123 : `git checkout -b HHH-123 master`
 
 
 ## Code
+
 Do yo thing!
 
 ## Commit
@@ -41,7 +45,8 @@ appreciated btw), please use rebasing rather than merging.  Merging creates
 "merge commits" that really muck up the project timeline._
 
 ## Submit
+
 * If you have not already, sign the [Contributor License Agreement](https://cla.jboss.org).
 * Push your changes to the topic branch in your fork of the repository.
-* Initiate a [pull request](http://help.github.com/send-pull-requests/)
+* Initiate a [pull request](http://help.github.com/articles/creating-a-pull-request)
 * Update the JIRA issue, adding a comment including a link to the created pull request

README.md

@@ -6,7 +6,7 @@ to applications and other components/libraries.  It is also provides an implemen
 JPA specification, which is the standardized Java specification for ORM.  See 
 [Hibernate.org](http://hibernate.org/orm/) for additional information. 
 
-[![Build Status](http://ci.hibernate.org/job/hibernate-orm-master-h2/badge/icon)](http://ci.hibernate.org/job/hibernate-orm-master-h2/)
+[![Build Status](http://ci.hibernate.org/job/hibernate-orm-master-h2-main/badge/icon)](http://ci.hibernate.org/job/hibernate-orm-master-h2-main/)
 
 
 Quickstart
@@ -16,7 +16,7 @@ Quickstart
      cd hibernate-orm
      ./gradlew clean build
 
-The build requires a Java 8 JDK as JAVA_HOME, but will ensure Java 6 compatibility.
+The build requires a Java 8 JDK as JAVA_HOME.
 
 
 Resources
@@ -84,7 +84,7 @@ Common Java related tasks
 -------------------------
 
 * _build_ - Assembles (jars) and tests this project
-* _buildDependents_ - Assembles and tests this project and all projects that depend on it.  So think of running this in hibernate-entitymanager, Gradle would assemble and test hibernate-entitymanager as well as hibernate-envers (because envers depends on entitymanager)
+* _buildDependents_ - Assembles and tests this project and all projects that depend on it.  So think of running this in hibernate-core, Gradle would assemble and test hibernate-core as well as hibernate-envers (because envers depends on core)
 * _classes_ - Compiles the main classes
 * _testClasses_ - Compiles the test classes
 * _compile_ (Hibernate addition) - Performs all compilation tasks including staging resources from both main and test

build.gradle

@@ -7,12 +7,6 @@ import org.apache.tools.ant.filters.ReplaceTokens
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-apply plugin: 'eclipse'
-apply plugin: 'idea'
-apply from: "./libraries.gradle"
-apply from: "./databases.gradle"
-
-
 buildscript {
 	repositories {
 		mavenCentral()
@@ -37,6 +31,16 @@ buildscript {
 	}
 }
 
+plugins {
+	id 'com.gradle.build-scan' version '1.3'
+	id 'me.champeau.buildscan-recipes' version '0.1.7'
+}
+
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+apply from: "./libraries.gradle"
+apply from: "./databases.gradle"
+
 allprojects {
     repositories {
         mavenCentral()
@@ -54,11 +58,16 @@ allprojects {
 }
 
 ext {
-	hibernateTargetVersion = '5.2.0-SNAPSHOT'
-	expectedGradleVersion = '2.10'
+	hibernateTargetVersion = '5.2.11-SNAPSHOT'
+	expectedGradleVersion = '3.2.1'
 	baselineJavaVersion = '1.8'
 
     osgiExportVersion = hibernateTargetVersion.replaceAll( '-SNAPSHOT', '.SNAPSHOT' )
+
+	final String[] versionComponents = hibernateTargetVersion.split( '\\.' );
+	hibernateFullVersion = hibernateTargetVersion
+	hibernateMajorMinorVersion = versionComponents[0] + '.' + versionComponents[1]
+	hibernateMajorVersion = versionComponents[0]
 }
 
 idea {
@@ -78,6 +87,8 @@ def osgiDescription() {
 	return "A module of the Hibernate O/RM project"
 }
 
+buildDir = "target"
+
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 subprojects { subProject ->
@@ -98,6 +109,10 @@ subprojects { subProject ->
 		return;
 	}
 
+	if ( subProject.name.startsWith( 'hibernate-orm-modules' ) ) {
+		return;
+	}
+
 	// everything below here in the closure applies to java projects
 	apply plugin: 'java'
 	apply plugin: 'maven-publish'
@@ -142,13 +157,30 @@ subprojects { subProject ->
 
 		testRuntime( libraries.log4j )
 		testRuntime( libraries.javassist )
+		testRuntime( libraries.byteBuddy )
+		testRuntime( libraries.woodstox )
+
+		//Databases
 		testRuntime( libraries.h2 )
 		testRuntime( libraries.hsqldb )
 		testRuntime( libraries.postgresql )
 		testRuntime( libraries.mysql )
 		testRuntime( libraries.mariadb )
-		testRuntime( libraries.woodstox )
+		testRuntime( libraries.mssql )
+		testRuntime( libraries.informix )
 
+		if (db.equalsIgnoreCase("oracle")) {
+			dependencies {
+				testRuntime( libraries.oracle ) {
+					exclude group: 'com.oracle.jdbc', module: 'xmlparserv2'
+				}
+			}
+		}
+		if (db.equalsIgnoreCase("db2")) {
+			dependencies {
+				testRuntime( libraries.db2 )
+			}
+		}
 		// 6.6 gave me some NPE problems from within checkstyle...
 		checkstyle 'com.puppycrawl.tools:checkstyle:6.5'
 	}
@@ -165,6 +197,12 @@ subprojects { subProject ->
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// compilation
+	compileJava.options.encoding = 'UTF-8'
+
+	tasks.withType(JavaCompile) {
+		options.encoding = 'UTF-8'
+	}
+
 	task compile
 	compile.dependsOn compileJava, processResources, compileTestJava, processTestResources
 
@@ -226,10 +264,15 @@ subprojects { subProject ->
 			into sourceSets.test.output.classesDir
 		}
 		copy {
-			ext.targetDir = file( "${buildDir}/resources/test" )
 			from file('src/test/resources')
-			into targetDir
-			filter( ReplaceTokens, tokens: dbBundle[db] );
+			into file( "${buildDir}/resources/test" )
+			exclude 'src/test/resources/arquillian.xml'
+			exclude 'src/test/resources/hibernate.properties'
+		}
+		copy {
+			from file('src/test/resources/hibernate.properties')
+			into file( "${buildDir}/resources/test" )
+			filter( ReplaceTokens, tokens: dbBundle[db] )
 		}
 	} )
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -328,6 +371,14 @@ subprojects { subProject ->
 	}
 	// exclude generated java sources - by explicitly setting the base source dir
 	checkstyleMain.source = 'src/main/java'
+	
+	// define a second checkstyle task for checking non-fatal violations
+	task nonFatalCheckstyle(type:Checkstyle) {
+		source = subProject.sourceSets.main.java
+		classpath = subProject.configurations.checkstyle
+		showViolations = false
+		configFile = rootProject.file( 'shared/config/checkstyle/checkstyle-non-fatal.xml' )
+	}
 
 	findbugs {
 		sourceSets = [ subProject.sourceSets.main, subProject.sourceSets.test ]
@@ -396,6 +447,15 @@ task wrapper(type: Wrapper) {
     gradleVersion = expectedGradleVersion
 }
 
+buildScan {
+	licenseAgreementUrl = 'https://gradle.com/terms-of-service'
+	licenseAgree = 'yes'
+
+	recipe 'git-commit', baseUrl: 'https://github.com/hibernate/hibernate-orm/tree'
+}
+
+
+
 def excludeAllLowLevelBugsExcept(String[] bugTypes){
 	def writer = new StringWriter()
 	def xml = new groovy.xml.MarkupBuilder(writer);

buildSrc/build.gradle

@@ -20,9 +20,12 @@ repositories {
 
 apply plugin: "groovy"
 
+buildDir = "target"
+
 dependencies {
 	compile gradleApi()
 	compile localGroovy()
 
 	compile 'org.hibernate.build.gradle:gradle-animalSniffer-plugin:1.0.1.Final'
+	compile 'org.hibernate.build.gradle:hibernate-matrix-testing:2.0.0-SNAPSHOT'
 }

buildSrc/src/main/groovy/org/hibernate/build/HibernateBuildPlugin.groovy

@@ -10,13 +10,22 @@ import org.gradle.api.GradleException
 import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.logging.Logger
+import org.gradle.api.logging.Logging
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.api.tasks.testing.Test
+
+import org.hibernate.build.gradle.testing.database.DatabaseProfile
+import org.hibernate.build.gradle.testing.database.DatabaseProfilePlugin
+import org.hibernate.build.gradle.testing.matrix.MatrixTestingPlugin
 
 /**
  * @author Steve Ebersole
  */
 class HibernateBuildPlugin implements Plugin<Project> {
+	private static final Logger log = Logging.getLogger( MatrixTestingPlugin.class);
+
 	@Override
 	void apply(Project project) {
 		if ( !JavaVersion.current().java8Compatible ) {
@@ -27,6 +36,35 @@ class HibernateBuildPlugin implements Plugin<Project> {
 
 		project.afterEvaluate {
 			applyPublishing( publishingExtension, project )
+
+			applyMatrixTestTaskDependencies( project )
+		}
+	}
+
+	def applyMatrixTestTaskDependencies(Project project) {
+		final MatrixTestingPlugin matrixTestingPlugin = project.plugins.findPlugin( MatrixTestingPlugin )
+		if ( matrixTestingPlugin == null ) {
+			// matrix testing was not applied on this project
+			return;
+		}
+
+		final DatabaseProfilePlugin databaseProfilePlugin = project.rootProject.plugins.apply( DatabaseProfilePlugin );
+		if ( databaseProfilePlugin.databaseProfiles == null || databaseProfilePlugin.databaseProfiles.isEmpty() ) {
+			// no db profiles defined -> nothing to do
+			return;
+		}
+
+		log.debug( "Project [${project.name}] applied matrix-testing and had db-profiles; checking test task for dependencies" )
+
+		// for each db profile, find its execution task and transfer any dependencies from test to it
+		Test testTask = project.tasks.test
+		if ( testTask.dependsOn.isEmpty() ) {
+			return;
+		}
+
+		databaseProfilePlugin.databaseProfiles.each { DatabaseProfile profile ->
+			log.debug( "db-profile [${profile.name}] on project [${project.name}] : transfering dependencies from test task -> ${testTask.dependsOn}" )
+			project.tasks.getByPath( "matrix_${profile.name}" ).dependsOn( testTask.dependsOn )
 		}
 	}
 
@@ -97,7 +135,7 @@ class HibernateBuildPlugin implements Plugin<Project> {
 
 				// TEMPORARY : currently Gradle Publishing feature is exporting dependencies as 'runtime' scope,
 				//      rather than 'compile'; fix that.
-				if ( asNode().dependencies != null ) {
+				if ( asNode().dependencies != null && asNode().dependencies.size() > 0 ) {
 					asNode().dependencies[0].dependency.each {
 						it.scope[0].value = 'compile'
 					}