@@ -318,7 +318,7 @@ def changeToDevelopmentVersionTask = tasks.register( 'changeToDevelopmentVersion
318
318
}
319
319
}
320
320
321
- def gitTasksAfterReleaseTask = tasks. register( ' gitTasksAfterRelease' ) {
321
+ def releasePreparePostGitTask = tasks. register( ' gitTasksAfterRelease' ) {
322
322
dependsOn changeToDevelopmentVersionTask
323
323
324
324
doLast {
@@ -345,22 +345,7 @@ def publishReleaseArtifactsTask = tasks.register( 'publishReleaseArtifacts' ) {
345
345
dependsOn uploadDocumentationDescriptor
346
346
}
347
347
348
- def releaseTask = tasks. register( ' release' ) {
349
- group ' Release'
350
- description ' Performs a release on local check-out, including updating changelog and '
351
-
352
- dependsOn gitPreparationForReleaseTask
353
- dependsOn publishReleaseArtifactsTask
354
-
355
- finalizedBy gitTasksAfterReleaseTask
356
- }
357
-
358
- def ciReleaseChecksTask = tasks. register( ' ciReleaseChecks' ) {
359
-
360
- }
361
-
362
- def gitTasksAfterCiReleaseTask = tasks. register( ' gitTasksAfterCiRelease' ) {
363
- dependsOn gitTasksAfterReleaseTask
348
+ def releasePerformPostGitTask = tasks. register( ' gitTasksAfterReleasePerform' ) {
364
349
365
350
doLast {
366
351
if ( project. createTag ) {
@@ -374,14 +359,37 @@ def gitTasksAfterCiReleaseTask = tasks.register( 'gitTasksAfterCiRelease' ) {
374
359
}
375
360
}
376
361
362
+ def releasePrepareTask = tasks. register( ' releasePrepare' ) {
363
+ group ' Release'
364
+ description ' Performs release preparations on local check-out, including updating changelog'
365
+
366
+ dependsOn gitPreparationForReleaseTask
367
+
368
+ finalizedBy releasePreparePostGitTask
369
+ }
370
+
371
+ def releasePerformTask = tasks. register( ' releasePerform' ) {
372
+ group ' Release'
373
+ description ' Performs a release on local check-out, including updating changelog and '
374
+
375
+ dependsOn publishReleaseArtifactsTask
376
+
377
+ finalizedBy releasePerformPostGitTask
378
+ }
379
+
380
+ def releaseTask = tasks. register( ' release' ) {
381
+ group ' Release'
382
+ description ' Performs a release on local check-out, including updating changelog and '
383
+
384
+ dependsOn releasePrepareTask
385
+ dependsOn releasePerformTask
386
+ }
387
+
377
388
def ciReleaseTask = tasks. register( ' ciRelease' ) {
378
389
group ' Release'
379
390
description ' Performs a release: the hibernate version is set and the changelog.txt file updated, the changes are pushed to github, then the release is performed, tagged and the hibernate version is set to the development one.'
380
391
381
- dependsOn ciReleaseChecksTask
382
392
dependsOn releaseTask
383
-
384
- finalizedBy gitTasksAfterCiReleaseTask
385
393
}
386
394
387
395
static String executeGitCommand (Object ... subcommand ){
@@ -512,9 +520,9 @@ gradle.getTaskGraph().whenReady {tg->
512
520
String releaseVersionLocal
513
521
String developmentVersionLocal
514
522
515
- def console = tg. hasTask( project. tasks. ciReleaseChecks )
516
- ? null
517
- : System . console()
523
+ def console = tg. hasTask( project. tasks. release ) && ! tg . hasTask( project . tasks . ciRelease )
524
+ ? System . console()
525
+ : null
518
526
519
527
if (project. hasProperty(' releaseVersion' )) {
520
528
releaseVersionLocal = project. property(' releaseVersion' )
0 commit comments