Commit Graph

454 Commits

Author SHA1 Message Date
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
Josh Soref 1740265984 [MNG-6146] Several small stylistic and spelling improvements to code and documentation
Spelling fixes:

* system
* tokenizer
* toolchain
* trailing
* transitive
* unsupported
* version
* artifact
* attachment
* codehaus
* colleagues
* comparison
* concurrency
* configure
* creation
* dependency
* descriptor
* downstream
* efficient
* e.g.
* elements
* encountered
* encounters
* environments
* executed
* explicitly
* happens
* hierarchical
* hierarchy
* ignore
* implemented
* implementers
* independence
* indicates
* inheritance
* inherited
* inherits
* install
* interface
* javascript
* laziness
* management
* maven
* metadata
* mgmt
* minimalist
* nonexistent
* objects
* overridden
* print
* project
* properties
* recessive
* referring
* repository
* representation
* retrieval
* retrieve
* rigorous
* should
* spontaneously
* subsequent

Literal fixes:

*  use static final values

Style fixes:

* use the proper term for char U+002D (-) hyphen(-minus) instead of dash

This closes #100
2017-02-03 10:12:28 +01:00
Harald Wellmann 4d6c9292c4 [MNG-6110] Upgrade Aether to Maven Resolver 1.0.3 2017-02-01 07:59:52 +01:00
Michael Osipov 23b5fcffa7 [MNG-6137] Clean up duplicate dependencies caused by incomplete Wagon HTTP Provider exclusions
JCL over SLF4J has been added also as a runtime dependency because the
bundled HttpClient still uses Commons Logging and we want our version
of SLF4J enforced.
2017-01-31 16:14:31 +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
Karl Heinz Marbaise c794c2a393 [MNG-5946] Fix links etc. in README.txt which is part of the delivery
- Changed consistently to https cause all links are available via https.
- Fixed link to shutdown codehaus jira
- Fixed link to git repository.
2017-01-25 21:15:39 +01:00
Hervé Boutemy 84085c0a9c updated urls (https, plexus) and license header formatting 2017-01-24 23:50:10 +01:00
Hervé Boutemy 94bc4de2ea [MNG-6093] use monkey patched slf4j-simple provider with Maven color 2017-01-24 18:40:07 +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
Stephen Connolly bce33aa266 [MNG-6151] Set version to 3.5.0-SNAPSHOT 2017-01-04 09:12:47 +00:00
Jason van Zyl 737de43e39 [maven-release-plugin] prepare for next development iteration 2015-11-10 11:37:02 -05:00
Jason van Zyl bb52d8502b [maven-release-plugin] prepare release maven-3.3.9 2015-11-10 11:36:45 -05: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 406a46fd83 [maven-release-plugin] prepare for next development iteration 2015-10-30 09:41:20 -07:00
Jason van Zyl cdd15915eb [maven-release-plugin] prepare release maven-3.3.8 2015-10-30 09:40:58 -07:00
Jason van Zyl 508d97ec87 [maven-release-plugin] prepare for next development iteration 2015-10-27 11:36:39 -07:00
Jason van Zyl d48a49b353 [maven-release-plugin] prepare release maven-3.3.7 2015-10-27 11:36:22 -07: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
Hervé Boutemy d25669e0bb removed unused config since MPIR is at 2.8 with MPIR-290 2015-08-09 21:30:11 +02:00
Jason van Zyl 9f45a84667 [maven-release-plugin] prepare for next development iteration 2015-07-30 22:25:55 -04:00
Jason van Zyl 72e1aad686 [maven-release-plugin] prepare release maven-3.3.6 2015-07-30 22:25:36 -04:00
Jason van Zyl 7ef71655b3 [maven-release-plugin] prepare for next development iteration 2015-07-20 14:05:24 -04:00
Jason van Zyl 2226900a49 [maven-release-plugin] prepare release maven-3.3.5 2015-07-20 14:05:06 -04:00
Jason van Zyl 81a3035c63 [maven-release-plugin] prepare for next development iteration 2015-07-17 14:06:03 -04:00
Jason van Zyl df509db95a [maven-release-plugin] prepare release maven-3.3.4 2015-07-17 14:05:46 -04: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 f6488774f5 [maven-release-plugin] prepare for next development iteration 2015-04-22 07:54:54 -04:00
Jason van Zyl 7994120775 [maven-release-plugin] prepare release maven-3.3.3 2015-04-22 07:54:38 -04:00
Jason van Zyl 9f4bf9eda9 [maven-release-plugin] prepare for next development iteration 2015-04-16 09:14:08 -04:00
Jason van Zyl 743903acab [maven-release-plugin] prepare release maven-3.3.2 2015-04-16 09:13:50 -04:00
Jason van Zyl c1384a2fed Update JDK references to JDK7 2015-03-19 08:43:49 -04:00
Jason van Zyl 1d3d2fd3df [maven-release-plugin] prepare for next development iteration 2015-03-13 13:05:42 -07:00
Jason van Zyl cab6659f98 [maven-release-plugin] prepare release maven-3.3.1 2015-03-13 13:05:27 -07: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 eae9a88f54 [maven-release-plugin] prepare for next development iteration 2015-03-11 14:42:17 -07:00
Jason van Zyl b37a7d1776 [maven-release-plugin] prepare release maven-3.3.0 2015-03-11 14:42:01 -07:00
Jason van Zyl 368516c2aa Change version from 3.2.6-SNAPSHOT to 3.3.0-SNAPSHOT 2015-03-04 10:58:05 -08: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
Jason van Zyl fa71e5f5ad [maven-release-plugin] prepare for next development iteration 2014-12-14 12:22:54 -05:00
Jason van Zyl 12a6b3acb9 [maven-release-plugin] prepare release maven-3.2.5 2014-12-14 12:22:35 -05: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
Jason van Zyl 35c49f7a5e [maven-release-plugin] prepare for next development iteration 2014-12-12 16:14:40 -05:00
Jason van Zyl ed0e6acb01 [maven-release-plugin] prepare release maven-3.2.4 2014-12-12 16:14:23 -05: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
Igor Fedorenko 2909b5a329 aether 1.0
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-08-27 23:17:24 -04:00
Jason van Zyl 1ed1d8cd3d [maven-release-plugin] prepare for next development iteration 2014-08-11 13:55:03 -07:00
Jason van Zyl 33f8c3e102 [maven-release-plugin] prepare release maven-3.2.3 2014-08-11 13:54:57 -07: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 a18f5af192 [maven-release-plugin] prepare for next development iteration 2014-06-17 09:36:07 -04:00
Jason van Zyl 45f7c06d68 [maven-release-plugin] prepare release maven-3.2.2 2014-06-17 09:36:00 -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
Anders Hammar e7d8dad4b4 [MNG-5610] README.txt in distro should be updated
Signed-off-by: Anders Hammar <andham@apache.org>
2014-03-30 11:28:13 +02:00
Anders Hammar a084de9c98 [MNG-5609] README.txt in distro incorrectly states JDK requirement as 1.5+
Signed-off-by: Anders Hammar <andham@apache.org>
2014-03-25 22:21:14 +01: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
Jason van Zyl cd55c4fcbe [maven-release-plugin] prepare for next development iteration 2014-02-14 12:32:50 -05:00
Jason van Zyl ea8b2b0764 [maven-release-plugin] prepare release maven-3.2.1 2014-02-14 12:32:44 -05:00
Jason van Zyl 9459c0a9f3 Move the POMs back the 3.2.1-SNAPSHOT 2014-02-14 12:14:35 -05:00
Jason van Zyl e4d073b681 [maven-release-plugin] prepare for next development iteration 2014-02-14 12:00:12 -05:00
Jason van Zyl 1ef536c7b8 [maven-release-plugin] prepare release maven-3.2.1 2014-02-14 12:00:04 -05:00
Jason van Zyl d8c57c441d [maven-release-plugin] prepare for next development iteration 2014-02-10 19:55:28 -05:00
Jason van Zyl 9f109b6047 [maven-release-plugin] prepare release maven-3.2.0 2014-02-10 19:55:21 -05:00
Jason van Zyl bc9bd89838 Roll back to 3.2.0-SNAPSHOT 2014-02-10 19:51:43 -05:00
Jason van Zyl 1bf4b9e3e6 [maven-release-plugin] prepare for next development iteration 2014-02-10 18:27:37 -05:00
Jason van Zyl ffe7dc4073 [maven-release-plugin] prepare release maven-3.2.0 2014-02-10 18:27:30 -05:00
Michael Osipov d266733f04 [MNG-5574] Write error/warning messages from mvn shell and batch scripts
to stderr

