Skip to content

Commit

Permalink
JENKINS-56666 file name is ".git-versioned-pom.xml", not ".git-versio…
Browse files Browse the repository at this point in the history
…ned.pom.xml"
  • Loading branch information
cyrille-leclerc authored and Cyrille Le Clerc committed May 19, 2019
1 parent afde946 commit bf3adff
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@ public Xpp3Dom newElement(@Nonnull String name, @Nullable final MavenProject pro
// JENKINS-42302: maven-shade-plugin creates a temporary project file dependency-reduced-pom.xml
// TODO see if there is a better way to implement this "workaround"
absolutePath = absolutePath.replace(File.separator + "dependency-reduced-pom.xml", File.separator + "pom.xml");
} else if (absolutePath.endsWith(File.separator + ".git-versioned.pom.xml")) {
// JENKINS-56666 maven-git-versioning-extension causes warnings due to temporary pom.xml file name '.git-versioned.pom.xml'
} else if (absolutePath.endsWith(File.separator + ".git-versioned-pom.xml")) {
// JENKINS-56666 maven-git-versioning-extension causes warnings due to temporary pom.xml file name '.git-versioned-pom.xml'
// https://github.com/qoomon/maven-git-versioning-extension/blob/v4.1.0/src/main/java/me/qoomon/maven/gitversioning/VersioningMojo.java#L39
// TODO see if there is a better way to implement this "workaround"
absolutePath = absolutePath.replace(File.separator + ".git-versioned.pom.xml", File.separator + "pom.xml");
absolutePath = absolutePath.replace(File.separator + ".git-versioned-pom.xml", File.separator + "pom.xml");
} else {
String flattenedPomFilename = getMavenFlattenPluginFlattenedPomFilename(project);
if (flattenedPomFilename == null) {
Expand Down

0 comments on commit bf3adff

Please sign in to comment.