You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/05/23 08:00:08 UTC
[maven] branch master updated (5397fb6 -> 35e05e4)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git.
from 5397fb6 [MNG-6873] Align JUnit version to 4.13
new df3fdc9 A copy of the gradle wrapper ported for use with maven Lightly touched to better mesh with current maven builds. (some of which my not have been necessary in hind sight)
new e210666 Adding simple README
new 1457a7b correcting README formatting
new 3b0965d Update properties file to point to maven 3.2.3
new 2f07f99 Update to Maven 3.3.1 which resides in Maven Central
new ff3e114 Formatting
new 5deb2a6 Make sure the maven.multiModuleProjectDirectory envar is set for proper 3.3.1+ execution
new 821bed1 Update the wrapper jar
new 7bd4364 Use the now standard .mvn directory
new 5d40b53 Use the Maven 3.3.1 startup scripts to account for jvm.config and maven.config
new d1bfe96 Use provisio packaging to produce an archive that can be deployed for use in a Maven plugin
new 5457a1b Use a released version of provisio
new 9fdaf2f [maven-release-plugin] prepare release maven-wrapper-0.1.0
new 03bc10d [maven-release-plugin] prepare for next development iteration
new fcd0a69 Update location for searching for the version
new c830673 [maven-release-plugin] prepare release maven-wrapper-0.1.1
new 0180586 [maven-release-plugin] prepare for next development iteration
new 5093817 Update properties path Whatever
new 580d9be [maven-release-plugin] prepare release maven-wrapper-0.1.2
new 5994302 [maven-release-plugin] prepare for next development iteration
new 70d1052 Update the README.md with instructions
new 7709755 Fix a few typos
new 36149e9 Add a note about using the windows script
new 0aabf3e Fix typo
new 040d343 Remove some unused parts of the windows scripts and rename them to .cmd
new f4b4547 Add license file
new a1b3a7b Add license stanza to POM
new cbb5886 Fix while loop so that basedir is detected in current dir
new c35e352 Correct name of Windows script in README
new 307de3d super-mega minor typo
new ec3d0cc Align Un*x and Windows scripts to both use MAVEN_CONFIG consistently
new 53eff03 Use basedir location instead of "." to locate wrapper jar
new 0fd5540 [maven-release-plugin] prepare release maven-wrapper-0.1.3
new f75e301 [maven-release-plugin] prepare for next development iteration
new 98b6027 Use working files to create wrapper jar
new 5eeb65c [maven-release-plugin] prepare release maven-wrapper-0.1.4
new 4737137 [maven-release-plugin] prepare for next development iteration
new 2d3acb1 Use org.apache.ant
new 7aacf41 Fix typo
new 7fa99bc handle MAVEN_PROJECTBASEDIR correctly in cygwin
new 295826d avoid using MAVEN_CMD_LINE_ARGS for invocation since that can losse parameter escaping
new 6c57c4c Remove whitespace (#22)
new a13b42e Update to release version of parent
new 2d8f4c5 use @REM instead of # (#27)
new 79440c9 Update release version
new 8a6480c Use Apple-recommended strategy for locating JAVA_HOME. This works correctly with both Oracle and Apple JDKs.
new 75a200a upped version to new snapshot since 0.1.6 is already on central
new 022fedb Be defensive about creating directories for files
new d3b3473 Fix path escaping
new 6d30420 remove unused MAVEN_CMD_LINE_ARGS
new bf50858 adding changelog
new 2ccae98 Quote paths in commands
new f2f1887 one more PR merge and changelog update
new ddf2786 upgraded provisio maven plugin
new a3706dc updated to 0.2.0-SNAPSHOT as version due to number of changes
new 55ee1e4 updated parent to latest release
new 3aeabdc updated wrapper maven version to 3.3.9
new 54b2282 fix to avoid usage of stale maven wrapper jar
new 4235271 changelog updates
new fa9b9ab support spaces in folder names on nix, simplified from https://github.com/takari/maven-wrapper/pull/25
new 437912b added changelog entry about spaces fix
new 449d0c7 updated wrapper maven version to 3.5.0
new feac8c6 Add .DS_Store to .gitignore
new 92e3454 Upgraded default Maven version to 3.5.0
new f530a7f ammeded changelog
new fc9c774 added note about dash testing
new 79fc2f2 Use of bashisms make this script fail in minimal /bin/sh implementations like dash
new feb3731 upgraded parent
new afbc151 fixing issue on Solaris
new a23522d added section about supported systems
new b0b56ae solaris support changelog entry and release date
new c64b0f1 [maven-release-plugin] prepare release maven-wrapper-0.2.0
new d104930 [maven-release-plugin] prepare for next development iteration
new 557c8f9 improved wording on supported systems
new ab9742e Make artifact compatible with older Java
new c6b60b2 Ignore IntelliJ files
new 1b903e7 added doc about Java version
new 348ee53 added changelog entry for java 1.5 change and release
new d3a389b [maven-release-plugin] prepare release maven-wrapper-0.2.1
new 8ab08b8 [maven-release-plugin] prepare for next development iteration
new eae4779 fixed version in changelog
new 567fccc formatting, added update via plugin
new 2d87f1f Print out maven wrapper version at every invocation
new 83d12ec added changelog entry, added Takari to output
new e161356 Fix typo
new 578496f words are missing - I think this is what you mean...
new a71bd82 cleaned up version output
new 020545b added verbose mode activated with MVNW_VERBOSE set to true
new 19f375f [maven-release-plugin] prepare release maven-wrapper-0.2.2
new 67640d4 [maven-release-plugin] prepare for next development iteration
new 179ee30 updated wrapper jar
new 8fc916c Fix NPE due to missing MVNW_VERBOSE
new c60c49d update info on wrapper
new a0e1c2f [maven-release-plugin] prepare release maven-wrapper-0.2.3
new 8b57037 [maven-release-plugin] prepare for next development iteration
new 8641c05 wrapper file upgrade
new 4d3985c set title of command window
new 68e102a respect MVNW_VERBOSE when printing diagnostic stuff
new 18e3d3e fix to actually read the environment variable value
new d841301 set to new maven version
new 6da17a7 added recent pr merges
new 958418a upped version
new 3dea57b [pom] Use empty relativePath
new 0a7111f [pom] Update junit to 4.12
new 89e610d [pom] Update mockito-core to 2.8.47
new f5d20ba [pom] Update commons-io to 2.5
new a25a535 [pom] Update ant to 1.9.9
new 635e53e [pom] Update provision-maven-plugin to 0.1.50
new 9e3ce6e removed redundant empty element
new de9d996 added warning about issues found from provisio upgrade
new 638f527 much less verbose progress reporting since it is now a new line each
new b05b99a added chunk size change
new a38c44e added chunk size change
new 190eb35 [maven-release-plugin] prepare release maven-wrapper-0.3.0
new 91dcd24 [maven-release-plugin] prepare for next development iteration
new 1a920c7 - Added an initial version of an auto-downloader for the maven-wrapper.jar
new a3787b7 Cleaned up the code a little to not exit with 0 in case of an error.
new d14aa05 - Made the script use curl or wget if available and fallback to java in case none of them are. - Moved the Java source code to the filesystem.
new 5aa0e6f - Added a download extension for windows
new 50dcbb3 - Added Apache header to the downloader java class
new 87f2983 - Changed the curl and wget detection to the "possix way" using "command"
new a0dfc3e - Changed the wget command to use "-O" instead of "--output-document="
new 34c91b3 - Made the wrapperUrl configurable from the maven-wrapper.properties file - Updated and tested the linux/unix/mac version of the script - Updated and tested the Java downloader - Updated the windows cmd (but not tested yet)
new 661e471 Fixed the windows version of the script
new e4986f6 Removed a hack to force the script to use curl or wget ...
new 75698b0 Updated the download url to the https version
new d7ddce2 Updated to the latest maven-wrapper version.
new 7c3e488 updated to wrapper jar 0.3.0
new ed6d2b4 updated version
new fafe416 added user doc for no jar approach
new 89b4de7 added author creds
new 9a162b5 introduced intermediary var for path to jar since it didnt work without that in bash
new 51e7e64 changed URL to official maven repo URL
new f41375b added note about URL change
new e77b971 adapted to honor the MVNW_VERBOSE flag
new 8f86510 dev and release help
new d6d69f8 updated to new wrapper version in default URLs
new f161035 added release date to changelog
new d4a3342 [maven-release-plugin] prepare release maven-wrapper-0.4.0
new e90950c [maven-release-plugin] prepare for next development iteration
new c4cc2d3 notes for next relase
new c5d75a1 added link to fixed issue
new 276169f updated to latest parent
new ebb8ba4 spelling fix
new d5b4f7c update to Maven 3.5.4 as default
new e4556f5 ant and commons-io upgrades
new 9a165c1 added changes
new 7ee971e updated static files to point to 0.4.1 release
new 18069f7 [maven-release-plugin] prepare release maven-wrapper-0.4.1
new 13d02a8 [maven-release-plugin] prepare for next development iteration
new 2e9c45d added wrapper version in cmd
new 4976f68 updated to wrapper 0.4.2 in prep of new release
new d1d9e3f [maven-release-plugin] prepare release maven-wrapper-0.4.2
new 736646b [maven-release-plugin] prepare for next development iteration
new 02423e8 Fixed typos
new 42ca0a3 Removed todo comment
new b9e6795 Download maven wrapper with authentication if availble
new ed08eab Download using authentication with properties
new 8c37106 Update README.md
new 46f52ba Added macOS as name
new 2643996 updated to Maven 3.6.0, also in plugin
new 68042bb On Windows, use TLS 1.2
new f45eac2 fix compile path for cygwin
new 60668e7 fix wrapper path for cygwin
new 48a9ff3 added recently merged PRs
new 0b08500 add info about using MAVEN_USER_HOME
new 83f577c Update referenced Maven version to 3.6.0
new 12892d3 use quoted string for filepath
new d395ca4 add basic auth support
new 790be24 use MVNW_USER and MVNW_PASSWORD instead of system properties
new e09456d use warning instead of info
new 002f677 remove unintended line
new 618162a added recent merged PRs
new 95dcd2f consistent usage of MVNW_USERNAME and MVWN_PASSWORD
new 8c76743 version update to 0.5.0-SNAPSHOT for next release
new e3ed336 License header cleanup (#105)
new 5528ca7 added pr and issue links
new fa8c70a better instructions for dev and test
new ac2b048 fixed test install command
new 5bbacca added debug flag for testing help
new f81d067 add repo manager usage docs, dev doc updates
new 67e12c5 usage of MVNW_REPOURL for wrapper download
new 94964ce MVN_REPOURL env var usage for Maven binary download
new 9213ff2 updated everything to version 0.5.0
new c89fe4f [maven-release-plugin] prepare release maven-wrapper-0.5.0
new 0e33a4f [maven-release-plugin] prepare for next development iteration
new 5f65c12 Windows note
new 0fe726f typo fix
new d011e4d MVNW_REPOURL parsing fix for mvnw.cmd (#107)
new 3c84a93 style improvement
new 7bb1083 prep for 0.5.1 release
new a37120e [maven-release-plugin] prepare release maven-wrapper-0.5.1
new 1f08e11 [maven-release-plugin] prepare for next development iteration
new b65c86d On Windows, use TLS 1.2
new 5f7d4ca prep for 0.5.2 release
new f15eb8b [maven-release-plugin] prepare release maven-wrapper-0.5.2
new 270c79f [maven-release-plugin] prepare for next development iteration
new af829f1 Add missing required space between 'true' and ']'
new 5762f9d usage of MVNW_REPOURL for wrapper download
new 7d5f452 resolved
new d27cdcc title fix
new fafaf24 [maven-release-plugin] prepare release maven-wrapper-0.5.3
new 7686307 [maven-release-plugin] prepare for next development iteration
new 193facc Added version to default usage
new 76c9c96 Adapt mvnw.cmd to also honour MVNW_VERBOSE
new 90b355c Added recent changes
new c584815 Provide a 'standardized' way to retrieve CLI arguments
new 49c5d41 Updated with recent changes
new 26ff1f4 updated changelog and docs for dev to fix #78
new a3977ad prepped for 0.5.4 release
new c733e0d prepped for 0.5.4 release
new 8272ee7 [maven-release-plugin] prepare release maven-wrapper-0.5.4
new f8c5329 [maven-release-plugin] prepare for next development iteration
new 12ca3ea update to new release
new 28d874a removed wrong space in jar download URL
new 2f7cfda update to Maven 3.6.1
new 067d997 update to default to Maven 3.6.1
new ebc21d6 update for 0.5.5 release
new e70acda [maven-release-plugin] prepare release maven-wrapper-0.5.5
new 9ef2ddb [maven-release-plugin] prepare for next development iteration
new b8790bb update to latest release
new d972c26 source format only
new cccd8b0 more details about what happens for users
new fb42fa9 Corrects the false Maven2 reference in the startup scripts (#121)
new eeda12a Remove trailing whitespace
new f424d6f Fix typo
new ee6d5bd Update to Maven 3.6.3
new 49d28e3 Update for 0.5.6 release
new b011766 [maven-release-plugin] prepare release maven-wrapper-0.5.6
new d1935f2 [maven-release-plugin] prepare for next development iteration
new 3730fb3 [MNG-5937] Fix licenses, removed unwanted root files
new 738d99b [MNG-5937] Split wrapper jar from assemblies Remove unused cli package Reformat code
new 9cc3638 [MNG-5937] Optimize code for Java 8
new cdcd351 [MNG-5937] Adjust JenkinsFile to pick up wrapper dists Improve assembly
new 35e05e4 [MNG-6914] Align mvn and mvnw scripts
The 235 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 21 +-
apache-maven/maven-wrapper.pom | 139 +++++++++++++
apache-maven/pom.xml | 27 ++-
.../src/{main/assembly => assembly/maven}/bin.xml | 2 +-
.../src/{ => assembly/maven}/bin/.gitattributes | 0
apache-maven/src/{ => assembly/maven}/bin/m2.conf | 0
apache-maven/src/{ => assembly/maven}/bin/mvnDebug | 0
.../src/{ => assembly/maven}/bin/mvnDebug.cmd | 0
apache-maven/src/{ => assembly/maven}/bin/mvnyjp | 0
.../assembly => assembly/maven}/component.xml | 42 +++-
.../maven}/conf/logging/simplelogger.properties | 0
.../src/{ => assembly/maven}/conf/settings.xml | 0
.../src/{ => assembly/maven}/conf/toolchains.xml | 0
.../src/{main/assembly => assembly/maven}/dir.xml | 2 +-
.../src/{ => assembly/maven}/lib/ext/README.txt | 0
.../maven}/lib/jansi-native/README.txt | 0
.../src/{main/assembly => assembly/maven}/src.xml | 0
apache-maven/src/assembly/shared/init | 128 ++++++++++++
apache-maven/src/assembly/shared/init.cmd | 97 +++++++++
apache-maven/src/assembly/shared/mvnlauncher | 4 +
apache-maven/src/assembly/shared/mvnlauncher.cmd | 4 +
apache-maven/src/assembly/shared/mvnvalidate | 23 +++
apache-maven/src/assembly/shared/mvnvalidate.cmd | 8 +
.../{bin/mvnDebug => assembly/shared/mvnwDebug} | 4 +-
.../mvnDebug.cmd => assembly/shared/mvnwDebug.cmd} | 2 +-
apache-maven/src/assembly/shared/mvnwlauncher | 4 +
apache-maven/src/assembly/shared/mvnwlauncher.cmd | 4 +
apache-maven/src/assembly/shared/run | 22 ++
apache-maven/src/assembly/shared/run.cmd | 29 +++
.../src/{bin/mvnyjp => assembly/shared/validate} | 42 +++-
.../mvnDebug.cmd => assembly/shared/validate.cmd} | 36 +++-
apache-maven/src/assembly/wrapper/bin.xml | 89 ++++++++
apache-maven/src/assembly/wrapper/script.xml | 81 ++++++++
apache-maven/src/assembly/wrapper/script/download | 55 +++++
.../src/assembly/wrapper/script/download.cmd | 36 ++++
.../shared/.mvn/wrapper/maven-wrapper.properties | 8 +-
apache-maven/src/assembly/wrapper/source.xml | 89 ++++++++
.../.mvn/wrapper/MavenWrapperDownloader.java | 131 ++++++++++++
apache-maven/src/assembly/wrapper/source/download | 34 ++++
.../src/assembly/wrapper/source/download.cmd | 21 ++
apache-maven/src/bin/mvn | 199 ------------------
apache-maven/src/bin/mvn.cmd | 201 ------------------
.../apache/maven/settings/GlobalSettingsTest.java | 2 +-
{maven-slf4j-wrapper => maven-wrapper}/pom.xml | 42 +++-
.../apache/maven/wrapper/BootstrapMainStarter.java | 59 ++++++
.../apache/maven/wrapper/DefaultDownloader.java | 192 +++++++++++++++++
.../java/org/apache/maven/wrapper/Downloader.java | 52 +++++
.../java/org/apache/maven/wrapper/Installer.java | 226 +++++++++++++++++++++
.../main/java/org/apache/maven/wrapper/Logger.java | 23 +--
.../org/apache/maven/wrapper/MavenWrapperMain.java | 123 +++++++++++
.../org/apache/maven/wrapper/PathAssembler.java | 131 ++++++++++++
.../apache/maven/wrapper/WrapperConfiguration.java | 116 +++++++++++
.../org/apache/maven/wrapper/WrapperExecutor.java | 175 ++++++++++++++++
.../org/apache/maven/wrapper/DownloaderTest.java | 72 +++++++
.../org/apache/maven/wrapper/InstallerTest.java | 210 +++++++++++++++++++
.../apache/maven/wrapper/PathAssemblerTest.java | 120 +++++++++++
.../apache/maven/wrapper/WrapperExecutorTest.java | 207 +++++++++++++++++++
.../org/apache/maven/wrapper/wrapper.properties | 7 +-
pom.xml | 10 +-
59 files changed, 2890 insertions(+), 461 deletions(-)
create mode 100644 apache-maven/maven-wrapper.pom
rename apache-maven/src/{main/assembly => assembly/maven}/bin.xml (93%)
rename apache-maven/src/{ => assembly/maven}/bin/.gitattributes (100%)
rename apache-maven/src/{ => assembly/maven}/bin/m2.conf (100%)
copy apache-maven/src/{ => assembly/maven}/bin/mvnDebug (100%)
mode change 100755 => 100644
copy apache-maven/src/{ => assembly/maven}/bin/mvnDebug.cmd (100%)
copy apache-maven/src/{ => assembly/maven}/bin/mvnyjp (100%)
mode change 100755 => 100644
rename apache-maven/src/{main/assembly => assembly/maven}/component.xml (70%)
rename apache-maven/src/{ => assembly/maven}/conf/logging/simplelogger.properties (100%)
rename apache-maven/src/{ => assembly/maven}/conf/settings.xml (100%)
rename apache-maven/src/{ => assembly/maven}/conf/toolchains.xml (100%)
rename apache-maven/src/{main/assembly => assembly/maven}/dir.xml (93%)
rename apache-maven/src/{ => assembly/maven}/lib/ext/README.txt (100%)
rename apache-maven/src/{ => assembly/maven}/lib/jansi-native/README.txt (100%)
rename apache-maven/src/{main/assembly => assembly/maven}/src.xml (100%)
create mode 100755 apache-maven/src/assembly/shared/init
create mode 100755 apache-maven/src/assembly/shared/init.cmd
create mode 100644 apache-maven/src/assembly/shared/mvnlauncher
create mode 100644 apache-maven/src/assembly/shared/mvnlauncher.cmd
create mode 100644 apache-maven/src/assembly/shared/mvnvalidate
create mode 100644 apache-maven/src/assembly/shared/mvnvalidate.cmd
rename apache-maven/src/{bin/mvnDebug => assembly/shared/mvnwDebug} (94%)
mode change 100755 => 100644
copy apache-maven/src/{bin/mvnDebug.cmd => assembly/shared/mvnwDebug.cmd} (98%)
create mode 100755 apache-maven/src/assembly/shared/mvnwlauncher
create mode 100755 apache-maven/src/assembly/shared/mvnwlauncher.cmd
create mode 100755 apache-maven/src/assembly/shared/run
create mode 100755 apache-maven/src/assembly/shared/run.cmd
rename apache-maven/src/{bin/mvnyjp => assembly/shared/validate} (58%)
mode change 100755 => 100644
rename apache-maven/src/{bin/mvnDebug.cmd => assembly/shared/validate.cmd} (58%)
create mode 100644 apache-maven/src/assembly/wrapper/bin.xml
create mode 100644 apache-maven/src/assembly/wrapper/script.xml
create mode 100755 apache-maven/src/assembly/wrapper/script/download
create mode 100755 apache-maven/src/assembly/wrapper/script/download.cmd
copy maven-core/src/test/resources/projects/build.properties => apache-maven/src/assembly/wrapper/shared/.mvn/wrapper/maven-wrapper.properties (73%)
create mode 100644 apache-maven/src/assembly/wrapper/source.xml
create mode 100644 apache-maven/src/assembly/wrapper/source/.mvn/wrapper/MavenWrapperDownloader.java
create mode 100644 apache-maven/src/assembly/wrapper/source/download
create mode 100644 apache-maven/src/assembly/wrapper/source/download.cmd
delete mode 100755 apache-maven/src/bin/mvn
delete mode 100644 apache-maven/src/bin/mvn.cmd
copy {maven-slf4j-wrapper => maven-wrapper}/pom.xml (57%)
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/DefaultDownloader.java
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/Downloader.java
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/Installer.java
copy maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java => maven-wrapper/src/main/java/org/apache/maven/wrapper/Logger.java (65%)
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/PathAssembler.java
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperConfiguration.java
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
create mode 100644 maven-wrapper/src/test/java/org/apache/maven/wrapper/DownloaderTest.java
create mode 100644 maven-wrapper/src/test/java/org/apache/maven/wrapper/InstallerTest.java
create mode 100644 maven-wrapper/src/test/java/org/apache/maven/wrapper/PathAssemblerTest.java
create mode 100644 maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
copy maven-core/src/test/resources/projects/build.properties => maven-wrapper/src/test/resources/org/apache/maven/wrapper/wrapper.properties (83%)