[hibernate-commits] Hibernate SVN: r19857 - core/branches/gradle2/hibernate-release.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2010-06-29 13:52:21 -0400 (Tue, 29 Jun 2010)
New Revision: 19857

Modified:
   core/branches/gradle2/hibernate-release/hibernate-release.gradle
Log:
use Jdk classes in release plugin and custom Javadoc task

Modified: core/branches/gradle2/hibernate-release/hibernate-release.gradle
===================================================================
--- core/branches/gradle2/hibernate-release/hibernate-release.gradle	2010-06-29 17:22:05 UTC (rev 19856)
+++ core/branches/gradle2/hibernate-release/hibernate-release.gradle	2010-06-29 17:52:21 UTC (rev 19857)
@@ -19,11 +19,6 @@
     )
 }
 
-task needs16 {
-    if ( ! project.hasProperty('jdk16_home') ) { 
-        throw new Exception( "Property 'jdk16_home' must be set to run release" );
-    }
-}
 
 // jDocBook ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -59,7 +54,7 @@
 
 task aggregateJavadocs(type: org.hibernate.gradle.javadoc.Javadoc) {
     description = "Build the aggregated JavaDocs for all modules"
-    executable = "$jdk16_home/bin/javadoc"
+    jdk = java6Home
     maxMemory = '512m'
     destinationDir = javadocBuildDir.dir
     configure( options ) {
@@ -158,7 +153,7 @@
 
 releaseBuildDir = dir( buildDirName )
 
-task uberJar(type: Jar, dependsOn: [releaseBuildDir, needs16]) {
+task uberJar(type: Jar, dependsOn: releaseBuildDir) {
     description = "Builds the hibernate3.jar 'uber-jar'"
     destinationDir = releaseBuildDir.dir
     archiveName = 'hibernate3.jar'
@@ -200,7 +195,7 @@
 
 // release bundles ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-task prepareReleaseBundles( dependsOn: [buildDocs, aggregateJavadocs, uberJar, needs16] )
+task prepareReleaseBundles( dependsOn: [buildDocs, aggregateJavadocs, uberJar] )
 
 releaseCopySpec = copySpec {
     from new File( parent.projectDir, 'lgpl.txt' )