Skip to content

[MWRAPPER-120] - Wrapper Plugin no longer add wrapperUrl property #114

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
bdemers merged 1 commit into from
Feb 4, 2024
+11 −3
Merged

[MWRAPPER-120] - Wrapper Plugin no longer add wrapperUrl property #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion maven-wrapper-plugin/src/it/projects/type_only-script/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ assert new File(basedir,'mvnw').exists()
assert new File(basedir,'mvnw.cmd').exists()
assert !(new File(basedir,'mvnwDebug').exists())
assert !(new File(basedir,'mvnwDebug.cmd').exists())
assert new File(basedir,'.mvn/wrapper/maven-wrapper.properties').exists()

wrapperProperties = new File(basedir,'.mvn/wrapper/maven-wrapper.properties')
assert wrapperProperties.exists()
assert !wrapperProperties.text.contains('wrapperUrl')

log = new File(basedir, 'build.log').text
// check "mvn wrapper:wrapper" output
Expand Down
5 changes: 4 additions & 1 deletion maven-wrapper-plugin/src/it/projects/type_script/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ assert new File(basedir,'mvnw').exists()
assert new File(basedir,'mvnw.cmd').exists()
assert !(new File(basedir,'mvnwDebug').exists())
assert !(new File(basedir,'mvnwDebug.cmd').exists())
assert new File(basedir,'.mvn/wrapper/maven-wrapper.properties').exists()

wrapperProperties = new File(basedir,'.mvn/wrapper/maven-wrapper.properties')
assert wrapperProperties.exists()
assert wrapperProperties.text.contains('wrapperUrl')

log = new File(basedir, 'build.log').text
// check "mvn wrapper:wrapper" output
Expand Down
4 changes: 3 additions & 1 deletion maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,9 @@ private void replaceProperties(String wrapperVersion, Path targetFolder) throws
if (distributionSha256Sum != null) {
out.append("distributionSha256Sum=" + distributionSha256Sum + System.lineSeparator());
}
out.append("wrapperUrl=" + wrapperUrl + System.lineSeparator());
if (!distributionType.equals("only-script")) {
out.append("wrapperUrl=" + wrapperUrl + System.lineSeparator());
}
if (wrapperSha256Sum != null) {
out.append("wrapperSha256Sum=" + wrapperSha256Sum + System.lineSeparator());
}
Expand Down