diff --git a/start-site/src/main/java/io/spring/start/site/extension/dependency/dgs/DgsCodegenProjectGenerationConfiguration.java b/start-site/src/main/java/io/spring/start/site/extension/dependency/dgs/DgsCodegenProjectGenerationConfiguration.java index fb6df253ff..4967169150 100644 --- a/start-site/src/main/java/io/spring/start/site/extension/dependency/dgs/DgsCodegenProjectGenerationConfiguration.java +++ b/start-site/src/main/java/io/spring/start/site/extension/dependency/dgs/DgsCodegenProjectGenerationConfiguration.java @@ -19,7 +19,6 @@ import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem; import io.spring.initializr.generator.buildsystem.maven.MavenBuildSystem; import io.spring.initializr.generator.condition.ConditionalOnBuildSystem; -import io.spring.initializr.generator.condition.ConditionalOnPlatformVersion; import io.spring.initializr.generator.condition.ConditionalOnRequestedDependency; import io.spring.initializr.generator.project.ProjectDescription; import io.spring.initializr.generator.project.ProjectGenerationConfiguration; @@ -37,7 +36,6 @@ */ @ProjectGenerationConfiguration @ConditionalOnRequestedDependency("dgs-codegen") -@ConditionalOnPlatformVersion("3.2.0") class DgsCodegenProjectGenerationConfiguration { private final String dgsCodegenPluginVersion; diff --git a/start-site/src/main/java/io/spring/start/site/extension/dependency/observability/ObservabilityProjectGenerationConfiguration.java b/start-site/src/main/java/io/spring/start/site/extension/dependency/observability/ObservabilityProjectGenerationConfiguration.java index 0fdf01de9d..4c6b2e0cf3 100644 --- a/start-site/src/main/java/io/spring/start/site/extension/dependency/observability/ObservabilityProjectGenerationConfiguration.java +++ b/start-site/src/main/java/io/spring/start/site/extension/dependency/observability/ObservabilityProjectGenerationConfiguration.java @@ -23,7 +23,6 @@ import io.spring.initializr.generator.project.ProjectGenerationConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * Configuration for generation of projects that use observability. @@ -33,33 +32,27 @@ @ProjectGenerationConfiguration class ObservabilityProjectGenerationConfiguration { - @Configuration(proxyBeanMethods = false) - @ConditionalOnPlatformVersion("3.2.0") - static class ObservabilityConfiguration { - - @Bean - ObservabilityActuatorBuildCustomizer observabilityActuatorBuildCustomizer() { - return new ObservabilityActuatorBuildCustomizer(); - } - - @Bean - ObservabilityDistributedTracingBuildCustomizer observabilityDistributedTracingBuildCustomizer() { - return new ObservabilityDistributedTracingBuildCustomizer(); - } + @Bean + ObservabilityActuatorBuildCustomizer observabilityActuatorBuildCustomizer() { + return new ObservabilityActuatorBuildCustomizer(); + } - @Bean - ObservabilityHelpDocumentCustomizer observabilityHelpDocumentCustomizer(ProjectDescription description, - Build build) { - return new ObservabilityHelpDocumentCustomizer(description, build); - } + @Bean + ObservabilityDistributedTracingBuildCustomizer observabilityDistributedTracingBuildCustomizer() { + return new ObservabilityDistributedTracingBuildCustomizer(); + } - @Bean - @ConditionalOnRequestedDependency("wavefront") - @ConditionalOnPlatformVersion("[3.2.0, 3.3.0-M1)") - WavefrontHelpDocumentCustomizer wavefrontHelpDocumentCustomizer(Build build) { - return new WavefrontHelpDocumentCustomizer("https://docs.wavefront.com/wavefront_springboot3.html", build); - } + @Bean + ObservabilityHelpDocumentCustomizer observabilityHelpDocumentCustomizer(ProjectDescription description, + Build build) { + return new ObservabilityHelpDocumentCustomizer(description, build); + } + @Bean + @ConditionalOnRequestedDependency("wavefront") + @ConditionalOnPlatformVersion("[3.2.0, 3.3.0-M1)") + WavefrontHelpDocumentCustomizer wavefrontHelpDocumentCustomizer(Build build) { + return new WavefrontHelpDocumentCustomizer("https://docs.wavefront.com/wavefront_springboot3.html", build); } }