Skip to content

Commit c72f8de

Browse files
committed
Fix MavenBom
1 parent 928c855 commit c72f8de

File tree

3 files changed

+13
-59
lines changed

3 files changed

+13
-59
lines changed

bom/spring-security-bom.gradle

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
apply plugin: 'io.spring.convention.bom'
1+
import io.spring.gradle.convention.SpringModulePlugin
22

3-
sonarqube.skipProject = true
3+
apply plugin: 'io.spring.convention.bom'
44

5+
dependencies {
6+
constraints {
7+
project.allprojects { p ->
8+
p.plugins.withType(SpringModulePlugin) {
9+
api p
10+
}
11+
}
12+
}
13+
}

buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomPlugin.groovy

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,15 @@ package io.spring.gradle.convention
22

33
import org.gradle.api.Plugin
44
import org.gradle.api.Project
5+
import org.gradle.api.plugins.JavaPlatformPlugin
56
import org.sonarqube.gradle.SonarQubePlugin
67
import org.springframework.gradle.maven.SpringMavenPlugin
78

89
public class MavenBomPlugin implements Plugin<Project> {
910
static String MAVEN_BOM_TASK_NAME = "mavenBom"
1011

1112
public void apply(Project project) {
12-
project.configurations {
13-
archives
14-
}
13+
project.plugins.apply(JavaPlatformPlugin)
1514
project.plugins.apply(SpringMavenPlugin)
16-
17-
project.group = project.rootProject.group
18-
project.task(MAVEN_BOM_TASK_NAME, type: MavenBomTask, group: 'Generate', description: 'Configures the pom as a Maven Build of Materials (BOM)')
19-
project.tasks.uploadArchives.dependsOn project.mavenBom
20-
project.tasks.artifactoryPublish.dependsOn project.mavenBom
21-
22-
project.plugins.withType(SonarQubePlugin) {
23-
project.sonarqube.skipProject = true
24-
}
25-
26-
project.rootProject.allprojects.each { p ->
27-
p.plugins.withType(SpringMavenPlugin) {
28-
if (!project.name.equals(p.name)) {
29-
project.mavenBom.projects.add(p)
30-
}
31-
}
32-
}
33-
34-
def deployArtifacts = project.task("deployArtifacts")
35-
deployArtifacts.group = 'Deploy tasks'
36-
deployArtifacts.description = "Deploys the artifacts to either Artifactor or Maven Central"
37-
if(Utils.isRelease(project)) {
38-
deployArtifacts.dependsOn project.tasks.uploadArchives
39-
} else {
40-
deployArtifacts.dependsOn project.tasks.artifactoryPublish
41-
}
42-
43-
project.artifacts {
44-
archives project.mavenBom.bomFile
45-
}
4615
}
4716
}

buildSrc/src/main/groovy/io/spring/gradle/convention/SpringPomPlugin.groovy

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)