Commit Graph

209 Commits

Author SHA1 Message Date
Michael Osipov 78fc3734f9 Trim trailing whitespace 2021-07-02 18:47:10 +02:00
rfscholte 6bed162a65 [MNG-7172] Remove expansion of Jansi native libraries 2021-06-24 19:24:54 +02:00
Michael Osipov fc806a25eb [MNG-7151] Upgrade Maven Resolver to 1.7.0 2021-05-11 20:59:18 +02:00
Guillaume Nodet 195fb626a9 [MNG-7079] Upgrade to jansi 2.2.0 and mave-shared-utils 3.3.4 2021-05-04 13:02:49 +02:00
Guillaume Dufour 9ba84aabe2 [MNG-7149] Introduce MAVEN_DEBUG_ADDRESS in mvnDebug scripts
mvnDebug socket now binds by default on localhost:8000. set MAVEN_DEBUG_ADDRESS
environment variable to choose another address (host:port).

This closes #469
2021-05-02 18:01:59 +02:00
Guillaume Dufour 32cdc2ec3c [MNG-7090] mvnDebug does not work on Java 11+
Submitted by: Guillaume Dufour

mvnDebug socket binds on 0.0.0.0
2021-04-25 18:40:15 +02:00
Hervé Boutemy 67125676ee [MNG-7118] block HTTP repositories by default 2021-03-19 20:36:07 +01:00
Guillaume Nodet bb916d0784 [MNG-7035] Migrate unit tests to Unit 5
Signed-off-by: rfscholte <rfscholte@apache.org>
2021-01-15 15:07:06 +01:00
Michael Osipov a2d29b221d [MNG-7065] Ugrade global settings.xml to 1.1.0 2021-01-04 20:24:32 +01:00
Michael Osipov 6e82d871e5 [MNG-7064] Use HTTPS for schema location in global settings.xml 2021-01-04 20:07:46 +01:00
Michael Osipov 8eda091d4e Replace tabs with proper count of spaces 2020-12-24 19:50:27 +01:00
Michael Osipov 673a7d1fef Trim trailing whitespace 2020-12-24 19:09:10 +01:00
Slawomir Jaranowski ecfff2626c [MNG-6993] Upgrade SLF4J to 1.7.30
This closes #380
2020-10-04 21:56:26 +02:00
Benjamin Marwell 1f8e0732b8 Do not create empty file on error 2020-06-20 09:07:54 +02:00
liym@home 377fc8689c Fixes alignment in settings.xml 2020-06-19 18:44:10 +02:00
olivier lamy cde15f4ef2 fix mvnDebug which was not working anymore for unix
Signed-off-by: olivier lamy <olamy@apache.org>
2020-06-02 13:46:26 +10:00
rfscholte 66f795476b [MNG-6919] drop wrapperUrl from maven-wrapper.properties
Ensure maven-wrapper can handle spaced paths
2020-05-27 22:57:34 +02:00
Sylwester Lachiewicz c6c7311713 [MNG-6819] Undo unintended changes after rebase 2020-05-23 11:02:45 +02:00
碎镜 14c9e156bc [MNG-6819] Fix NullPointerException in StringVisitorModelInterpolator
Closes #301
2020-05-23 10:07:16 +02:00
rfscholte 35e05e4972 [MNG-6914] Align mvn and mvnw scripts 2020-05-23 09:59:32 +02:00
Michael Osipov 45076f33a0 Improve license handling
* Stream line the output of the license listing
* Exclude jsoup from final distribution since we only need its license information
* Use proper SPDX ID for our license

This closes #317
2020-01-28 12:47:17 +01:00
Rostislav Krasny da5d8b8f51 [MNG-6850] Prevent printing the EXEC_DIR when it's just a disk letter
This fixes following bug and also consistent with another 'cd /d "%EXEC_DIR%"' a few lines above.
When you're on the root of some disk running mvn.cmd prints an extra line with current dir before the correct output

Closes #304
2020-01-14 11:10:58 +01:00
Rostislav Krasny 9989e6ab6c [MNG-6837] Simplify detection of the MAVEN_HOME and make it fully qualified on Windows
The removed 'stripMHome' recursive function is not needed anymore

This closes #307
2020-01-13 22:12:44 +01:00
Artem Krosheninnikov 735b72fcf1 [MNG-6844] Use StandardCharsets and remove outdated @SuppressWarnings
This closes #312
2020-01-09 18:09:44 +01:00
Martin Kanters e48c067d44 Moved org.slf4j.impl.MavenLoggerFactoryTest to the correct submodule 2020-01-01 10:58:31 +01:00
Martin Kanters d2510749d8 [MNG-6065] Create option --fail-on-severity 2019-12-27 10:56:55 +01:00
Enrico Olivelli f8bd6d577e [MNG-6771] Fix license issues on binary distribution
- Update slf4j to 1.7.29
- Do not download ASL v2 license files but copy from local
- add Jsoup license
- keep a specific copy of MIT license for each dependency
- Add NOTICE to binary distribution
- Add Eclipse SISU about.html contents

