switch to sb 3.4

apereo · Nov 22, 2024 · 924c5c9 · 924c5c9
1 parent 1b3cbaf
commit 924c5c9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/app/src/main/java/org/apereo/cas/CasInitializrApplication.java b/app/src/main/java/org/apereo/cas/CasInitializrApplication.java
@@ -12,14 +12,12 @@
 import org.apereo.cas.initializr.web.SupportedVersionsEndpoint;
 import org.apereo.cas.initializr.web.generator.CasInitializrProjectAssetGenerator;
 import org.apereo.cas.initializr.web.generator.CasInitializrProjectGenerationInvoker;
-
 import io.spring.initializr.metadata.DependencyMetadataProvider;
 import io.spring.initializr.metadata.InitializrMetadataProvider;
 import io.spring.initializr.web.controller.ProjectMetadataController;
 import io.spring.initializr.web.project.DefaultProjectRequestPlatformVersionTransformer;
 import io.spring.initializr.web.project.ProjectRequestPlatformVersionTransformer;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.info.InfoContributor;
@@ -85,7 +83,6 @@ public HandlerInterceptor rateLimitInterceptor() {
     }
 
     @Bean
-    @Autowired
     public WebMvcConfigurer rateLimitingWebMvcConfigurer(
         @Qualifier("rateLimitInterceptor") final HandlerInterceptor rateLimitInterceptor) {
         return new WebMvcConfigurer() {

diff --git a/app/src/main/java/org/apereo/cas/initializr/config/CasInitializrConfiguration.java b/app/src/main/java/org/apereo/cas/initializr/config/CasInitializrConfiguration.java
@@ -43,11 +43,10 @@
 @ProjectGenerationConfiguration
 @Slf4j
 public class CasInitializrConfiguration {
-    @Autowired
-    private ConfigurableApplicationContext applicationContext;
 
     @Bean
-    public ChainingSingleResourceProjectContributor openRewriteContributor() {
+    public ChainingSingleResourceProjectContributor openRewriteContributor(
+        final ConfigurableApplicationContext applicationContext) {
         var chain = new ChainingSingleResourceProjectContributor();
         chain.addContributor(new OpenRewriteContributor(applicationContext));
         return chain;
@@ -59,7 +58,7 @@ public ProjectContributor projectLicenseContributor() {
     }
 
     @Bean
-    public ProjectContributor overlayLombokConfigContributor() {
+    public ProjectContributor overlayLombokConfigContributor(final ConfigurableApplicationContext applicationContext) {
         return new OverlayLombokConfigContributor(applicationContext);
     }
 
@@ -69,12 +68,12 @@ public ProjectContributor ignoreRulesContributor() {
     }
 
     @Bean
-    public ProjectContributor jenvJavaVersionContributor() {
+    public ProjectContributor jenvJavaVersionContributor(final ConfigurableApplicationContext applicationContext) {
         return new JenvJavaVersionContributor(applicationContext);
     }
 
     @Bean
-    public ProjectContributor sdkmanJavaVersionContributor() {
+    public ProjectContributor sdkmanJavaVersionContributor(final ConfigurableApplicationContext applicationContext) {
         return new SdkmanJavaVersionContributor(applicationContext);
     }
 
@@ -84,37 +83,37 @@ public ProjectContributor applicationYamlPropertiesContributor() {
     }
 
     @Bean
-    public ChainingSingleResourceProjectContributor herokuContributor() {
+    public ChainingSingleResourceProjectContributor herokuContributor(final ConfigurableApplicationContext applicationContext) {
         var chain = new ChainingSingleResourceProjectContributor();
         chain.addContributor(new HerokuProcFileContributor(applicationContext));
         chain.addContributor(new HerokuSystemPropertiesFileContributor(applicationContext));
         return chain;
     }
 
     @Bean
-    public ChainingSingleResourceProjectContributor nativeImageContributor() {
+    public ChainingSingleResourceProjectContributor nativeImageContributor(final ConfigurableApplicationContext applicationContext) {
         var chain = new ChainingSingleResourceProjectContributor();
         chain.addContributor(new GraalVMNativeImageContributor(applicationContext));
         return chain;
     }
 
     @Bean
-    public ChainingSingleResourceProjectContributor githubContributor() {
+    public ChainingSingleResourceProjectContributor githubContributor(final ConfigurableApplicationContext applicationContext) {
         var chain = new ChainingSingleResourceProjectContributor();
         chain.addContributor(new GithubResourcesContributor(applicationContext));
         return chain;
     }
 
     @Bean
-    public ChainingMultipleResourcesProjectContributor gradleWrapperContributor() {
+    public ChainingMultipleResourcesProjectContributor gradleWrapperContributor(final ConfigurableApplicationContext applicationContext) {
         var chain = new ChainingMultipleResourcesProjectContributor();
         chain.addContributor(new GradleWrapperConfigurationContributor(applicationContext));
         chain.addContributor(new GradleWrapperExecutablesContributor());
         return chain;
     }
 
     @Bean
-    public ChainingSingleResourceProjectContributor overlayGradleBuildContributor() {
+    public ChainingSingleResourceProjectContributor overlayGradleBuildContributor(final ConfigurableApplicationContext applicationContext) {
         var chain = new ChainingSingleResourceProjectContributor();
         chain.addContributor(new OverlayGradleSettingsContributor(applicationContext));
         chain.addContributor(new OverlayGradleTasksContributor(applicationContext));
@@ -124,7 +123,7 @@ public ChainingSingleResourceProjectContributor overlayGradleBuildContributor()
     }
 
     @Bean
-    public ChainingSingleResourceProjectContributor overlayOverrideSpringConfigContributor() {
+    public ChainingSingleResourceProjectContributor overlayOverrideSpringConfigContributor(final ConfigurableApplicationContext applicationContext) {
         var chain = new ChainingSingleResourceProjectContributor();
         chain.addContributor(new OverlayOverrideConfigurationContributor(applicationContext));
         return chain;
@@ -149,7 +148,7 @@ public InitializrMetadataUpdateStrategy initializrMetadataUpdateStrategy(
     }
 
     @Bean
-    public CasOverlayDockerContributor casOverlayDockerContributor() {
+    public CasOverlayDockerContributor casOverlayDockerContributor(final ConfigurableApplicationContext applicationContext) {
         return new CasOverlayDockerContributor(applicationContext);
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -9,13 +9,13 @@ org.gradle.unsafe.configuration-cache=false
 # to match version numbers.
 
 group=org.apereo.cas
-version=0.0.105
+version=0.0.106
 
 sourceCompatibility=21
 targetCompatibility=21
 
 springInitializrVersion=0.21.0
-springBootInitializrVersion=3.3.5
+springBootInitializrVersion=3.4.0
 ###################################
 # Plugin Versions
 ###################################
@@ -41,6 +41,6 @@ gradleCyclonePluginVersion=1.10.0
 ######################################
 springBootLatestVersion=3.4.0-RC1
 casLatestVersion=7.2.0-RC2
-gradleLatestVersion=8.11
+gradleLatestVersion=8.11.1
 
 apacheTomcat10LatestVersion=10.1.33