Skip to content

Commit ae96646

Browse files
authored
Fix pom file naming after Gradle update (#2115)
- Fix pom file naming after Gradle update and fix another archiveName usage - also remove some deprecated api usage
1 parent 6912085 commit ae96646

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ import org.gradle.external.javadoc.JavadocOutputLevel
6262
import org.gradle.external.javadoc.MinimalJavadocOptions
6363
import org.gradle.plugins.ide.eclipse.EclipsePlugin
6464
import org.gradle.plugins.ide.idea.IdeaPlugin
65+
import org.gradle.api.plugins.BasePluginExtension
66+
6567
import org.w3c.dom.NodeList
6668

6769
import javax.inject.Inject
@@ -669,7 +671,8 @@ class BuildPlugin implements Plugin<Project> {
669671
// Set the pom's destination to the distribution directory
670672
project.tasks.withType(GenerateMavenPom).all { GenerateMavenPom pom ->
671673
if (pom.name == "generatePomFileFor${publication.name.capitalize()}Publication") {
672-
pom.destination = project.provider({"${project.buildDir}/distributions/${project.archivesBaseName}-${project.getVersion()}.pom"})
674+
BasePluginExtension baseExtension = project.getExtensions().getByType(BasePluginExtension.class);
675+
pom.destination = project.provider({"${project.buildDir}/distributions/${baseExtension.archivesName.get()}-${project.getVersion()}.pom"})
673676
}
674677
}
675678

@@ -728,7 +731,8 @@ class BuildPlugin implements Plugin<Project> {
728731
private static void updateVariantPomLocationAndArtifactId(Project project, MavenPublication publication, SparkVariant variant) {
729732
// Add variant classifier to the pom file name if required
730733
String classifier = variant.shouldClassifySparkVersion() && variant.isDefaultVariant() == false ? "-${variant.getName()}" : ''
731-
String filename = "${project.base.archivesName}_${variant.scalaMajorVersion}-${project.getVersion()}${classifier}"
734+
BasePluginExtension baseExtension = project.getExtensions().getByType(BasePluginExtension.class);
735+
String filename = "${baseExtension.archivesName.get()}_${variant.scalaMajorVersion}-${project.getVersion()}${classifier}"
732736
// Fix the pom name
733737
project.tasks.withType(GenerateMavenPom).all { GenerateMavenPom pom ->
734738
if (pom.name == "generatePomFileFor${publication.name.capitalize()}Publication") {
@@ -739,7 +743,7 @@ class BuildPlugin implements Plugin<Project> {
739743
publication.getPom().withXml { XmlProvider xml ->
740744
Node root = xml.asNode()
741745
Node artifactId = (root.get('artifactId') as NodeList).get(0) as Node
742-
artifactId.setValue("${project.archivesBaseName}_${variant.scalaMajorVersion}")
746+
artifactId.setValue("${baseExtension.archivesName.get()}_${variant.scalaMajorVersion}")
743747
}
744748
}
745749

dist/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import org.elasticsearch.hadoop.gradle.buildtools.ConcatFilesTask
22
import org.elasticsearch.hadoop.gradle.buildtools.DependenciesInfoTask
33
import org.elasticsearch.hadoop.gradle.buildtools.DependencyLicensesTask
44
import org.elasticsearch.hadoop.gradle.BuildPlugin
5+
import org.gradle.api.plugins.BasePluginExtension
56

67
apply plugin: 'es.hadoop.build'
78

@@ -142,9 +143,10 @@ publishing {
142143
Node repository = repositories.appendNode('repository')
143144
repository.appendNode('id', 'clojars.org')
144145
repository.appendNode('url', 'https://clojars.org/repo')
146+
BasePluginExtension baseExtension = project.getExtensions().getByType(BasePluginExtension.class)
145147

146148
// Correct the artifact Id, otherwise it is listed as 'dist'
147-
root.get('artifactId').get(0).setValue(project.archivesBaseName)
149+
root.get('artifactId').get(0).setValue(baseExtension.archivesName.get())
148150
}
149151
}
150152
}

0 commit comments

Comments
 (0)