- Only errors go to stderr, warnings don't stop Maven from working
2014-02-09 12:07:44 +01:00
Michael Osipov 088193ca4c [MNG-5574] Write error/warning messages from mvn shell and batch scripts
to stderr
2014-02-08 16:53:52 +01:00
Michael Osipov 8e2247dc30 Add error label to a shell script before exiting. 2014-02-08 16:06:20 +01:00
Stephen Connolly 77aeb15556 targetting 3.2.0 release 2014-01-06 09:49:00 +00:00
Hervé Boutemy 07fecbd9e6 fixed 70218af1c1 in case comand line
contains spaces
2013-11-24 19:50:10 +01:00
John Casey 70218af1c1 Adding envar MAVEN_CMD_LINE_ARGS to shell scripts to provide consistency for accessing CLI args via env.MAVEN_CMD_LINE_ARGS user property (from plugins, for example). 2013-10-21 13:26:56 -05:00
Jason van Zyl b0acd5e73a The version:set plugin works to roll/unroll changes (where the release plugin is not very good) so we can use more standard versions which will help withe ITs. 2013-10-04 15:05:56 -04:00
Jason van Zyl 72326aef76 [maven-release-plugin] prepare for next development iteration 2013-09-17 11:17:49 -04:00
Jason van Zyl 0728685237 [maven-release-plugin] prepare release maven-3.1.1 2013-09-17 11:17:43 -04:00
Jason van Zyl 340dd3fc6e Change poms over to major.minor-SNAPSHOT 2013-09-14 17:05:06 -04:00
Hervé Boutemy f27287ce24 fix scm connection and developerConnection values in modules, waiting
for maven-scm support of default inherited values, which appends
/${artifactId}
2013-09-14 18:36:36 +02:00
Daniel Kulp eb2f2b1acd Add a LICENSE/NOTICE that can be picked up for the src assembly 2013-09-11 16:39:30 -04:00
Jason van Zyl 07f0fce320 [maven-release-plugin] prepare for next development iteration 2013-09-05 12:59:21 -04:00
Jason van Zyl 892b464683 [maven-release-plugin] prepare release maven-3.1.1 2013-09-05 12:59:15 -04:00
Hervé Boutemy 7da3bbbff7 pom formatting 2013-08-25 20:50:30 +02:00
Jason van Zyl 11f46bd4c4 MNG-5503: Fix for the issue where Maven 3.1.0 fails to resolve artifacts produced by reactor build
The general strategy is to fall back to Aether artifact type and use its notion of identity as much as possible. I have
a simple IT taken from the sample project that I will also push.
2013-08-20 05:54:28 -07:00
Hervé Boutemy a2d30c322e bump to 3.1.1-SNAPSHOT 2013-07-19 19:31:00 +02:00
Arnaud Héritier 9f8eabce22 Bump to 3.2-SNAPSHOT 2013-07-15 22:37:09 +02:00
Daniel Kulp 380dc43a7a Use the latest remote-resources snapshot (for now, testing purposes) to update the license links 2013-07-08 13:45:40 -04:00
Arnaud Héritier 7bb5f1957a s/The Maven distribution/The Apache Maven distribution
Reported by Sebb
2013-07-02 17:17:38 +02:00
Daniel Kulp b4dc8931f2 Some updates to start working on a proper LICENCE/NOTICE 2013-07-01 16:28:28 -04:00
Jason van Zyl 271761de84 [maven-release-plugin] prepare for next development iteration 2013-06-27 22:10:23 -04:00
Jason van Zyl 893ca28a1d [maven-release-plugin] prepare release maven-3.1.0 2013-06-27 22:10:16 -04:00
Jason van Zyl 09e77b53f0 Revert "[maven-release-plugin] prepare release maven-3.1"
This reverts commit a47ef06832.
2013-06-23 08:15:55 -07:00
Jason van Zyl 87e5972726 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit e22b2fa16a.
2013-06-23 08:15:29 -07:00
Jason van Zyl e22b2fa16a [maven-release-plugin] prepare for next development iteration 2013-06-23 08:03:57 -07:00
Jason van Zyl a47ef06832 [maven-release-plugin] prepare release maven-3.1 2013-06-23 08:03:53 -07:00
Jason van Zyl e1286aea83 [maven-release-plugin] prepare for next development iteration 2013-06-01 08:56:26 -04:00
Jason van Zyl c726cdd3a9 [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-06-01 08:56:20 -04:00
rfscholte 22d74b0df9 Fix errors reported by DOAP, shortened descriptions where required (DOAP accepts max 10 words) 2013-05-29 20:47:26 +02:00
Brett Porter 2fea34f701 fix typo and use names from their respective POMs 2013-05-28 21:22:22 -07:00
Jason van Zyl b0a83f6259 o update notice to reflect Aether and Sisu coming from the Eclipse Foundation 2013-05-28 19:06:19 -04:00
rfscholte bd6beaa925 Adjust Copyright year 2013-05-28 22:24:07 +02:00
Stephen Connolly 348f716433 Add Apache RAT pluging configuration to exclude files that have a legitimate reason for being excluded
- We should maybe review this list periodically, but to my mind there are legitimate reasons for excluding all of these files from the ASL license header requirements
2013-05-28 10:37:02 +01:00
Stephen Connolly c6c6bdc49f Add ASL license header 2013-05-28 10:19:32 +01:00
Jason van Zyl 326303e22a [maven-release-plugin] prepare for next development iteration 2013-05-25 08:33:08 -04:00
Jason van Zyl 42b69f0b0a [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-05-25 08:33:02 -04:00
Jason van Zyl 00b9029094 [maven-release-plugin] prepare for next development iteration 2013-05-23 10:23:11 -04:00
Jason van Zyl 32d720ea0c [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-05-23 10:23:05 -04:00
Jason van Zyl 95fbf6f445 [maven-release-plugin] prepare for next development iteration 2013-03-30 10:52:15 -04:00
Jason van Zyl 262b9bb1ef [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-03-30 10:52:10 -04:00
Jason van Zyl 08eab1953d o revert release plugin commits 2013-03-30 10:50:39 -04:00
Jason van Zyl 01c969e1eb [maven-release-plugin] prepare for next development iteration 2013-03-30 10:21:32 -04:00
Jason van Zyl 2decac4869 [maven-release-plugin] prepare release maven-3.1.0 2013-03-30 10:19:45 -04:00
Jason van Zyl ebf2e4ddea Merge branch 'eclipse-aether' of github.com:tesla/tesla-build into eclipse-aether
Conflicts:
	.gitignore
	pom.xml
2013-03-14 13:03:31 -07:00
Stuart McCulloch 2c2bf6e6e5 Use Eclipse/Sisu 0.0.0.M2 milestone
Signed-off-by: Jason van Zyl <jason@tesla.io>
2013-03-13 08:49:00 -04:00
Jason van Zyl 137cbd8a97 Merge branch 'trunk' into eclipse-aether
Conflicts:
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
	maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
	maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java
	maven-core/src/main/java/org/apache/maven/DefaultMaven.java
	maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
	maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
	maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
	pom.xml
	src/site/site.xml
2013-02-14 22:08:26 -05:00
Jason van Zyl 8181e7c7fa Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven into trunk 2013-02-14 21:13:42 -05:00
Jason van Zyl 3868007bf5 o missed mvn in the merge 2013-02-14 21:05:08 -05:00
Jason van Zyl 27ad9858d2 Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether
Conflicts:
	.gitignore
	apache-maven/pom.xml
	maven-aether-provider/pom.xml
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSession.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenServiceLocator.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
	maven-artifact/pom.xml
	maven-compat/pom.xml
	maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
	maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
	maven-core/pom.xml
	maven-core/src/main/java/org/apache/maven/DefaultMaven.java
	maven-core/src/main/java/org/apache/maven/ReactorReader.java
	maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
	maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
	maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
	maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
	maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
	maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
	maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
	maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
	maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
	maven-embedder/pom.xml
	maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
	maven-model-builder/pom.xml
	maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
	maven-model/pom.xml
	maven-plugin-api/pom.xml
	maven-plugin-api/src/main/mdo/plugin.mdo
	maven-plugin-api/src/site/apt/index.apt
	maven-repository-metadata/pom.xml
	maven-settings-builder/pom.xml
	maven-settings/pom.xml
	pom.xml
	src/site/site.xml
2013-02-14 20:21:50 -05:00
Jason van Zyl 38d132b64d Merge branch 'trunk' of github.com:apache/maven-3 into trunk
Conflicts:
	apache-maven/src/bin/mvn
	maven-embedder/src/site/apt/logging.apt
2013-02-14 18:02:32 -05:00
Hervé Boutemy 3e95b5f1c7 updated content 2012-12-16 21:13:57 +01:00
Jason van Zyl 73e1445987 [maven-release-plugin] prepare for next development iteration 2012-12-03 19:58:46 -08:00
Jason van Zyl 618d12906d [maven-release-plugin] prepare release maven-3.1.0 2012-12-03 19:58:40 -08:00
Jason van Zyl fcffe3c9d5 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413481 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 05:07:28 +00:00
Jason van Zyl 29c9b29f68 [maven-release-plugin] prepare release maven-3.1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413479 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 05:07:15 +00:00
Jason van Zyl 527cee25ef - Look for older setups as well, thanks to @mcculls for spotting this
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413474 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 03:50:32 +00:00
Jason van Zyl a284ef279c - keep git init script out of the source distribution
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413393 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 19:23:04 +00:00
Jason van Zyl b5f1798f2d - revert the release as we're missing MNG-5381
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413389 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 19:07:27 +00:00
Jason van Zyl 84b15b971b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413381 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 17:59:53 +00:00
Jason van Zyl 7815ab87ad [maven-release-plugin] prepare release maven-3.1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413379 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 17:59:36 +00:00
Jason van Zyl becf420bfa - export JAVA_HOME if it is not set or it commands, like javadoc, that expect it don't work very well
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413378 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 17:50:48 +00:00
Jason van Zyl 63fd9ed4d8 MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413208 13f79535-47bb-0310-9956-ffa450edef68
2012-11-24 17:22:54 +00:00
Jason van Zyl 074667f20f MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412409 13f79535-47bb-0310-9956-ffa450edef68
2012-11-22 02:24:16 +00:00
Jason van Zyl 325972aed0 MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412409 13f79535-47bb-0310-9956-ffa450edef68
2012-11-22 02:24:16 +00:00
Jason van Zyl 44f65114cc MNG-5053: Remove obsolete debugger arguments
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1409024 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 23:35:05 +00:00
Jason van Zyl 78a18e907d o update to slf4j 1.7.2 which allows the customization of the WARN level label. in the case of maven we vary slightly from all the standard logging implementations in that we use the string WARNING instead of WARN. once this change is made all the ITs pass again as all the failures were the result of string searches anchored on WARNING.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1397289 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 20:26:24 +00:00
Jason van Zyl d2a9a88c9e Explicitly set Sisu container logging to 'info' so it doesn't appear during Maven debug (-X) logging. To re-enable, remove this line from conf/logging/simplelogger.properties in the distribution.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1396843 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 22:48:14 +00:00
Jason van Zyl a23f7cfd10 o Use SLF4J for logging
Conflicts:

	pom.xml

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1396842 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 22:48:08 +00:00
Herve Boutemy 49d8d172d9 next version will be 3.1 (Jira updated accordingly: 3.1 renamed to 3.2)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1395257 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 09:14:21 +00:00
Jason van Zyl 6e901c5797 o Enabled support and discovery of JSR-330 components
o Added Slf4j logger factory to support generic JSR-330 logging

o Exported Guice package for components that access Guice (or better it's injector) directly

Widen export of Guice packages (not ideal, need to look into ways to avoid this)

o use specific exports

o for now we will attempt to hide all of Guice in plugin realms and we'll do a bit of testing

closes #3

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1380105 13f79535-47bb-0310-9956-ffa450edef68
2012-09-03 01:07:31 +00:00
Robert Scholte ecb64a623a Adjust default value of localRepository in xml-comment
Issue id: MNG-5258


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1300694 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 19:30:17 +00:00
Benjamin Bentmann 82b345e009 o Migrated to Eclipse Aether 2011-12-30 21:43:28 +01:00
Benson Margulies 9b7613b81c Take the dir format away.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212997 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 12:30:30 +00:00
Benson Margulies c55985ace9 Take the dir format away.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212997 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 12:30:30 +00:00
Benson Margulies 52beaf6221 MNG-5214: Dependency resolution substitutes g🅰️v:jar for j🅰️v:something-else when something-else isn't in the reacto
o When Aether asks the ReactorReader for a file for an artifact, remember to match type and classifier. And if all else
  fails, do not return target/classes if the desired artifact is not of type 'jar'. Arguably, if type or classifier
  are non-default, then we should never return those default paths at all.
o Add 'dir' format to make it quicker to run a quick test. If everyone hates this I'll revert it.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212564 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 18:30:26 +00:00
Benson Margulies 2b4e9a9ef7 MNG-5214: Dependency resolution substitutes g🅰️v:jar for j🅰️v:something-else when something-else isn't in the reacto
o When Aether asks the ReactorReader for a file for an artifact, remember to match type and classifier. And if all else
  fails, do not return target/classes if the desired artifact is not of type 'jar'. Arguably, if type or classifier
  are non-default, then we should never return those default paths at all.
o Add 'dir' format to make it quicker to run a quick test. If everyone hates this I'll revert it.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212564 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 18:30:26 +00:00
Olivier Lamy 85ed3a1525 bump version to 3.0.5-SNAPSHOT 3.0.4 is on release branch: feel free to hack :-) here
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1211509 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 16:22:49 +00:00
Olivier Lamy 65507bcfde bump version to 3.0.5-SNAPSHOT 3.0.4 is on release branch: feel free to hack :-) here
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1211509 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 16:22:49 +00:00
Olivier Lamy 862ff21440 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210462 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:48:51 +00:00
Olivier Lamy 36abba0fa0 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210462 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:48:51 +00:00
Olivier Lamy 11c001ba01 [maven-release-plugin] prepare release maven-3.0.4-RC3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210460 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:47:24 +00:00
Olivier Lamy d8f872895e [maven-release-plugin] prepare release maven-3.0.4-RC3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210460 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:47:24 +00:00
Olivier Lamy 5259b7b623 back to 3.0.4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210076 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 08:46:27 +00:00
Olivier Lamy b8e759de02 back to 3.0.4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210076 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 08:46:27 +00:00
Olivier Lamy 8edd56b679 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1209001 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:44:24 +00:00
Olivier Lamy f154515a41 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1209001 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:44:24 +00:00
Olivier Lamy 790169b9a5 [maven-release-plugin] prepare release maven-3.0.4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1208998 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:43:14 +00:00
Olivier Lamy 8abaddfd17 [maven-release-plugin] prepare release maven-3.0.4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1208998 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:43:14 +00:00
Olivier Lamy 1fe4016cf1 vote cancelled back to 3.0.4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1207843 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 12:09:14 +00:00
Olivier Lamy 13c114df16 vote cancelled back to 3.0.4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1207843 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 12:09:14 +00:00
Olivier Lamy 272c17979b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1206076 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 08:15:06 +00:00
Olivier Lamy ae1e859263 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1206076 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 08:15:06 +00:00
Olivier Lamy 6d375983a4 [maven-release-plugin] prepare release maven-3.0.4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1206073 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 08:14:04 +00:00
Olivier Lamy 878c4febd2 [maven-release-plugin] prepare release maven-3.0.4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1206073 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 08:14:04 +00:00
Olivier Lamy 3aa1fdc077 exclude org.apache.httpcomponents:* as they are shaded in wagon-http-2.1-shaded.jar
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1205950 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 18:27:51 +00:00
Olivier Lamy 4b9a53bdf7 exclude org.apache.httpcomponents:* as they are shaded in wagon-http-2.1-shaded.jar
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1205950 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 18:27:51 +00:00
Olivier Lamy af7dffd4b6 [MNG-5175] replace wagon http lightweight with wagon http 2.0 (SNAPSHOT currently)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172517 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 08:37:25 +00:00
Olivier Lamy 64d86e9f82 [MNG-5175] replace wagon http lightweight with wagon http 2.0 (SNAPSHOT currently)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172517 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 08:37:25 +00:00