Skip to content

Commit e598cef

Browse files
committed
Tweak backport of #32180 for 6.3
This commit fixes the build for 6.3 after the backport of #32180. First, the meta plugin build no longer needed to call zip pom generation. Second, pom generation for the jar needs to only happen when not building a client jar, because gradle versions before 4.9 get confused with multiple versions of the same artifact (see #32195).
1 parent f57a998 commit e598cef

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/MetaPluginBuildPlugin.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class MetaPluginBuildPlugin implements Plugin<Project> {
4545
}
4646
BuildPlugin.configurePomGeneration(project)
4747
project.afterEvaluate {
48-
PluginBuildPlugin.addZipPomGeneration(project)
4948
if (isModule) {
5049
if (project.integTestCluster.distribution == 'integ-test-zip') {
5150
project.integTestCluster.module(project)

buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,11 @@ public class PluginBuildPlugin extends BuildPlugin {
6161
// and generate a different pom for the zip
6262
addClientJarPomGeneration(project)
6363
addClientJarTask(project)
64+
} else {
65+
// while the jar isn't normally published, we still at least build a pom of deps
66+
// in case it is published, for instance when other plugins extend this plugin
67+
configureJarPom(project)
6468
}
65-
// while the jar isn't normally published, we still at least build a pom of deps
66-
// in case it is published, for instance when other plugins extend this plugin
67-
configureJarPom(project)
6869

6970
project.integTestCluster.dependsOn(project.bundlePlugin)
7071
project.tasks.run.dependsOn(project.bundlePlugin)

0 commit comments

Comments
 (0)