From 98b8eb356da24107150bb23d356c6478e610c9db Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Fri, 15 Dec 2023 09:49:26 +0000 Subject: [PATCH] Add spring-configuration-metadata - Adding boot's annotation processor to spring-shell-autoconfigure and spring-shell-test-autoconfigure - Backport #948 - Fixes #950 --- .../shell/gradle/ManagementConfigurationPlugin.java | 3 ++- spring-shell-autoconfigure/spring-shell-autoconfigure.gradle | 1 + .../spring-shell-test-autoconfigure.gradle | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/org/springframework/shell/gradle/ManagementConfigurationPlugin.java b/buildSrc/src/main/java/org/springframework/shell/gradle/ManagementConfigurationPlugin.java index 33e87dde..4f1f4e0c 100644 --- a/buildSrc/src/main/java/org/springframework/shell/gradle/ManagementConfigurationPlugin.java +++ b/buildSrc/src/main/java/org/springframework/shell/gradle/ManagementConfigurationPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 the original author or authors. + * Copyright 2022-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,6 +47,7 @@ public class ManagementConfigurationPlugin implements Plugin { PluginContainer plugins = project.getPlugins(); plugins.withType(JavaPlugin.class, (javaPlugin) -> { configurations.getByName(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME).extendsFrom(management); + configurations.getByName(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME).extendsFrom(management); }); plugins.withType(JavaTestFixturesPlugin.class, (javaTestFixturesPlugin) -> { configurations.getByName("testFixturesCompileClasspath").extendsFrom(management); diff --git a/spring-shell-autoconfigure/spring-shell-autoconfigure.gradle b/spring-shell-autoconfigure/spring-shell-autoconfigure.gradle index fd518033..969ba2dd 100644 --- a/spring-shell-autoconfigure/spring-shell-autoconfigure.gradle +++ b/spring-shell-autoconfigure/spring-shell-autoconfigure.gradle @@ -11,4 +11,5 @@ dependencies { implementation project(':spring-shell-standard') implementation project(':spring-shell-standard-commands') testImplementation 'org.springframework.boot:spring-boot-starter-test' + annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' } diff --git a/spring-shell-test-autoconfigure/spring-shell-test-autoconfigure.gradle b/spring-shell-test-autoconfigure/spring-shell-test-autoconfigure.gradle index 8ab2883b..860c20c5 100644 --- a/spring-shell-test-autoconfigure/spring-shell-test-autoconfigure.gradle +++ b/spring-shell-test-autoconfigure/spring-shell-test-autoconfigure.gradle @@ -18,4 +18,5 @@ dependencies { optional 'org.assertj:assertj-core' optional 'org.junit.jupiter:junit-jupiter-api' testImplementation 'org.awaitility:awaitility' + annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' }