|
21 | 21 | import org.gradle.api.Plugin; |
22 | 22 | import org.gradle.api.Project; |
23 | 23 | import org.gradle.api.attributes.Usage; |
24 | | -import org.gradle.api.component.AdhocComponentWithVariants; |
25 | | -import org.gradle.api.component.ConfigurationVariantDetails; |
26 | 24 | import org.gradle.api.plugins.JavaPlugin; |
27 | 25 | import org.gradle.api.plugins.JavaPluginExtension; |
28 | 26 | import org.gradle.api.plugins.PluginManager; |
@@ -65,35 +63,15 @@ private void customizeMavenPublication(MavenPublication publication, Project pro |
65 | 63 | customizePom(publication.getPom(), project); |
66 | 64 | project.getPlugins().withType(JavaPlugin.class) |
67 | 65 | .all((javaPlugin) -> customizeJavaMavenPublication(publication, project)); |
68 | | - suppressMavenOptionalFeatureWarnings(publication); |
69 | 66 | } |
70 | 67 |
|
71 | 68 | private void customizeJavaMavenPublication(MavenPublication publication, Project project) { |
72 | | - addMavenOptionalFeature(project); |
73 | 69 | publication.versionMapping((strategy) -> strategy.usage(Usage.JAVA_API, (mappingStrategy) -> mappingStrategy |
74 | 70 | .fromResolutionOf(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME))); |
75 | 71 | publication.versionMapping( |
76 | 72 | (strategy) -> strategy.usage(Usage.JAVA_RUNTIME, VariantVersionMappingStrategy::fromResolutionResult)); |
77 | 73 | } |
78 | 74 |
|
79 | | - private void suppressMavenOptionalFeatureWarnings(MavenPublication publication) { |
80 | | - publication.suppressPomMetadataWarningsFor("mavenOptionalApiElements"); |
81 | | - publication.suppressPomMetadataWarningsFor("mavenOptionalRuntimeElements"); |
82 | | - } |
83 | | - |
84 | | - private void addMavenOptionalFeature(Project project) { |
85 | | - JavaPluginExtension extension = project.getExtensions().getByType(JavaPluginExtension.class); |
86 | | - extension.registerFeature("mavenOptional", |
87 | | - (feature) -> feature.usingSourceSet(extension.getSourceSets().getByName("main"))); |
88 | | - AdhocComponentWithVariants javaComponent = (AdhocComponentWithVariants) project.getComponents() |
89 | | - .findByName("java"); |
90 | | - if (javaComponent != null) { |
91 | | - javaComponent.addVariantsFromConfiguration( |
92 | | - project.getConfigurations().findByName("mavenOptionalRuntimeElements"), |
93 | | - ConfigurationVariantDetails::mapToOptional); |
94 | | - } |
95 | | - } |
96 | | - |
97 | 75 | private void customizePom(MavenPom pom, Project project) { |
98 | 76 | pom.getUrl().set("https://spring.io/projects/spring-statemachine"); |
99 | 77 | pom.getName().set(project.provider(project::getName)); |
|
0 commit comments