Patch co-authored by Hervé Boutemy and Enrico Olivelli
2019-11-18 09:00:04 +01:00
Hervé Boutemy fa97042f50 exclude IDE files that may pollute source archive 2019-11-03 18:07:58 +01:00
Hervé Boutemy eca4905fcd MNG-6781 fix sisu project url, which is invalid in pom 2019-10-13 17:58:33 +02:00
Hervé Boutemy 55572a4eb0 MNG-6779 jcl-over-slf4j is Apache 2.0, even if its pom says MIT 2019-10-13 17:19:26 +02:00
Christoph Etzel a939654b76 [MNG-6256] Surround parameter of echo command with double quotes
Fixes #128, #228
2019-01-08 22:22:34 +01:00
Sylwester Lachiewicz eab62f169d [MNG-6520] Update namespaces for maven-assembly to 2.0.0
Fixes #227
2019-01-07 12:11:58 +01:00
Hervé Boutemy b5014bff78 removed extra # in generated content 2018-10-28 17:40:16 +01:00
Hervé Boutemy c3dfa0f3d2 [MNG-6480] get non-Apache license from local resource 2018-09-17 07:50:12 +02:00
Hervé Boutemy ed8bc6bc0e [MNG-6358] improved licenses sources for inclusion 2018-09-16 17:52:34 +02:00
Hervé Boutemy 532eb24c3d [MNG-6358] indented code for better understanding 2018-09-16 17:17:27 +02:00
Sylwester Lachiewicz ce6cc5d008 [MNG-6414] Add more Apache license header patterns to skip downloading Apache license
Additional patterns for the Apache license exception list:
"Apache License, Version 2.0"
"The Apache Software License, Version 2.0"
"ASLv2"
"Apache Public License 2.0"

Fixes #167
2018-09-16 14:55:49 +02:00
Hervé Boutemy 0dc70cc691 upgrade m-site-p to 3.7 + Fluido 1.7 + edit button 2018-02-10 11:42:33 +01:00
Hervé Boutemy e2bc17b508 [MNG-6282] removed workaround for MingW/GitBash detection
see https://github.com/fusesource/jansi-native/issues/11
2018-02-10 11:42:32 +01:00
Andrew Donald Kennedy 867e5d50be [MNG-6255] Maven script cannot parse jvm.config with CRLF
Both \r and \n should also be replaced with a space to deal with CRLF line endings properly
2018-02-10 11:42:31 +01:00
Karl Heinz Marbaise 68a9d79671 [MNG-6332] Cleaned up mvn.cmd Script 2018-01-06 20:27:20 +01:00
Hervé Boutemy c19e9dcac3 [MNG-6242] detect Cygwin/Mingw pseudo terminal for Jansi 2017-10-15 10:16:00 +02:00
Hervé Boutemy eb2db7b286 [MNG-6196] updated slf4j to 1.7.25
[SLF4J-394] use new slf4j methods done for us
[SLF4J-395] use slf4j-simple System.out cache
2017-09-26 00:19:57 +02:00
Hervé Boutemy 707cff6ffd [MNG-6186] fixed path to jansi native libs in distribution 2017-06-10 08:04:43 +02:00
Hervé Boutemy 6182a2083f [MNG-6186] use enhanced HawtJNI library loading (remove previous hack) 2017-05-09 21:08:13 +02:00
Hervé Boutemy 2d4401557c [MNG-6223] support -f path/to/dir when detecting .mvn 2017-05-09 21:07:41 +02:00
Michael Osipov 3938817fd3 Doc improvement in simplelogger.properties 2017-04-21 22:50:11 +02:00
Stephen Connolly 87cf1eeb7d [MNG-6198] Use the directory specified by -f for searching with 'mvn' 2017-04-01 11:29:09 +01:00
Stephen Connolly 96543b7c6e [MNG-6195] Tidy up quoting and command substitution 2017-04-01 11:29:09 +01:00
Hervé Boutemy 181b0215aa [MNG-6115] prevent JAnsi from writing temp native files to lib/ext 2017-03-12 12:12:16 +01:00
rfscholte e0da20a1f8 [MNG-6181] HttpClient produces a lot of noise at debug loglevel
Turn off httpclient logging by default, which restores logging from previous Maven versions
2017-03-05 15:30:27 +01:00
Christian Schulte 0b9a30f350 [MNG-6177] The --file command line option of the Windows and Unix launchers does not work for directory names like "Spaces & Special Char" 2017-02-24 00:55:29 +01:00
robert.patrick f8ab2a650f [MNG-5889] .mvn directory should be picked when using --file 2017-02-14 07:51:20 +01:00
Michael Osipov 2678388ea2 [MNG-6003] Drastically reduce JAVA_HOME discovery code
All special handling has been removed. JAVA_HOME must be set properly by
the user if necessary. Error messages have been graciously borrowed from
the Tomcat start scripts.
2017-01-30 19:57:17 +01:00
Michael Osipov d426bf9c6e [MNG-6001] Replace %HOME% with %USERPROFILE% in mvn.cmd 2017-01-30 13:23:07 +01:00
Michael Osipov 1bc69ff93e [MNG-5963] mvn.cmd does not return ERROR_CODE 2017-01-30 13:14:16 +01:00
Miriam Lee 842b07be97 [MNG-5962] mvn.cmd fails when the current directory has spaces in between 2017-01-30 13:12:57 +01:00
Joseph Walton 1351020227 [MNG-5852] mvn shell script invokes /bin/sh but requires Bash functions
'local' is not POSIX, but supported by most shells. However, it's not
supported by Solaris's /bin/sh, so use a subshell instead.

