Skip to content

Commit 841d9c8

Browse files
committed
mega-melt: simplify parent POM adjustment logic
We don't need to 'mvn install' anything. And it is better not to, to avoid corrupting the maven-metadata-local.xml.
1 parent 090df66 commit 841d9c8

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

tests/mega-melt-template.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<groupId>org.scijava</groupId>
66
<artifactId>pom-scijava</artifactId>
77
<version>999-mega-melt</version>
8-
<relativePath />
98
</parent>
109
<artifactId>mega-melt</artifactId>
1110
<version>0-SNAPSHOT</version>

tests/run.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ generateMegaMeltScript="$dir/generate-mega-melt.py"
3838
filterBuildLogScript="$dir/filter-build-log.py"
3939

4040
megaMeltDir="$dir/../target/mega-melt"
41+
pomParent="$megaMeltDir/../pom.xml"
4142
versionSwapLog="$megaMeltDir/version-swap.log"
4243
dependencyTreeLog="$megaMeltDir/dependency-tree.log"
4344
validationLog="$megaMeltDir/validation.log"
@@ -48,10 +49,9 @@ meltingPotScript="$megaMeltDir/melting-pot.sh"
4849
meltingPotDir="$megaMeltDir/melting-pot"
4950

5051
rm -rf "$megaMeltDir" && mkdir -p "$megaMeltDir" || die "Creation of $megaMeltDir failed!"
51-
mvn -B -f "$pom" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" &&
52-
mvn -B -f "$pom" install >> "$versionSwapLog" ||
53-
die "pom-scijava version swap failed:\n$(cat "$versionSwapLog")"
54-
mv -f "$pom.versionsBackup" "$pom" || die 'POM restoration failed!'
52+
cp "$pom" "$pomParent" &&
53+
mvn -B -f "$pomParent" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" ||
54+
die "pom-scijava version update failed:\n$(cat "$versionSwapLog")"
5555
python "$generateMegaMeltScript" "$megaMeltDir" || die 'Generation failed!'
5656
echo 'Done!'
5757

0 commit comments

Comments
 (0)