Skip to content

Commit a1a7e9c

Browse files
committed
Gradle 9
1 parent d468dfa commit a1a7e9c

File tree

6 files changed

+63
-63
lines changed

6 files changed

+63
-63
lines changed

local-build-plugins/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ gradlePlugin {
106106

107107
spotless {
108108
//Don't fail during the check: rather than enforcing guidelines, we use this plugin to fix mistakes automatically.
109-
enforceCheck false
109+
enforceCheck = false
110110
java {
111111
targetExclude( "**/target/**/*.java" )
112112
licenseHeaderFile project.file("../shared/config/spotless/license.java")

local-build-plugins/src/main/groovy/local.code-quality.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ plugins {
1111

1212
tasks.register( "ciCheck" ) {
1313
// Task used by CI builds
14-
group "verification"
15-
description "Checks for CI environments"
14+
group = "verification"
15+
description = "Checks for CI environments"
1616
dependsOn tasks.check
1717
}
1818

@@ -27,8 +27,8 @@ gradle.taskGraph.whenReady {
2727

2828
tasks.register( "formatChecks" ) {
2929
// Only runs static code analysis, doesn't require compilation
30-
group "verification"
31-
description "Code style and formatting checks"
30+
group = "verification"
31+
description = "Code style and formatting checks"
3232

3333
dependsOn tasks.spotlessCheck
3434
dependsOn tasks.enforceRules
@@ -92,10 +92,10 @@ tasks.check.dependsOn enforceRulesTask
9292

9393
spotless {
9494
//Don't fail during the check: rather than enforcing guidelines, we use this plugin to fix mistakes automatically.
95-
enforceCheck false
95+
enforceCheck = false
9696
java {
9797
targetExclude( "target/**/*.java" )
98-
licenseHeaderFile rootProject.file("shared/config/spotless/license.java")
98+
licenseHeaderFile( rootProject.file("shared/config/spotless/license.java") )
9999
removeUnusedImports()
100100
leadingSpacesToTabs( 4 )
101101
trimTrailingWhitespace()

local-build-plugins/src/main/groovy/local.java-module.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ tasks.register('compile') {
143143

144144
tasks.withType( JavaCompile ).configureEach {
145145
options.encoding = 'UTF-8'
146-
options.warnings false
146+
options.warnings = false
147147
options.fork = true
148148
options.forkOptions.memoryMaximumSize = '896m'
149149

@@ -164,7 +164,7 @@ tasks.withType( JavaCompile ).configureEach {
164164
}
165165

166166
processTestResources {
167-
duplicatesStrategy DuplicatesStrategy.INCLUDE
167+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
168168

169169
inputs.property( "db", db )
170170
inputs.property( "dbHost", dbHost )

local-build-plugins/src/main/groovy/local.publishing-java-module.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ publishingExtension.publications.named("publishedArtifacts", MavenPublication) {
4646
// Releasing
4747

4848
def releasePrepareTask = tasks.register("releasePrepare") {
49-
group "release"
50-
description "See :release:releasePrepare for details. Here we hook in testing and checks ensure publish-ability"
49+
group = "release"
50+
description = "See :release:releasePrepare for details. Here we hook in testing and checks ensure publish-ability"
5151

5252
dependsOn tasks.check
5353
dependsOn tasks.generateMetadataFileForPublishedArtifactsPublication
@@ -56,8 +56,8 @@ def releasePrepareTask = tasks.register("releasePrepare") {
5656

5757
// used from the h2 CI job
5858
tasks.register("preVerifyRelease") {
59-
group "release-prepare"
60-
description "Delegates to `releasePrepare` task"
59+
group = "release-prepare"
60+
description = "Delegates to `releasePrepare` task"
6161

6262
dependsOn releasePrepareTask
6363
}

release/release.gradle

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ idea.module {
2020

2121
// skip building this when `build` task is run from root, as many of our CI jobs do
2222
tasks.build.dependsOn.clear()
23-
tasks.build.enabled false
23+
tasks.build.enabled = false
2424

2525

2626
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -42,8 +42,8 @@ tasks.build.enabled false
4242
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4343

4444
def releaseChecksTask = tasks.register( "releaseChecks" ) {
45-
group 'release-prepare'
46-
description 'Checks and preparation for release'
45+
group = 'release-prepare'
46+
description = 'Checks and preparation for release'
4747

4848
doFirst {
4949
logger.lifecycle("Checking that the working tree is clean...")
@@ -99,8 +99,8 @@ def releaseChecksTask = tasks.register( "releaseChecks" ) {
9999
}
100100

101101
def changeLogFileTask = tasks.register( "changeLogFile" ) {
102-
group 'release-prepare'
103-
description 'Updates the changelog.txt file based on the change-log report from Jira'
102+
group = 'release-prepare'
103+
description = 'Updates the changelog.txt file based on the change-log report from Jira'
104104
dependsOn releaseChecksTask
105105

106106
doFirst {
@@ -110,8 +110,8 @@ def changeLogFileTask = tasks.register( "changeLogFile" ) {
110110
}
111111

112112
def changeToReleaseVersionTask = tasks.register( "changeToReleaseVersion" ) {
113-
group 'release-prepare'
114-
description 'Updates `gradle/version.properties` file to the specified release-version'
113+
group = 'release-prepare'
114+
description = 'Updates `gradle/version.properties` file to the specified release-version'
115115

116116
dependsOn releaseChecksTask
117117

@@ -123,8 +123,8 @@ def changeToReleaseVersionTask = tasks.register( "changeToReleaseVersion" ) {
123123
}
124124

125125
def gitPreStepsTask = tasks.register( 'gitPreSteps' ) {
126-
group "release-prepare"
127-
description "update changelog, update version file and commit"
126+
group = "release-prepare"
127+
description = "update changelog, update version file and commit"
128128

129129
dependsOn releaseChecksTask
130130
dependsOn changeLogFileTask
@@ -139,8 +139,8 @@ def gitPreStepsTask = tasks.register( 'gitPreSteps' ) {
139139
}
140140

141141
def gitPostStepsTask = tasks.register( 'gitPostSteps' ) {
142-
group "release-prepare"
143-
description "possibly create tag. update version-file and commit "
142+
group = "release-prepare"
143+
description = "possibly create tag. update version-file and commit "
144144

145145
doFirst {
146146
}
@@ -170,8 +170,8 @@ void updateVersionFile(String version) {
170170
}
171171

172172
tasks.register("releasePrepare") {
173-
group "release-prepare"
174-
description "Scripted release 'Release Prepare' stage"
173+
group = "release-prepare"
174+
description = "Scripted release 'Release Prepare' stage"
175175

176176
dependsOn releaseChecksTask
177177
dependsOn "assembleDocumentation"
@@ -185,8 +185,8 @@ tasks.register("releasePrepare") {
185185
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
186186

187187
def stageIntegrationGuideTask = tasks.register( "stageIntegrationGuide", Copy ) {
188-
group "documentation"
189-
description "Stages the Integration Guide as part of assembling documentation in preparation for release"
188+
group = "documentation"
189+
description = "Stages the Integration Guide as part of assembling documentation in preparation for release"
190190

191191
dependsOn ":documentation:renderIntegrationGuides"
192192

@@ -195,8 +195,8 @@ def stageIntegrationGuideTask = tasks.register( "stageIntegrationGuide", Copy )
195195
}
196196

197197
def stageQuickstartTask = tasks.register( "stageQuickstart", Copy ) {
198-
group 'documentation'
199-
description "Stages the Getting Started Guide as part of assembling documentation in preparation for release"
198+
group = 'documentation'
199+
description = "Stages the Getting Started Guide as part of assembling documentation in preparation for release"
200200

201201
dependsOn ':documentation:renderGettingStartedGuides'
202202

@@ -205,8 +205,8 @@ def stageQuickstartTask = tasks.register( "stageQuickstart", Copy ) {
205205
}
206206

207207
def stageTopicalGuideTask = tasks.register( "stageTopicalGuide", Copy ) {
208-
group 'documentation'
209-
description "Stages the Topical Guide as part of assembling documentation in preparation for release"
208+
group = 'documentation'
209+
description = "Stages the Topical Guide as part of assembling documentation in preparation for release"
210210

211211
dependsOn ':documentation:renderTopicalGuides'
212212

@@ -215,8 +215,8 @@ def stageTopicalGuideTask = tasks.register( "stageTopicalGuide", Copy ) {
215215
}
216216

217217
def stageIntroductionGuideTask = tasks.register( "stageIntroductionGuide", Copy ) {
218-
group 'documentation'
219-
description "Stages the Introduction Guide as part of assembling documentation in preparation for release"
218+
group = 'documentation'
219+
description = "Stages the Introduction Guide as part of assembling documentation in preparation for release"
220220

221221
dependsOn ':documentation:renderIntroductionGuides'
222222

@@ -225,8 +225,8 @@ def stageIntroductionGuideTask = tasks.register( "stageIntroductionGuide", Copy
225225
}
226226

227227
def stageQueryGuideTask = tasks.register( "stageQueryGuide", Copy ) {
228-
group 'documentation'
229-
description "Stages the Query Language Guide as part of assembling documentation in preparation for release"
228+
group = 'documentation'
229+
description = "Stages the Query Language Guide as part of assembling documentation in preparation for release"
230230

231231
dependsOn ':documentation:renderQueryLanguageGuides'
232232

@@ -235,8 +235,8 @@ def stageQueryGuideTask = tasks.register( "stageQueryGuide", Copy ) {
235235
}
236236

237237
def stageRepositoriesGuideTask = tasks.register( "stageRepositoriesGuide", Copy ) {
238-
group 'documentation'
239-
description "Stages the Repositories Guide as part of assembling documentation in preparation for release"
238+
group = 'documentation'
239+
description = "Stages the Repositories Guide as part of assembling documentation in preparation for release"
240240

241241
dependsOn ':documentation:renderRepositories'
242242

@@ -245,8 +245,8 @@ def stageRepositoriesGuideTask = tasks.register( "stageRepositoriesGuide", Copy
245245
}
246246

247247
def stageUserGuideTask = tasks.register( "stageUserGuide", Copy ) {
248-
group 'documentation'
249-
description "Stages the User Guide as part of assembling documentation in preparation for release"
248+
group = 'documentation'
249+
description = "Stages the User Guide as part of assembling documentation in preparation for release"
250250

251251
dependsOn ':documentation:renderUserGuides'
252252

@@ -256,8 +256,8 @@ def stageUserGuideTask = tasks.register( "stageUserGuide", Copy ) {
256256

257257

258258
def stageMigrationGuideTask = tasks.register( "stageMigrationGuide", Copy ) {
259-
group 'documentation'
260-
description "Stages the Migration Guide as part of assembling documentation in preparation for release"
259+
group = 'documentation'
260+
description = "Stages the Migration Guide as part of assembling documentation in preparation for release"
261261

262262
dependsOn ':documentation:renderMigrationGuide'
263263

@@ -266,8 +266,8 @@ def stageMigrationGuideTask = tasks.register( "stageMigrationGuide", Copy ) {
266266
}
267267

268268
def stageWhatsNewGuideTask = tasks.register( "stageWhatsNewGuide", Copy ) {
269-
group 'documentation'
270-
description "Stages the What's New guide as part of assembling documentation in preparation for release"
269+
group = 'documentation'
270+
description = "Stages the What's New guide as part of assembling documentation in preparation for release"
271271

272272
dependsOn ':documentation:renderWhatsNew'
273273

@@ -276,8 +276,8 @@ def stageWhatsNewGuideTask = tasks.register( "stageWhatsNewGuide", Copy ) {
276276
}
277277

278278
def stageIncubationReportTask = tasks.register( "stageIncubationReport", Copy ) { task ->
279-
group 'documentation'
280-
description "Stages ORM @Incubating report as part of assembling documentation in preparation for release"
279+
group = 'documentation'
280+
description = "Stages ORM @Incubating report as part of assembling documentation in preparation for release"
281281

282282
dependsOn ':documentation:generateIncubationReport'
283283
tasks.stageOrmReports.dependsOn task
@@ -287,8 +287,8 @@ def stageIncubationReportTask = tasks.register( "stageIncubationReport", Copy )
287287
}
288288

289289
def stageInternalsReportTask = tasks.register( "stageInternalsReport", Copy ) { task ->
290-
group 'documentation'
291-
description "Stages the @Internal report as part of assembling documentation in preparation for release"
290+
group = 'documentation'
291+
description = "Stages the @Internal report as part of assembling documentation in preparation for release"
292292

293293
dependsOn ':documentation:generateInternalsReport'
294294

@@ -297,8 +297,8 @@ def stageInternalsReportTask = tasks.register( "stageInternalsReport", Copy ) {
297297
}
298298

299299
def stageDeprecationReportTask = tasks.register( "stageDeprecationReport", Copy ) {
300-
group 'documentation'
301-
description "Stages the @Deprecated/@Remove report as part of assembling documentation in preparation for release"
300+
group = 'documentation'
301+
description = "Stages the @Deprecated/@Remove report as part of assembling documentation in preparation for release"
302302

303303
dependsOn ':documentation:generateDeprecationReport'
304304

@@ -307,8 +307,8 @@ def stageDeprecationReportTask = tasks.register( "stageDeprecationReport", Copy
307307
}
308308

309309
def stageLoggingReportTask = tasks.register( "stageLoggingReport", Copy ) { task ->
310-
group 'documentation'
311-
description "Stages the logging report as part of assembling documentation in preparation for release"
310+
group = 'documentation'
311+
description = "Stages the logging report as part of assembling documentation in preparation for release"
312312

313313
dependsOn ':documentation:renderLoggingReport'
314314

@@ -317,8 +317,8 @@ def stageLoggingReportTask = tasks.register( "stageLoggingReport", Copy ) { task
317317
}
318318

319319
def stageDialectReportTask = tasks.register( "stageDialectReport", Copy ) { task ->
320-
group 'documentation'
321-
description "Stages the supported Dialects report as part of assembling documentation in preparation for release"
320+
group = 'documentation'
321+
description = "Stages the supported Dialects report as part of assembling documentation in preparation for release"
322322

323323
dependsOn ':documentation:renderDialectReport'
324324

@@ -327,8 +327,8 @@ def stageDialectReportTask = tasks.register( "stageDialectReport", Copy ) { task
327327
}
328328

329329
def stageOrmReportsTask = tasks.register( "stageOrmReports" ) {
330-
group 'documentation'
331-
description "Stages all ORM reports as part of assembling documentation in preparation for release"
330+
group = 'documentation'
331+
description = "Stages all ORM reports as part of assembling documentation in preparation for release"
332332

333333
dependsOn ':documentation:generateReports'
334334
dependsOn stageIncubationReportTask
@@ -339,8 +339,8 @@ def stageOrmReportsTask = tasks.register( "stageOrmReports" ) {
339339
}
340340

341341
def stageJavadocsTask = tasks.register( "stageJavadocs", Copy ) {
342-
group 'documentation'
343-
description "Stages the aggregated Javadocs as part of assembling documentation in preparation for release"
342+
group = 'documentation'
343+
description = "Stages the aggregated Javadocs as part of assembling documentation in preparation for release"
344344

345345
dependsOn ':documentation:javadoc'
346346

@@ -354,8 +354,8 @@ def stageJavadocsTask = tasks.register( "stageJavadocs", Copy ) {
354354
* Depends on building the docs
355355
*/
356356
def assembleDocumentationTask = tasks.register( "assembleDocumentation" ) {
357-
group 'documentation'
358-
description 'Assembles all documentation into the {buildDir}/documentation directory'
357+
group = 'documentation'
358+
description = 'Assembles all documentation into the {buildDir}/documentation directory'
359359

360360
dependsOn ':documentation:buildDocsForPublishing'
361361
dependsOn stageJavadocsTask
@@ -387,7 +387,7 @@ def assembleDocumentationTask = tasks.register( "assembleDocumentation" ) {
387387

388388
tasks.register( 'releasePerform' ) {
389389
group = "release-perform"
390-
description "Scripted release 'Release Perform' stage"
390+
description = "Scripted release 'Release Perform' stage"
391391

392392
doFirst {
393393
if ( ormBuildDetails.releaseDetails.shouldCreateTag() ) {

tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ else {
153153
}
154154
}
155155

156-
tasks.publish.enabled !ormBuildDetails.hibernateVersion.isSnapshot
157-
tasks.publishPlugins.enabled !ormBuildDetails.hibernateVersion.isSnapshot
156+
tasks.publish.enabled = !ormBuildDetails.hibernateVersion.isSnapshot
157+
tasks.publishPlugins.enabled = !ormBuildDetails.hibernateVersion.isSnapshot
158158

159159
gradle.taskGraph.whenReady { tg ->
160160
// local publishing (SNAPSHOT testing), cont.

0 commit comments

Comments
 (0)