This closes #50.
2017-01-30 12:56:36 +01:00
Joseph Walton 1d9708a954 [MNG-5829] mvn shell script fails with syntax error on Solaris 10
Use backticks instead of $(..) for the scripting added in MNG-5767.
Solaris's /bin/sh isn't POSIX-compliant enough to recognise the first
form.

This closes #50.
2017-01-30 12:56:36 +01:00
Tobias Oberlies 46c1581474 [MNG-5823] mvnDebug doesn't work with M2_HOME with spaces - missing quotes 2017-01-29 22:56:10 +01:00
Michael Osipov fe586467ec [MNG-5815] "mvn.cmd" does not indicate failure properly when using "&&" 2017-01-29 21:51:20 +01:00
Michael Osipov 065281c43d [MNG-5607] Don't use M2_HOME in mvn shell/command scripts anymore
* Variable has been removed and replaced with an internal one which
  cannot be overriden from outside. From now on, it is an
  implementation detail which it should have been from the beginning.
* Cleaned up license header and style of the variable description
  section graciously borrowed from the Tomcat start scripts.
2017-01-29 16:53:44 +01:00
Arlo Louis O'Keeffe 4337d18af6 [MNG-6163] Introduce CLASSWORLDS_JAR in shell startup scripts
This commit was previously for MNG-5538 and closes #27.
2017-01-29 16:00:35 +01:00
Michael Osipov b9285469a5 Remove Subversion keywords from LICENSE.vm 2017-01-29 15:14:27 +01:00
Michael Osipov aecccf9a2a [MNG-6145] Remove non-existent m2 include in component.xml 2017-01-28 18:19:31 +01:00
Hervé Boutemy 84085c0a9c updated urls (https, plexus) and license header formatting 2017-01-24 23:50:10 +01:00
Hervé Boutemy b80915b882 [MNG-3507] added color to Maven execution output messages 2017-01-24 18:40:07 +01:00
Karl Heinz Marbaise 8b66162052 [MNG-5904] Remove the whole Ant build 2017-01-24 18:40:07 +01:00
Michael Osipov be5caccaff [MNG-6102] Introduce ${maven.conf} in m2.conf
Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.
2017-01-23 20:54:54 +01:00
Michael Osipov 5053a628c0 [MNG-6106] Remove maven.home setter from m2.conf 2017-01-22 21:37:57 +01:00
Hervé Boutemy c516ef79ae [MNG-5836] put $maven.home/conf/logging first in classpath to avoid
extension jar overriding logging config
2017-01-22 17:17:11 +01:00
Karl Heinz Marbaise cf2f373ddb [MNG-5882] Nonportable shell constructs cause bin/mvn errors on Debian 2015-11-08 15:08:18 +01:00
Jason van Zyl 1a8413bef9 MNG-5858: mvn script fails to locate .mvn in current directory
Submitted by: Dave Syer

