You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2021/12/19 22:02:22 UTC
[maven-wrapper] branch master updated: [MWRAPPER-40] Fix line separators in wrapper properties file
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git
The following commit(s) were added to refs/heads/master by this push:
new 0cc43ce [MWRAPPER-40] Fix line separators in wrapper properties file
0cc43ce is described below
commit 0cc43ce3aeeea11a89db0eb2f830264efebba391
Author: Jorge Solórzano <jo...@gmail.com>
AuthorDate: Sun Dec 19 15:12:31 2021 +0100
[MWRAPPER-40] Fix line separators in wrapper properties file
Signed-off-by: Jorge Solórzano <jo...@gmail.com>
---
.../apache/maven/plugins/wrapper/WrapperMojo.java | 35 +++++++++++-----------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java b/maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java
index 5a219b4..e6fcfad 100644
--- a/maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java
+++ b/maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java
@@ -27,6 +27,7 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.Locale;
import java.util.Map;
import java.util.Properties;
@@ -233,26 +234,26 @@ public class WrapperMojo extends AbstractMojo
getLog().info( "Configuring .mvn/wrapper/maven-wrapper.properties to use "
+ buffer().strong( "Maven " + mavenVersion ) + " and download from " + repoUrl );
- final String license = "# Licensed to the Apache Software Foundation (ASF) under one\n"
- + "# or more contributor license agreements. See the NOTICE file\n"
- + "# distributed with this work for additional information\n"
- + "# regarding copyright ownership. The ASF licenses this file\n"
- + "# to you under the Apache License, Version 2.0 (the\n"
- + "# \"License\"); you may not use this file except in compliance\n"
- + "# with the License. You may obtain a copy of the License at\n"
- + "# \n"
- + "# http://www.apache.org/licenses/LICENSE-2.0\n"
- + "# \n"
- + "# Unless required by applicable law or agreed to in writing,\n"
- + "# software distributed under the License is distributed on an\n"
- + "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
- + "# KIND, either express or implied. See the License for the\n"
- + "# specific language governing permissions and limitations\n"
- + "# under the License.\n";
+ final String license = "# Licensed to the Apache Software Foundation (ASF) under one%n"
+ + "# or more contributor license agreements. See the NOTICE file%n"
+ + "# distributed with this work for additional information%n"
+ + "# regarding copyright ownership. The ASF licenses this file%n"
+ + "# to you under the Apache License, Version 2.0 (the%n"
+ + "# \"License\"); you may not use this file except in compliance%n"
+ + "# with the License. You may obtain a copy of the License at%n"
+ + "#%n"
+ + "# https://www.apache.org/licenses/LICENSE-2.0%n"
+ + "#%n"
+ + "# Unless required by applicable law or agreed to in writing,%n"
+ + "# software distributed under the License is distributed on an%n"
+ + "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY%n"
+ + "# KIND, either express or implied. See the License for the%n"
+ + "# specific language governing permissions and limitations%n"
+ + "# under the License.%n";
try ( BufferedWriter out = Files.newBufferedWriter( wrapperPropertiesFile, StandardCharsets.UTF_8 ) )
{
- out.append( license );
+ out.append( String.format( Locale.ROOT, license ) );
out.append( "distributionUrl=" + distributionUrl + System.lineSeparator() );
out.append( "wrapperUrl=" + wrapperUrl + System.lineSeparator() );
}