Skip to content

Commit 22147ea

Browse files
authored
[MWRAPPER-135] Provide a reliable way to determine the Maven Wrapper type (#140)
Adds `distributionType` to `maven-wrapper.properties`. --- https://issues.apache.org/jira/browse/MWRAPPER-135
1 parent 0e0c740 commit 22147ea

File tree

7 files changed

+7
-0
lines changed

7 files changed

+7
-0
lines changed

maven-wrapper-plugin/src/it/projects/default/verify.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
3535
props.load(it)
3636
}
3737
assert props.wrapperVersion.equals(wrapperCurrentVersion)
38+
assert props.distributionType.equals("only-script")

maven-wrapper-plugin/src/it/projects/mavenversion/verify.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ propertiesFile.withInputStream {
3232
}
3333
assert props.wrapperVersion.equals(wrapperCurrentVersion)
3434
assert props.distributionUrl.endsWith('/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip')
35+
assert props.distributionType.equals("only-script")
3536

3637
log = new File(basedir, 'build.log').text
3738
// check "mvn wrapper:wrapper" output

maven-wrapper-plugin/src/it/projects/type_bin/verify.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
3636
props.load(it)
3737
}
3838
assert props.wrapperVersion.equals(wrapperCurrentVersion)
39+
assert props.distributionType.equals("bin")

maven-wrapper-plugin/src/it/projects/type_only-script/verify.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
4040
props.load(it)
4141
}
4242
assert props.wrapperVersion.equals(wrapperCurrentVersion)
43+
assert props.distributionType.equals("only-script")

maven-wrapper-plugin/src/it/projects/type_script/verify.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,4 @@ new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
4141
props.load(it)
4242
}
4343
assert props.wrapperVersion.equals(wrapperCurrentVersion)
44+
assert props.distributionType.equals("script")

maven-wrapper-plugin/src/it/projects/type_source/verify.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
3939
props.load(it)
4040
}
4141
assert props.wrapperVersion.equals(wrapperCurrentVersion)
42+
assert props.distributionType.equals("source")

maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ private void replaceProperties(String wrapperVersion, Path targetFolder) throws
288288
try (BufferedWriter out = Files.newBufferedWriter(wrapperPropertiesFile, StandardCharsets.UTF_8)) {
289289
out.append(String.format(Locale.ROOT, license));
290290
out.append("wrapperVersion=" + wrapperVersion + System.lineSeparator());
291+
out.append("distributionType=" + distributionType + System.lineSeparator());
291292
out.append("distributionUrl=" + distributionUrl + System.lineSeparator());
292293
if (distributionSha256Sum != null) {
293294
out.append("distributionSha256Sum=" + distributionSha256Sum + System.lineSeparator());

0 commit comments

Comments
 (0)