From ca368f85a6c42c471465444c2f4b870fb866be33 Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Thu, 17 Aug 2017 13:04:39 +0200 Subject: [PATCH] HHH-11507 - Upgrade to Gradle 4.2 --- build.gradle | 17 ++++++++++++++--- gradle/wrapper/gradle-wrapper.jar | Bin 54227 -> 54713 bytes gradle/wrapper/gradle-wrapper.properties | 5 ++--- gradlew | 6 +++--- .../tooling/maven/MavenEnhancePluginTest.java | 2 +- .../hibernate-gradle-plugin.gradle | 2 -- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index a9259487f2a8..7c4d4a127a16 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ buildscript { } plugins { - id 'com.gradle.build-scan' version '1.3' + id 'com.gradle.build-scan' version '1.9' id 'me.champeau.buildscan-recipes' version '0.1.7' } @@ -59,7 +59,7 @@ allprojects { ext { hibernateTargetVersion = '5.2.12-SNAPSHOT' - expectedGradleVersion = '3.2.1' + expectedGradleVersion = '4.2' baselineJavaVersion = '1.8' osgiExportVersion = hibernateTargetVersion.replaceAll( '-SNAPSHOT', '.SNAPSHOT' ) @@ -97,6 +97,10 @@ subprojects { subProject -> defaultTasks 'build' + if ( subProject.name.startsWith( 'hibernate-gradle-plugin' ) ) { + apply plugin: 'groovy' + } + group = 'org.hibernate' version = rootProject.hibernateTargetVersion @@ -280,12 +284,19 @@ subprojects { subProject -> // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // artifact + jar { manifest = osgiManifest { // GRADLE-1411: Even if we override Imports and Exports // auto-generation with instructions, classesDir and classpath // need to be here (temporarily). - classesDir = sourceSets.main.output.classesDir + + if ( subProject.name.startsWith( 'hibernate-gradle-plugin' ) ) { + classesDir = sourceSets.main.groovy.outputDir + } + else { + classesDir = sourceSets.main.output.classesDir + } classpath = configurations.runtime instruction 'Import-Package', diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 51288f9c2f05faf8d42e1a751a387ca7923882c3..d457a1a990f3f8cee976589d405f62b13f1eede8 100644 GIT binary patch delta 20030 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 KF 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 K470kA|N0+hiu-~9 delta 19636 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 97650c1eef3c..6109d5b6ac77 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Dec 16 15:26:37 GMT 2016 +distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 4453ccea33d9..cccdd3d517fc 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/MavenEnhancePluginTest.java b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/MavenEnhancePluginTest.java index 327ab33bf38d..b4bfa297c0f8 100644 --- a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/MavenEnhancePluginTest.java +++ b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/MavenEnhancePluginTest.java @@ -32,7 +32,7 @@ public class MavenEnhancePluginTest { @Test public void testEnhancePlugin() throws Exception { - File baseDir = new File("target/classes/test"); + File baseDir = new File("target/classes/java/test"); URL[] baseURLs = { baseDir.toURI().toURL() }; MavenEnhancePlugin plugin = new MavenEnhancePlugin(); diff --git a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle index 531c072a9426..efecfc843bf9 100644 --- a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle +++ b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle @@ -6,9 +6,7 @@ */ apply plugin: 'java-gradle-plugin' -apply plugin: 'groovy' apply plugin: 'maven' -apply plugin: 'java' dependencies { compile( project( ':hibernate-core' ) )