Skip to content

Commit 820f9a7

Browse files
committed
fix for GRAILS-9939 "Transitive JAR dependencies of in-place plugins not found"
1 parent e1885c2 commit 820f9a7

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,12 +1320,13 @@ class BuildSettings extends AbstractBuildSettings {
13201320
// The logic here tries to establish if the plugin has been declared anywhere by the application. Only plugins that have
13211321
// been declared should have their transitive dependencies resolved. Unfortunately it is fairly complicated to establish what plugins are declared since
13221322
// there may be a mixture of plugins defined in BuildConfig, inline plugins and plugins installed via install-plugin
1323-
if (!isRegisteredInMetadata(pluginName) && notDefinedInBuildConfig(pluginName) && !isInlinePluginLocation(dir)) {
1323+
final isInline = isInlinePluginLocation(dir)
1324+
if (!isRegisteredInMetadata(pluginName) && notDefinedInBuildConfig(pluginName) && !isInline) {
13241325
return
13251326
}
13261327

13271328
def pdd = dependencyManager.getPluginDependencyDescriptor(pluginName)
1328-
if (isInlinePluginLocation(dir) || (pdd && pdd.transitive)) {
1329+
if (isInline || (pdd && pdd.transitive)) {
13291330
// bail out of the dependencies handled by external tool
13301331
if (isDependenciesExternallyConfigured()) return
13311332
// Try BuildConfig.groovy first, which should work
@@ -1345,7 +1346,7 @@ class BuildSettings extends AbstractBuildSettings {
13451346
Script script = gcl.parseClass(pluginDependencyDescriptor)?.newInstance()
13461347
def pluginConfig = pluginSlurper.parse(script)
13471348

1348-
if(dependencyManager.isLegacyResolve()) {
1349+
if(dependencyManager.isLegacyResolve() || isInline) {
13491350
def pluginDependencyConfig = pluginConfig.grails.project.dependency.resolution
13501351
if (pluginDependencyConfig instanceof Closure) {
13511352
def excludeRules = pdd ? pdd.getExcludeRules(dependencyManager.configurationNames) : [] as ExcludeRule[]

0 commit comments

Comments
 (0)