Skip to content

Commit 7eda62f

Browse files
committed
Upgrade gradle 8.6
- This is take 2 - In SpringMavenPlugin remove optional feature which were copied from boot. It exists in other form and caused issues mention in a ticket. - Fixes #1145
1 parent 9cce18b commit 7eda62f

File tree

3 files changed

+1
-23
lines changed

3 files changed

+1
-23
lines changed

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import org.gradle.api.Plugin;
2222
import org.gradle.api.Project;
2323
import org.gradle.api.attributes.Usage;
24-
import org.gradle.api.component.AdhocComponentWithVariants;
25-
import org.gradle.api.component.ConfigurationVariantDetails;
2624
import org.gradle.api.plugins.JavaPlugin;
2725
import org.gradle.api.plugins.JavaPluginExtension;
2826
import org.gradle.api.plugins.PluginManager;
@@ -65,35 +63,15 @@ private void customizeMavenPublication(MavenPublication publication, Project pro
6563
customizePom(publication.getPom(), project);
6664
project.getPlugins().withType(JavaPlugin.class)
6765
.all((javaPlugin) -> customizeJavaMavenPublication(publication, project));
68-
suppressMavenOptionalFeatureWarnings(publication);
6966
}
7067

7168
private void customizeJavaMavenPublication(MavenPublication publication, Project project) {
72-
addMavenOptionalFeature(project);
7369
publication.versionMapping((strategy) -> strategy.usage(Usage.JAVA_API, (mappingStrategy) -> mappingStrategy
7470
.fromResolutionOf(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME)));
7571
publication.versionMapping(
7672
(strategy) -> strategy.usage(Usage.JAVA_RUNTIME, VariantVersionMappingStrategy::fromResolutionResult));
7773
}
7874

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-
9775
private void customizePom(MavenPom pom, Project project) {
9876
pom.getUrl().set("https://spring.io/projects/spring-statemachine");
9977
pom.getName().set(project.provider(project::getName));

gradle/wrapper/gradle-wrapper.jar

50 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)