HHH-9782 Build plugins pick up JAVA6_HOME as environment variable

dreab8 · dreab8 · commit 5bf9bb2a1d20 · 2015-05-25T20:05:43.000+01:00
diff --git a/buildSrc/src/main/groovy/org/hibernate/build/HibernateBuildPlugin.groovy b/buildSrc/src/main/groovy/org/hibernate/build/HibernateBuildPlugin.groovy
@@ -43,6 +43,9 @@ class HibernateBuildPlugin implements Plugin<Project> {
 			if ( java6HomeDirSetting == null ) {
 				java6HomeDirSetting = System.getProperty( "JAVA6_HOME" );
 			}
+			if ( java6HomeDirSetting == null ) {
+				java6HomeDirSetting = System.getenv( "JAVA6_HOME" );
+			}
 
 			if ( java6HomeDirSetting != null ) {
 				project.logger.info( "Using JAVA6_HOME setting [${java6HomeDirSetting}]" )

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,9 @@ class HibernateBuildPlugin implements Plugin<Project> {`
`43`	`43`	`if ( java6HomeDirSetting == null ) {`
`44`	`44`	`java6HomeDirSetting = System.getProperty( "JAVA6_HOME" );`
`45`	`45`	`}`
	`46`	`+ if ( java6HomeDirSetting == null ) {`
	`47`	`+ java6HomeDirSetting = System.getenv( "JAVA6_HOME" );`
	`48`	`+ }`
`46`	`49`
`47`	`50`	`if ( java6HomeDirSetting != null ) {`
`48`	`51`	`project.logger.info( "Using JAVA6_HOME setting [${java6HomeDirSetting}]" )`