closes #58
2015-09-11 19:15:12 -04:00
Stephen Kitt f0cc5e8af9 Support directories with spaces in mvn
find_maven_basedir() doesn't handle a current working directory containing spaces; this patch fixes this behaviour.
2015-09-04 23:01:14 +02:00
Andreas Gudian f104ef8850 [MNG-5813] pass debug-opts from mvnDebug to mvn script in the additional env-variable MAVEN_DEBUG_OPTS to not interfere with user-specified MAVEN_OPTS (e.g. when read from .mavenrc).
Fixed as suggested by Robert Patrick on the ML
2015-06-27 17:41:33 +02:00
tssp ad905af669 [MNG-5812] Project base dir not fully working in Cygwin
Converted project base dir from Cygwin path to Windows path before
executing Maven.
2015-06-22 22:02:58 +02:00
sugartxy 7f206ef1cc try-with-resources
Reformatted to code style by me. This fixes #53
2015-06-20 14:32:46 +02:00
Kristian Rosenvold 7badeb5b5b Upgraded to java7 language features 2015-06-20 10:56:07 +02:00
Andreas Gudian f27c348bba MNG-5796 fix mvn.cmd execution when invoked at drive root 2015-05-02 19:33:38 +02:00
Jason van Zyl 0d32cbe6ac Make sure paths with spaces are treated correctly.
Fixes the issue of endlessly looping with project directory paths like "/my/project/this & that"
2015-03-13 12:18:24 -07:00
Arcadiy Ivanov 2f21481d06 mvn script is not compatible with OSX (Darwin)
Signed-off-by: Jason van Zyl <jason@tesla.io>

closes #39
2015-03-13 11:11:35 -07:00
Jason van Zyl 50899962f6 Make sure the windows *.cmd files make it into the assembly 2015-02-28 13:41:34 -08:00
Andreas Gudian c6faf8dd65 MNG-5776 Drop support for Win9x in mvn launch scripts for Windows, rename .bat to .cmd, remove duplicate code from mvnDebug.cmd 2015-02-28 15:50:58 +01:00
Igor Fedorenko b01bf0c3d4 MNG-5767 enforce use of maven.multiModuleProjectDirectory, fixed mvn*.bat
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-26 11:45:29 -05:00
Andreas Gudian 562896a192 MNG-5767 .mvn/ for project specific jvm options and maven parameters -- adapted Windows .bat scripts 2015-02-25 21:58:29 +01:00
Igor Fedorenko e28be4d33a MNG-5767 renamed projectBasedir to more descriptive multiModuleProjectDirectory
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-23 13:47:34 -05:00
Igor Fedorenko 8ed9a1caa8 MNG-5767 .mvn/ for project specific jvm options and maven parameters
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 08:14:08 -05:00
Igor Fedorenko 7c7bf4dfef cleaned up duplication code in bin/mvn shell scripts
changed mvnDebug and mvnyjp to delegate to the main mvn script
to do the actual work. this eliminated all code duplication
among the three scripts.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-09 15:24:58 -05:00
Bernd Eckenfels fbd6e53e83 [MNG-5686] Use /usr/libexec/java_home to find JAVA_HOME 2015-01-22 00:54:33 +01:00
Robert Scholte 71976ecf4d [MNG-5745] Add example of toolchains.xml to Maven distribution 2014-12-26 14:29:21 +01:00
Kristian Rosenvold 44d06d890f [MNG-5686] mvn cannot execute /usr/libexec/java_home/bin/java on OS X.
Patch supplied by Jonathan Sailor, applied unmodified
2014-12-13 09:24:55 +01:00
Michael Osipov 0343c52601 Trimmed trailing whitespace 2014-11-23 13:04:30 +01:00
Hervé Boutemy 603f26addf Revert "Account the the jsoup license URL which appears to have
changed." because https://github.com/jhy/jsoup/issues/471 fixed

This reverts commit 71f8d04be6.
2014-10-13 23:54:18 +02:00
Jason van Zyl 71f8d04be6 Account the the jsoup license URL which appears to have changed.
The JSoup license URL was recorded as http://jsoup.com/license but the
site appears to now be http://jsoup.org/ and so the URL is now
http://jsoup.org/license
2014-10-12 07:23:56 -04:00
Jason van Zyl 69448a7f09 MNG-5658: Fix syntax error in unix script on Solaris SPARC
Submitted by: Frank Langelage <frank.langelage@osnanet.de>
2014-07-06 13:47:11 -04:00
Jason van Zyl 65863e0a28 MNG-4226: Detect JAVA_HOME on newer Mac OS X
Submitted by: Christopher Tubbs <ctubbsii@apache.org>
https://github.com/apache/maven/pull/11
2014-05-20 20:48:57 -04:00
Karl Heinz Marbaise 550966dfa7 [MNG-5631]
- Cleared WARNINGs during build.
2014-05-12 16:55:38 +02:00
Stephen Connolly 3ebab97737 maybe this pattern will prevent the ever-growing source bundle 2014-02-18 17:21:31 +00:00
Stephen Connolly e1f096f93c exclude the Jenkins private local repo 2014-02-18 17:10:16 +00:00
Stephen Connolly a83ece077b exclude the Jenkins private local repo 2014-02-18 16:46:54 +00:00