Skip to content

Commit ab7f35c

Browse files
committed
Merge branch '2023.3.x'
Closes gh-1104
2 parents 1e44810 + 0ce2cd9 commit ab7f35c

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ subprojects { project ->
138138
documentation
139139
}
140140

141+
ext.isDocs = project.name == "docs"
141142
ext.isTestSuite = project.name.startsWith("grace-test-suite")
142143
ext.isCiBuild = project.hasProperty("isCiBuild") || System.getenv().get("CI") as Boolean
143144
ext.pomInfo = {
@@ -177,7 +178,7 @@ subprojects { project ->
177178

178179
apply plugin: 'java-library'
179180
apply plugin: 'groovy'
180-
if (!isTestSuite) {
181+
if (!isDocs && !isTestSuite) {
181182
apply plugin: 'maven-publish'
182183
apply plugin: 'ivy-publish'
183184
apply plugin: 'signing'
@@ -197,7 +198,7 @@ subprojects { project ->
197198
withSourcesJar()
198199
}
199200

200-
if (!isTestSuite) {
201+
if (!isDocs && !isTestSuite) {
201202

202203
publishing {
203204
repositories {
@@ -258,6 +259,7 @@ subprojects { project ->
258259

259260
}
260261

262+
if (project.name == 'docs') return
261263
if (project.name == 'grace-dependencies') return
262264
if (project.name == 'grace-bom') return
263265

grace-bom/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ publishing {
6060
mkp.dependencyManagement {
6161
mkp.dependencies {
6262
for (sub in project.parent.subprojects) {
63-
if (sub.name == 'grace-bom' || sub.name.contains('test-suite')) continue
63+
if (sub.name == 'docs' || sub.name == 'grace-bom' || sub.name.contains('test-suite')) continue
6464

6565
mkp.dependency {
6666
mkp.groupId sub.group

gradle/assemble.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ class GrailsCreateStartScripts extends org.gradle.api.tasks.application.CreateSt
106106

107107
task install(dependsOn: populateDependencies) { task ->
108108
subprojects { Project project ->
109-
if(!project.name.startsWith('grace-test-suite')) {
109+
if(!isDocs && !project.name.startsWith('grace-test-suite')) {
110110
task.dependsOn("$project.name:publishToMavenLocal")
111111
}
112112
}
113113
}
114114

115115
task publishToDist { task ->
116116
subprojects { Project project ->
117-
if (!project.name.startsWith('grace-test-suite') && !project.name.startsWith('grace-dependencies') && !project.name.startsWith('grace-bom')) {
117+
if (!isDocs && !project.name.startsWith('grace-test-suite') && !project.name.startsWith('grace-dependencies') && !project.name.startsWith('grace-bom')) {
118118
project.tasks.named("generateMetadataFileForIvyPublication").configure {
119119
enabled = false
120120
}

0 commit comments

Comments
 (0)