Skip to content

Commit b750f3b

Browse files
committed
copyproperties for bom plugin
1 parent b0f661f commit b750f3b

File tree

3 files changed

+27
-13
lines changed

3 files changed

+27
-13
lines changed

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ import org.gradle.plugins.ide.eclipse.EclipseWtpPlugin;
2828
import org.gradle.plugins.ide.idea.IdeaPlugin;
2929
import io.spring.gradle.propdeps.PropDepsEclipsePlugin;
3030
import io.spring.gradle.propdeps.PropDepsIdeaPlugin;
31-
import io.spring.gradle.propdeps.PropDepsPlugin;
31+
import io.spring.gradle.propdeps.PropDepsPlugin
32+
import org.springframework.gradle.CopyPropertiesPlugin;
3233

3334
/**
3435
* @author Rob Winch
@@ -59,10 +60,7 @@ public abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
5960
pluginManager.apply("io.spring.convention.dependency-set");
6061
pluginManager.apply("io.spring.convention.javadoc-options");
6162
pluginManager.apply("io.spring.convention.checkstyle");
62-
63-
copyPropertyFromRootProjectTo("group", project);
64-
copyPropertyFromRootProjectTo("version", project);
65-
copyPropertyFromRootProjectTo("description", project);
63+
pluginManager.apply(CopyPropertiesPlugin);
6664

6765
project.jar {
6866
manifest.attributes["Created-By"] =
@@ -74,13 +72,5 @@ public abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
7472
additionalPlugins(project);
7573
}
7674

77-
private void copyPropertyFromRootProjectTo(String propertyName, Project project) {
78-
Project rootProject = project.getRootProject();
79-
Object property = rootProject.findProperty(propertyName);
80-
if(property != null) {
81-
project.setProperty(propertyName, property);
82-
}
83-
}
84-
8575
protected abstract void additionalPlugins(Project project);
8676
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import org.gradle.api.Plugin
44
import org.gradle.api.Project
55
import org.gradle.api.plugins.JavaPlatformPlugin
66
import org.sonarqube.gradle.SonarQubePlugin
7+
import org.springframework.gradle.CopyPropertiesPlugin
78
import org.springframework.gradle.maven.SpringMavenPlugin
89

910
public class MavenBomPlugin implements Plugin<Project> {
@@ -12,5 +13,6 @@ public class MavenBomPlugin implements Plugin<Project> {
1213
public void apply(Project project) {
1314
project.plugins.apply(JavaPlatformPlugin)
1415
project.plugins.apply(SpringMavenPlugin)
16+
project.plugins.apply(CopyPropertiesPlugin)
1517
}
1618
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package org.springframework.gradle;
2+
3+
import org.gradle.api.Plugin;
4+
import org.gradle.api.Project;
5+
6+
public class CopyPropertiesPlugin implements Plugin<Project> {
7+
@Override
8+
public void apply(Project project) {
9+
copyPropertyFromRootProjectTo("group", project);
10+
copyPropertyFromRootProjectTo("version", project);
11+
copyPropertyFromRootProjectTo("description", project);
12+
}
13+
14+
15+
private void copyPropertyFromRootProjectTo(String propertyName, Project project) {
16+
Project rootProject = project.getRootProject();
17+
Object property = rootProject.findProperty(propertyName);
18+
if(property != null) {
19+
project.setProperty(propertyName, property);
20+
}
21+
}
22+
}

0 commit comments

Comments
 (0)