Skip to content

Commit 2f9d5df

Browse files
committed
Polish the SBDG Gradle Plugins.
* Rename MavenPublishingConventionsPlugin to MavenPublishConventionsPlugins. * Rename SpringDependencyManagementConventionPlugin to SpringDependencyManagementConventionsPlugin. * Refactor the application and configuration of the Spring DependencyManagementPlugin into a private method of the SpringDependencyManagementConventionsPlugin class. * Reorder the Spring SNAPSHOT and MILESTONE Repository declarations in the SpringSampleBootPlugin.
1 parent 585ab03 commit 2f9d5df

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
9595
pluginManager.apply(PropDepsPlugin)
9696
pluginManager.apply(PropDepsEclipsePlugin)
9797
pluginManager.apply(PropDepsIdeaPlugin)
98-
pluginManager.apply(SpringDependencyManagementConventionPlugin)
98+
pluginManager.apply(SpringDependencyManagementConventionsPlugin)
9999
pluginManager.apply(DependencySetPlugin)
100100
pluginManager.apply(TestsConfigurationPlugin)
101101
pluginManager.apply(IntegrationTestPlugin)

buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionPlugin.groovy renamed to buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionsPlugin.groovy

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package io.spring.gradle.convention
1818
import io.spring.gradle.dependencymanagement.DependencyManagementPlugin
1919
import org.gradle.api.Plugin
2020
import org.gradle.api.Project
21-
import org.gradle.api.plugins.PluginManager
2221

2322
/**
2423
* Applies and configures the Spring Gradle {@link DependencyManagementPlugin}.
@@ -32,24 +31,26 @@ import org.gradle.api.plugins.PluginManager
3231
* @see org.gradle.api.Project
3332
* @see org.gradle.api.plugins.PluginManager
3433
*/
35-
class SpringDependencyManagementConventionPlugin implements Plugin<Project> {
34+
class SpringDependencyManagementConventionsPlugin implements Plugin<Project> {
3635

3736
static final String DEPENDENCY_MANAGEMENT_RESOURCE = "gradle/dependency-management.gradle"
3837

3938
@Override
4039
void apply(Project project) {
4140

42-
PluginManager pluginManager = project.getPluginManager()
41+
applyAndConfigureDependencyManagementPlugin(project)
42+
applyDependencyManagementResources(project)
43+
}
44+
45+
private void applyAndConfigureDependencyManagementPlugin(Project project) {
4346

44-
pluginManager.apply(DependencyManagementPlugin)
47+
project.getPluginManager().apply(DependencyManagementPlugin)
4548

4649
project.dependencyManagement {
4750
resolutionStrategy {
4851
cacheChangingModulesFor 0, "seconds"
4952
}
5053
}
51-
52-
applyDependencyManagementResources(project)
5354
}
5455

5556
@SuppressWarnings("all")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ class SpringSampleBootPlugin extends SpringSamplePlugin {
3131
project.getPluginManager().apply("org.springframework.boot");
3232

3333
project.repositories {
34-
maven { url 'https://repo.spring.io/snapshot' }
3534
maven { url 'https://repo.spring.io/milestone' }
35+
maven { url 'https://repo.spring.io/snapshot' }
3636
}
3737
}
3838
}

buildSrc/src/main/java/org/springframework/gradle/maven/MavenPublishingConventionsPlugin.java renamed to buildSrc/src/main/java/org/springframework/gradle/maven/MavenPublishConventionsPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* @see org.gradle.api.publish.maven.MavenPublication
4242
* @see org.gradle.api.publish.maven.plugins.MavenPublishPlugin
4343
*/
44-
public class MavenPublishingConventionsPlugin implements Plugin<Project> {
44+
public class MavenPublishConventionsPlugin implements Plugin<Project> {
4545

4646
@Override
4747
public void apply(Project project) {

buildSrc/src/main/java/org/springframework/gradle/maven/SpringMavenPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void apply(Project project) {
3838
PluginManager pluginManager = project.getPluginManager();
3939

4040
pluginManager.apply(MavenPublishPlugin.class);
41-
pluginManager.apply(MavenPublishingConventionsPlugin.class);
41+
pluginManager.apply(MavenPublishConventionsPlugin.class);
4242
pluginManager.apply(PublishAllJavaComponentsPlugin.class);
4343
pluginManager.apply(PublishArtifactsPlugin.class);
4444
pluginManager.apply(PublishLocalPlugin.class);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
implementation-class=io.spring.gradle.convention.SpringDependencyManagementConventionPlugin
1+
implementation-class=io.spring.gradle.convention.SpringDependencyManagementConventionsPlugin

0 commit comments

Comments
 (0)