Skip to content

Normalization: Ensure end of file markers per git standards and tabs as spaces #361

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Normalization: Ensure end of file markers per git standards and tabs as spaces #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e49d4e
Tabs to spaces
hazendaz Aug 3, 2025
41690b7
[eol] Fix end of file markers
hazendaz Aug 26, 2025
4740639
Remove space before END to correct syntax error
hazendaz Aug 30, 2025
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
12 changes: 6 additions & 6 deletions maven-wrapper-distribution/src/resources/mvnw.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@ if exist %WRAPPER_JAR% (
)

powershell -Command "&{"^
"$webclient = new-object System.Net.WebClient;"^
"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
"}"^
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
"}"
"$webclient = new-object System.Net.WebClient;"^
"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
"}"^
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
"}"
if "%MVNW_VERBOSE%" == "true" (
echo Finished downloading %WRAPPER_JAR%
)
Expand Down
26 changes: 13 additions & 13 deletions maven-wrapper-distribution/src/resources/only-mvnw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,19 +202,19 @@ elif set_java_home; then
javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
cat >"$javaSource" <<-END
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we use <<END as we don't have a tabs now?

public class Downloader extends java.net.Authenticator
{
protected java.net.PasswordAuthentication getPasswordAuthentication()
{
return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
}
public static void main( String[] args ) throws Exception
{
setDefault( new Downloader() );
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
}
}
END
public class Downloader extends java.net.Authenticator
{
protected java.net.PasswordAuthentication getPasswordAuthentication()
{
return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
}
public static void main( String[] args ) throws Exception
{
setDefault( new Downloader() );
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
}
}
END
# For Cygwin/MinGW, switch paths to Windows format before running javac and java
verbose " - Compiling Downloader.java ..."
"$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
Expand Down
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/default/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ under the License.
</properties>
</profile>
</profiles>
</project>
</project>
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/includeDebug/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ under the License.
</properties>
</profile>
</profiles>
</project>
</project>
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/includeDebug/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

includeDebug=true
includeDebug=true
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/mavenversion/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ under the License.
</properties>
</profile>
</profiles>
</project>
</project>
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/mavenversion/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

maven=3.6.3
maven=3.6.3
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/sha256_distribution/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@

alwaysUnpack=true
type=bin
distributionSha256Sum=7e0c63c6a99639e57cc64375d6717d72e301d8ab829fef2e145ee860317bc3cb
distributionSha256Sum=7e0c63c6a99639e57cc64375d6717d72e301d8ab829fef2e145ee860317bc3cb
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/sha256_type_only-script/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# under the License.

type=only-script
distributionSha256Sum=7e0c63c6a99639e57cc64375d6717d72e301d8ab829fef2e145ee860317bc3cb
distributionSha256Sum=7e0c63c6a99639e57cc64375d6717d72e301d8ab829fef2e145ee860317bc3cb
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/sha256_wrapper/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# under the License.

type=bin
wrapperSha256Sum=7e0c63c6a99639e57cc64375d6717d72e301d8ab829fef2e145ee860317bc3cb
wrapperSha256Sum=7e0c63c6a99639e57cc64375d6717d72e301d8ab829fef2e145ee860317bc3cb
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/type_bin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ under the License.
</properties>
</profile>
</profiles>
</project>
</project>
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/type_bin/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

type=bin
type=bin
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/type_only-script-fail/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# under the License.

type=only-script
maven=0.0.0
maven=0.0.0
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/type_script/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ under the License.
</properties>
</profile>
</profiles>
</project>
</project>
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/type_script/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

type=script
type=script
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/type_source/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ under the License.
</properties>
</profile>
</profiles>
</project>
</project>
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/type_source/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

type=source
type=source
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/type_unknown/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ under the License.
<artifactId>extension</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
</project>
2 changes: 1 addition & 1 deletion ...r-plugin/src/it/projects/upgrade_with_existing_type/.mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
distributionType=bin
wrapperVersion=3.3.1
wrapperVersion=3.3.1
2 changes: 1 addition & 1 deletion maven-wrapper-plugin/src/it/projects/upgrade_with_existing_type/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ under the License.
</properties>
</profile>
</profiles>
</project>
</project>
2 changes: 1 addition & 1 deletion src/site/markdown/CHANGELOG.old.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ at an easier glance.
- fixes https://github.com/takari/maven-wrapper/issues/109
- see https://github.com/takari/maven-wrapper/pull/111
- contributed by Piotrek Żygieło https://github.com/pzygielo and
Sebastian Peters https://github.com/sepe81,
Sebastian Peters https://github.com/sepe81,

Release performed by Manfred Moser - http://www.simpligility.com

Expand Down
2 changes: 1 addition & 1 deletion src/site/resources/download.cgi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
#
# Just call the standard mirrors.cgi script. It will use download.html
# as the input template.
exec /www/www.apache.org/dyn/mirrors/mirrors.cgi $*
exec /www/www.apache.org/dyn/mirrors/mirrors.cgi $*
Loading