2
0
Эх сурвалжийг харах

Revert "Map optional dependencies to Maven"

This reverts commit 7dc34ccef7a74f1880962f4c13a407fda080441a.
Rob Winch 4 жил өмнө
parent
commit
b0f661f432

+ 0 - 12
buildSrc/src/main/java/org/springframework/gradle/maven/MavenPublishingConventionsPlugin.java

@@ -1,11 +1,8 @@
 package org.springframework.gradle.maven;
 
-import io.spring.gradle.propdeps.PropDepsPlugin;
 import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.component.AdhocComponentWithVariants;
-import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.publish.PublishingExtension;
@@ -18,8 +15,6 @@ import org.gradle.api.publish.maven.MavenPomScm;
 import org.gradle.api.publish.maven.MavenPublication;
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
 
-import java.util.function.Consumer;
-
 public class MavenPublishingConventionsPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {
@@ -32,13 +27,6 @@ public class MavenPublishingConventionsPlugin implements Plugin<Project> {
 				MavenPublishingConventionsPlugin.this.customizeJavaPlugin(project);
 			}
 		});
-		project.getPlugins().withType(PropDepsPlugin.class).forEach(new Consumer<PropDepsPlugin>() {
-			@Override
-			public void accept(PropDepsPlugin plugin) {
-				AdhocComponentWithVariants component = (AdhocComponentWithVariants) project.getComponents().findByName("java");
-				component.addVariantsFromConfiguration(project.getConfigurations().getByName("optional"), (details) -> details.mapToOptional());
-			}
-		});
 	}
 
 	private void customizePom(MavenPom pom, Project project) {