Skip to content

Fix pom file naming after Gradle update #2115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 8, 2023
Merged

Fix pom file naming after Gradle update #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7168f95
Fix pom file naming after Gradle update
breskeby Aug 8, 2023
33aba19
Fix another archiveName usage
breskeby Aug 8, 2023
916c721
Some cleanup; Use type
breskeby Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ import org.gradle.external.javadoc.JavadocOutputLevel
import org.gradle.external.javadoc.MinimalJavadocOptions
import org.gradle.plugins.ide.eclipse.EclipsePlugin
import org.gradle.plugins.ide.idea.IdeaPlugin
import org.gradle.api.plugins.BasePluginExtension

import org.w3c.dom.NodeList

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

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

Expand Down
4 changes: 3 additions & 1 deletion dist/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import org.elasticsearch.hadoop.gradle.buildtools.ConcatFilesTask
import org.elasticsearch.hadoop.gradle.buildtools.DependenciesInfoTask
import org.elasticsearch.hadoop.gradle.buildtools.DependencyLicensesTask
import org.elasticsearch.hadoop.gradle.BuildPlugin
import org.gradle.api.plugins.BasePluginExtension

apply plugin: 'es.hadoop.build'

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

// Correct the artifact Id, otherwise it is listed as 'dist'
root.get('artifactId').get(0).setValue(project.archivesBaseName)
root.get('artifactId').get(0).setValue(baseExtension.archivesName.get())
}
}
}
Expand Down