mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '3.1.x' into 3.2.x
Closes gh-40541
This commit is contained in:
commit
876d9213f5
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2023 the original author or authors.
|
* Copyright 2012-2024 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -52,6 +52,8 @@ public class AutoConfigurationMetadata extends DefaultTask {
|
|||||||
|
|
||||||
private static final String COMMENT_START = "#";
|
private static final String COMMENT_START = "#";
|
||||||
|
|
||||||
|
private final String moduleName;
|
||||||
|
|
||||||
private SourceSet sourceSet;
|
private SourceSet sourceSet;
|
||||||
|
|
||||||
private File outputFile;
|
private File outputFile;
|
||||||
@ -66,6 +68,7 @@ public class AutoConfigurationMetadata extends DefaultTask {
|
|||||||
dependsOn((Callable<String>) () -> this.sourceSet.getProcessResourcesTaskName());
|
dependsOn((Callable<String>) () -> this.sourceSet.getProcessResourcesTaskName());
|
||||||
getProject().getConfigurations()
|
getProject().getConfigurations()
|
||||||
.maybeCreate(AutoConfigurationPlugin.AUTO_CONFIGURATION_METADATA_CONFIGURATION_NAME);
|
.maybeCreate(AutoConfigurationPlugin.AUTO_CONFIGURATION_METADATA_CONFIGURATION_NAME);
|
||||||
|
this.moduleName = getProject().getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSourceSet(SourceSet sourceSet) {
|
public void setSourceSet(SourceSet sourceSet) {
|
||||||
@ -107,7 +110,7 @@ public class AutoConfigurationMetadata extends DefaultTask {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
autoConfiguration.setProperty("autoConfigurationClassNames", String.join(",", publicClassNames));
|
autoConfiguration.setProperty("autoConfigurationClassNames", String.join(",", publicClassNames));
|
||||||
autoConfiguration.setProperty("module", getProject().getName());
|
autoConfiguration.setProperty("module", this.moduleName);
|
||||||
return autoConfiguration;
|
return autoConfiguration;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user