Commit Graph

2872 Commits

Author SHA1 Message Date
Jason van Zyl e112cd89c7 MNG-3954: Remove the RuntimeInfo required in the setting.mdo 2014-06-13 12:07:11 -04:00
Jason van Zyl 661b4cf8f3 MNG-5620: LinkageError when CDI is in the classpath 2014-06-13 10:33:30 -04:00
Jason van Zyl 2a4d172600 MNG-5452: ${maven.build.timestamp} should use UTC instead of local timezone (or be configurable) 2014-06-13 10:25:37 -04:00
Jason van Zyl f1dcec88ae I inadvertently broke a test, my shell script doesn't check the failure and carried on. Sorry about that. 2014-06-12 10:29:47 -04:00
Jason van Zyl fc5cd37109 MNG-5346: update maven-plugin-plugin:descriptor default binding from generate-resources phase to process-classes 2014-06-12 02:57:02 -04:00
Mark Ingram 016932edbc MNG-5639: Support resolution of Import Scope POMs from Repo that contains a ${parameter}
Fix up previous

Signed-off-by: Jason van Zyl <jason@tesla.io>
2014-06-10 08:55:24 -04:00
Tamas Cservenak 18964baa25 Make sure participants and session scope exit are called
Even in case of failing build.

Signed-off-by: Jason van Zyl <jason@tesla.io>
2014-06-10 07:27:03 -04:00
Hervé Boutemy 73d35ba959 fixed errors reported by Checkstyle 2014-05-25 00:00:26 +02:00
Hervé Boutemy d402cc3dfc improved javadoc 2014-05-24 17:16:00 +02:00
Michael Osipov 0499d1d36a Merged https://github.com/apache/maven/pull/14. This closes #14. 2014-05-24 15:13:59 +02:00
Pavel Sorokin bd27f7814f MNG-5625: Fix typo 2014-05-24 12:29:09 +02:00
Pavel Sorokin 9468599ca3 MNG-5625: Correct the wording of the log message 2014-05-24 12:22:08 +02:00
Hervé Boutemy adc6d52361 extended javadoc 2014-05-24 11:21:21 +02:00
Pavel Sorokin 7a3e1ad740 MNG-5625: Provide a terse information about the used thread builder 2014-05-23 16:08:25 +02:00
Igor Fedorenko 702acd2e8b MNG-5578 fixed guice OutOfScopeException during multithreaded build
This was a regression since 3.2.1 introduced by my commit 48fec944

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-05-22 14:55:28 -04:00
Jason van Zyl bef7fac6e3 [MNG-5613] fix NullPointerException when error occur during project dependency graph creation
Submitted by: Sebastian Le Merdy <sebastian.lemerdy@gmail.com>
From: https://github.com/apache/maven/pull/13
2014-05-20 20:26:27 -04:00
Hervé Boutemy b527490517 removed unused imports 2014-05-10 16:19:28 +02:00
Igor Fedorenko ac8e59ac60 MNG-5591 use 'reactor' hint for reactor WorkspaceReader
When maven is invoked from m2e, container.lookup(WorkspaceReader.class)
returns component with role-hint=ide, which I believe is a bug in Susi
or Guice (or at least well misunderstood feature). This masks
ReactorReader workspace reader implementation and breaks reactor
dependency resolution.

The solution is to use explicit "reactor" role hint for ReactorReader.
This avoids fuzzy default component lookup logic and guarantees reactor
reader is always used regardless of presence of other workspace readers.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-02-28 23:54:51 -05:00
Igor Fedorenko 48fec9440d MNG-5578 cleanup redundant session binding in mojo executin scope
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-02-28 21:15:42 -05:00
Jason van Zyl 969a35dd42 Add a provisional marker to the Builder interface and add a bit of javadoc. 2014-02-15 10:42:57 -05: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
Igor Fedorenko 0f1fcd7066 Revert "MNG-5552 made classifier part of MavenProject.artifactMap key"
This reverts commit f35698c790.

There are plugins that rely on the broken behaviour and I don't have the
time to fix this in backwards compatible way right now.

http://markmail.org/message/gjfuofw5gpsr5yxz

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-02-13 21:41:07 -05:00
Jason van Zyl 30fadd074e Fix for multithreading configuration where you have something like -TC2.2 2014-02-12 11:43:51 -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
Olivier Lamy bc3f5dcc8e add missing license header 2014-02-11 11:37:33 +11: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
Jason van Zyl 8d489a2deb MNG-5582: Continue to track all the projects in the reactor even if the set is constrained by --projects 2014-02-10 14:56:06 -05:00
Igor Fedorenko f8afa711df MNG-5581 Introduced LifecycleMappingDelegate extension point
LifecycleMappingDelegate allows extension points provide custom
lifecycle mapping logic. The main usecase is to allow lifecycle
that reuse plugin configuration from default lifecycle. For
example "test-only" lifecycle will only run mojos bound to
tests phase of default lifecycle and nothing else.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-02-09 22:09:34 -05:00
Jason van Zyl 1d84cbeffa MNG-5578: Make the workspace reader pluggable by creating a session scope where the MavenSession created can be injected in implementations that have the @SessionScoped annotation 2014-02-09 21:52:35 -05:00
Kristian Rosenvold 276c7636d3 Removed the remaining weave mode code 2014-02-09 13:52:22 +01:00
Michael Osipov be19ddb6d9 [MNG-5176] Print build times in an ISO 8601-style manner 2014-02-09 12:14:43 +01:00
Robert Scholte f6bb98f584 [MNG-5572] Warn for building plugins with extensions in a reactor 2014-02-08 19:21:34 +01:00
Hervé Boutemy 81619e6f1a restore public interface 2014-02-08 16:41:28 +01:00
Hervé Boutemy 4a39c02156 fixed errors reported by Checkstyle 2014-02-08 16:38:31 +01:00
Jason van Zyl a7cb1596c1 MNG-5479: ExecutionEvent.Type.SessionEnded omited when runtime exception thrown 2014-02-06 22:21:55 -05:00
Jason van Zyl 097cc8d25f Move ThreadOutputMuxer to sit along with the multithreaded Builder implementation 2014-02-06 16:39:15 -05:00
Jason van Zyl 0c5678fa89 Remove weave mode building from the core 2014-02-06 16:27:15 -05:00
Jason van Zyl ccc7cb3abc Forgot to remove the deleted files. 2014-02-05 22:48:04 -05:00
Jason van Zyl 09961c3150 MNG-5575: Separate distinct build strategies into their own new Builder implementation. The interface is not ideal yet, but gives us a cleaner
separation of implementations and gives us a path forward.
2014-02-05 22:43:04 -05:00
Jason van Zyl 3bf568eda6 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven 2014-02-03 17:37:52 -05:00
Jason van Zyl 90ab970006 Hiding the project sorter as it is an implementation detail of the graph and I want to make another implementation. 2014-02-03 17:37:05 -05:00
Igor Fedorenko 43d67de045 MNG-5570 unit test lifecycle participant influence reactor order
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-01-29 07:40:19 -05:00
Jason van Zyl b05dd063f9 Slight addition to MNG-5389 so that the afterSessionEnd method throws a MavenExecutionException like the other methods in the participant 2014-01-24 11:36:50 -05:00
Igor Fedorenko 8f3eca3d0f MNG-5389 introduced MavenLifecycleParticipant#afterSessionEnd callback
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-01-19 18:48:43 -05:00
Robert Scholte 91499839cf [MNG-5230] Command line option to exclude modules from reactor
Contributed by Luuk van den Broek, slightly changed by Robert Scholte
Exclude/include marker char now match profiles, i.e +, ! and -
2014-01-09 00:06:19 +01:00
Jason van Zyl 6e3f24babc Updated the notes about the order of processing and a small problem with the conflation of duplicate checkingin getProjectMap 2014-01-06 12:16:06 -05:00
Jason van Zyl 7c3052ddeb MNG-5557: Constrain the set of projects that are passed into the ReactorReader as specified by --projects
- Add some documentation about the lifecycle within DefaultMaven
- Remove the use of DelegatingLocalArtifactRepository in DefaultMaven as it has been replaced with the use of the
  ReactorReader which is an implementation of Aether's WorkspaceReader
- Localize the manipulation of the ProjectBuildingRequest to getProjectsFromReactor()
- Deprecated getLogger()
2014-01-06 10:55:01 -05:00
Stephen Connolly 3929f55c31 Remove redundant casts 2014-01-06 11:23:19 +00:00
Stephen Connolly 5f29be799f Remove dead code (initializers) 2014-01-06 11:21:26 +00:00
Stephen Connolly 9a9cf059fd Just in case of file lock extra try and delete 2014-01-06 11:08:14 +00:00
Stephen Connolly e2b7ea2a96 Compare Xpp3Dom instances not objects that are different types and are being compared by Object.equals i.e. instance identity 2014-01-06 11:00:47 +00:00
Stephen Connolly 4b6eaadd28 Remove redundant Null check 2014-01-06 10:54:26 +00:00
Stephen Connolly 7ec819a2ce Remove redundant Null check 2014-01-06 10:53:51 +00:00
Stephen Connolly 9bec8d7386 Use chained .append calls rather than concatenate strings in arguments to .append 2014-01-06 10:42:20 +00:00
Stephen Connolly c156b1512f duplicate ; 2014-01-06 10:35:53 +00:00
Stephen Connolly f92c5bf5fd Flag that we are ignoring this 2014-01-06 10:34:45 +00:00
Stephen Connolly 9a55914061 Remove unnecessary unboxing 2014-01-06 10:32:16 +00:00
Stephen Connolly c30c76e423 Use StringBuilder 2014-01-06 10:31:04 +00:00
Stephen Connolly 77aeb15556 targetting 3.2.0 release 2014-01-06 09:49:00 +00:00
Jesse Glick 2eb419ed95 [MNG-5075] MavenProject.getParent throws undocumented ISE
Submitted by Jesse Glick
2014-01-05 19:17:03 +00:00
Igor Fedorenko e698ce6e67 MNG-5549 introduced MojoExecutionEvent and ProjectExecutionEvent
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2013-12-20 10:06:04 -05:00
Igor Fedorenko f35698c790 MNG-5552 made classifier part of MavenProject.artifactMap key
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2013-12-17 12:56:36 -05:00
Igor Fedorenko b99658c943 MNG-5550 default MojoExecution source to Source.LIFECYCLE
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2013-12-14 19:44:25 -05:00
Igor Fedorenko bc84e6c7d3 MNG-5549 introduced MojoExecutionListener and ProjectExecutionListener
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2013-12-14 19:43:42 -05:00
Igor Fedorenko 2ef658430f MNG-5530 simplified MojoExecutionScope binding
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2013-11-18 09:41:15 -05:00
Igor Fedorenko 8700b05857 MNG-5530 Introduced mojo execution guice component scope
Mojo execution scoped components are annotated with @MojoExecutionScoped
They are created just before configured mojo instance is created
and disposed immediately after mojo execution finishes.

Execution scoped components can request @Inject MavenSession,
MavenProject and MojoExecution instances in addition to any
standard Maven core components and components defined in
maven plugin contributing execution scoped components.

Execution scoped components can be injected into Mojos using
standard /* @component */ javadoc (and likely new mojo
annotations).

If execution scoped component implements MojoExecutionListener
callback interface, its #afterMojoExecutionSuccess method will be
invoked after successful mojo execution and #afterMojoExecutionAlways
method will be executed after both successful and failed mojo
executions.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
2013-10-31 07:49:54 -04: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 b7e3ce220c I'm reverting this as per Benjamin: the change to the artifact filter is an optimization to avoid downloading needless artifacts, but for cases of uber JARs or other stuff pulling in those packages, the class realm manager's imports are crucial 2013-09-17 10:22:35 -04:00
Jason van Zyl c61c387cf6 MNG-5513: Artifact filtering not updated for Eclipse Aether filtering
Also, please note that org.eclipse.aether.internal.impl should be imported into plugin realms, thereby restoring Maven 3.0.x style behavior which imports org.sonatype.aether.impl and sub packages (especially o.s.a.impl.internal which after the move to Eclipse is no longer a sub package of o.e.a.impl)  according to Benjamin (thanks!)
2013-09-17 00:09:54 -04:00
Jason van Zyl 0194cd61c8 We must also filter out the old Aether as well to prevent NoClassDefFoundErrors 2013-09-14 21:02:05 -04:00
Jason van Zyl 6125acf1c4 Merge branch 'mng-5513' 2013-09-14 20:22:18 -04:00
Jason van Zyl 340dd3fc6e Change poms over to major.minor-SNAPSHOT 2013-09-14 17:05:06 -04:00
Hervé Boutemy 65e219f621 fix scm connection and developerConnection values in modules, waiting
for maven-scm support of default inherited values, which appends
/${artifactId}
2013-09-14 16:15:38 +02:00
Tamas Cservenak 97732f7ee7 [MNG-5513] Restoring Maven 3.0.x style behavior
As it was importing org.sonatype.aether.impl and
sub packages, but since Aether move to Eclipse
the org.eclipse.aether.internal.impl is no longer
sub package of org.eclipse.aether.impl (but it
was in Sonatype Aether)
2013-09-11 14:01:15 +02:00
Tamas Cservenak 4a7b25c3dd [MNG-5513] Artifact filtering for Eclipse Aether fixed
The filtering was left unchanged, while Aether
GroupID changed from org.sonatype.aether to
org.eclipse.aether, basically letting
Plugins to reference Eclipse Aether that
would produce runtime Linkage errors.
2013-09-11 13:59:40 +02: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 6b2db085c0 code formatting 2013-08-21 21:38:01 +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 2d33fad18c give coordinates of plexus configuration files used to define content 2013-08-02 15:24:11 +02:00
Hervé Boutemy 82eba2a03f improved javadoc 2013-07-28 14:08:13 +02:00
Hervé Boutemy 2351cc1bb9 added a link to ExceptionHandler in the "useful entry points" section 2013-07-28 13:46:14 +02:00
Hervé Boutemy 7ffd13af5f added links to toolchains descriptor reference 2013-07-27 23:10:34 +02:00
Hervé Boutemy 8009c099a0 prefer DuplicatProjectException in same package and explicit package for
org.apache.maven.project.DuplicatProjectException
2013-07-27 19:16:52 +02:00
Olivier Lamy d5259127ed add missing @since 3.0.2 2013-07-20 15:46:16 +10:00
Hervé Boutemy 465202c505 added a link to ArtifactHandler API 2013-07-19 19:34:02 +02:00
Hervé Boutemy a2d30c322e bump to 3.1.1-SNAPSHOT 2013-07-19 19:31:00 +02:00
Stephen Connolly 9f7d5171fe narrow the exclusion 2013-07-18 11:19:00 +01:00
Arnaud Héritier 9f8eabce22 Bump to 3.2-SNAPSHOT 2013-07-15 22:37:09 +02: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
Arnaud Héritier 21907a74e7 Revert "Code cleanup - It's better (for perfs) to use a chain of append() calls than a unique append with several Strings concatenations"
This reverts commit c8e94a5b08.

Decreases too much the code readibility
2013-06-14 10:29:43 +02:00
Arnaud Héritier 456268af61 Code cleanup -  Remove Redundant Cast(s) 2013-06-11 22:28:48 +02:00
Arnaud Héritier da48cfff83 Code cleanup - Redundant array creation for calling varargs method 2013-06-11 22:27:26 +02:00
Arnaud Héritier d92746dc25 Code cleanup - Maven requires Java 5+ : Replace for and while loops by for each 2013-06-11 22:21:54 +02:00
Arnaud Héritier 1f84f8f296 Code cleanup - Maven requires Java 5+ : Replace String.indexOf() by String.contains() 2013-06-11 22:19:20 +02:00
Arnaud Héritier 9e5183f0ad Code cleanup - Various code simplifications (tests, loops, …) 2013-06-11 22:09:51 +02:00
Arnaud Héritier c8e94a5b08 Code cleanup - It's better (for perfs) to use a chain of append() calls than a unique append with several Strings concatenations 2013-06-11 21:58:50 +02:00
Arnaud Héritier 96db1abbe9 Code cleanup - Maven requires Java 5+ : Remove unnecessary boxing 2013-06-11 21:43:53 +02:00
Arnaud Héritier 143216f93a Fix misprint 2013-06-11 20:53:31 +02:00
Hervé Boutemy 4ec06bf67c default m-site-p plugin is 3.3 2013-06-02 12:40:38 +02: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
Hervé Boutemy ac64dd6bb6 [MNG-5482] detect missing Sonatype Aether classes to give a hint to
AetherClassNotFound Wiki article
2013-05-30 03:10:51 +02:00
rfscholte 4cc6a3fdef Fix Javadoc warnings 2013-05-28 23:29:01 +02:00
Stephen Connolly 85eed72eb1 In the canonical pom order, i.e. our pom.xml code style, <pluginManagement> comes before <plugins> 2013-05-28 10:49:38 +01: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
Hervé Boutemy d7b31b3c90 reapplied commit 994a27d004 after Eclipse
Aether merge:
removed code duplication: maven-core should use base
MavenRepositorySystemUtils provided by maven-aether-provider as a
basis before adding environment configuration instead of copy/paste
Aether configuration
2013-04-09 08:27:06 +02: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
Hervé Boutemy 42962fa281 code formatting 2013-03-30 09:37:11 +01:00
Kristian Rosenvold 973673721b [MNG-5456] Incorrect exception handling in parallel build 2013-03-30 07:00:05 +01: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
Igor Fedorenko 9b58a3cfdc MNG-5444 fixed building MavenProject from ModelSource
To maintain compatibility with (the extremely unlikely) existing
implementations of ModelSource, the new API methods are provided
via optional ModelSource2 interface. Updated javadoc to encourage
use of the new API.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
2013-03-03 22:03:50 -05:00
rfscholte f6f4ef5e03 [MNG-3131] Error message is misleading if a missing plugin parameter is of a type like List 2013-03-01 16:14:22 +01:00
Jason van Zyl de40fe19a8 o update for changes in Aether APIs 2013-02-16 22:48:55 -05:00
rfscholte 56cd921fbd MNG-3131: Error message is misleading if a missing plugin parameter is of a type like List 2013-02-16 14:49:19 +01: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 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
Benjamin Bentmann 4fdcdbd262 Followed change to DependencyNode.getPremanaged*() 2013-02-10 19:11:11 +01:00
Hervé Boutemy 720bef7df7 [MNG-5181] renamed *simple* local repository *manager* to *legacy* local
repository
2013-02-09 15:43:00 +01:00
Hervé Boutemy 114c98f310 [MNG-5181] added a warning when enhanced local repository manager is
disabled: this should be avoided
2013-02-04 01:27:53 +01:00
Benjamin Bentmann b5e0532310 Updated for latest ConflictResolver 2013-02-03 20:44:44 +01:00
Hervé Boutemy 5d06bc6a25 fixed typo 2013-02-02 16:59:20 +01:00
Hervé Boutemy 71dd7f3d2a code formatting 2013-02-02 16:52:16 +01:00
Hervé Boutemy 7196f82ff2 improved javadoc 2013-02-02 09:40:06 +01:00
olivier lamy 27f8b0f81a [MNG-5185] [MNG-5181]
add cli flag to be able to remove use of EnhancedLocalRepositoryManager.
2013-02-01 00:35:46 +01:00
Kristian Rosenvold 176a85f43c Fixed line feeds, added .gitattributes 2013-01-29 16:27:02 +01:00
Benjamin Bentmann 3916201b98 Used improved conflict resolver 2012-12-29 22:25:25 +01:00
Hervé Boutemy 3849bbd46a fixed errors reported by Checkstyle 2012-12-16 21:49:18 +01:00
Hervé Boutemy 915b1553f2 changed MavenModelMerger extensions visibility to protected to improve
documentation
2012-12-15 21:12:22 +01:00
Hervé Boutemy 87952bd073 added link to Plexus Classworlds 2012-12-12 17:37:03 +01:00
Hervé Boutemy 3d4a06c700 added ClassRealmManager entry point 2012-12-12 01:57:02 +01:00
Jason van Zyl c8536bf89f - make m2e happy on import 2012-12-08 19:30:57 -05:00
Hervé Boutemy d6544c4814 reverted change that got in previous commit by inadvertance 2012-12-08 17:47:12 +01:00
Hervé Boutemy 23bd8d98a6 added @since info 2012-12-08 16:05:37 +01:00
Anders Hammar f95ab2e7cd [MNG-5402] Better build number for git
Signed-off-by: Anders Hammar <anders@hammar.net>
2012-12-05 14:21:04 +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
Hervé Boutemy ac213ec571 [MNG-5245] updated maven-site-plugin to 3.2 2012-12-03 23:27:47 +01:00
Hervé Boutemy b63904c9db fixed errors reported by Checkstyle (once again...) 2012-12-03 02:21:58 +01:00
Hervé Boutemy 543870467f fixed errors reported by Checkstyle 2012-12-02 20:22:52 +01:00
Hervé Boutemy 71a8427df6 code formatting 2012-12-02 12:38:12 +01:00
Kristian Rosenvold 75ea1e4297 [MNG-5208] Parallel (-T option) multi module build fires wrong project failed event
Patch by Stefan Eder , applied with minor modifications
2012-12-02 11:05:37 +01:00
Hervé Boutemy fee1640d65 [MNG-5395] don't inject DefaultMavenPluginManager's logger into Mojos
but create a dedicated logger with Mojo implementation name
2012-12-01 04:27:23 +01:00
Kristian Rosenvold a278bec9d3 o Fixed another super-subtle classloader leak 2012-11-30 11:46:23 +01:00
Kristian Rosenvold 2103c82d57 o Changed array to atomicreference since arrays are not thread-safe 2012-11-30 07:33:31 +01:00
Jason van Zyl 97e8ae2737 - wind this back to version 2.2 2012-11-29 08:47:44 -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
Herve Boutemy 614e7bd173 separate SLF4J export from JSR-330
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413416 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 21:02:47 +00:00
Jason van Zyl d3756b95cc MNG-5381: Restore MavenSession.getRepositoryCache() for Tycho users so they are not forced to upgrade to 3.1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413391 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 19:09:44 +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
Herve Boutemy 9009b8f858 fixed errors reported by Checkstyle
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413335 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 11:04:16 +00:00
Jason van Zyl 451c43152b cleanup of the class realm purging
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413287 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 03:12:49 +00:00
Benson Margulies 1d4d1df865 MNG-5387: Add ability to replace an artifact in mid-build
o change MavenProject#addArtifact to use the *last* version of a given artifact passed to it instead of the first.
o add comments.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413286 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 02:26:42 +00:00
Herve Boutemy 4e52800a1b [MNG-5380] check that whitespace can be preserved in Maven plugin configuration when building MavenProject (still need to check if content is not trimmed when injected into plugin)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412310 13f79535-47bb-0310-9956-ffa450edef68
2012-11-21 21:36:19 +00:00
Kristian Rosenvold b766d34b70 [MNG-5245] Update maven plugin versions
- components.xml
  - maven-clean-plugin up to 2.5
  - maven-site-plugin up to 3.1
- default-bindings.xml
  - maven-install-plugin up to 2.4
  - maven-resources-plugin up to 2.6
  - maven-compiler-plugin up to 2.5.1
  - maven-surefire-plugin up to 2.12.4
  - maven-jar-plugin up to 2.4
  - maven-plugin-pugin up to 3.2
  - maven-war-plugin up to 2.3
  - maven-ear-plugin up to 2.8

Author:    Karl Heinz Marbaise <info@soebes.de>

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410570 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 21:09:49 +00:00
Herve Boutemy a8a59d6e13 fixed typo
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407893 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 22:15:18 +00:00
Herve Boutemy 994a27d004 removed code duplication: maven-core can use base MavenRepositorySystemSession provided by maven-aether-provider as a basis before adding environment configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407851 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 17:14:21 +00:00
Herve Boutemy 13bb4ba1be removed dead code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407835 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 15:26:34 +00:00
Herve Boutemy 09750f1a78 generics
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407834 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 15:25:30 +00:00
Herve Boutemy 3cbed6a1ca [MNG-5372] removed RepositoryCache, added in 3.0-alpha-3 and deprecated in 3.0-beta-3 with Aether integration (r988749)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407827 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 15:04:20 +00:00
Herve Boutemy 6c032edddb |MNG-5370] moved plugin bindings to default lifecycle configuration to default-bindings.xml to let only artifact handlers configuration in artifact-handlers.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407821 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 14:21:58 +00:00
Herve Boutemy 3bab630d58 little explanation improvement
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407757 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 11:04:38 +00:00
Herve Boutemy 4758085459 ordering
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402784 13f79535-47bb-0310-9956-ffa450edef68
2012-10-27 11:54:00 +00:00
Herve Boutemy 98944027a5 removed unused @SuppresWarnings
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402781 13f79535-47bb-0310-9956-ffa450edef68
2012-10-27 11:24:12 +00:00
Herve Boutemy 9a2b77d8be fixed warnings
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402780 13f79535-47bb-0310-9956-ffa450edef68
2012-10-27 11:15:58 +00:00
Herve Boutemy 390122c170 restore Java 5 API compatibility
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402776 13f79535-47bb-0310-9956-ffa450edef68
2012-10-27 10:19:32 +00:00
Barrie Treloar 0dca478eb8 [MNG-5162] Maven stuck on downloading dependencies when using java 7.
A ConnectException references https://cwiki.apache.org/confluence/display/MAVEN/ConnectException

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1401982 13f79535-47bb-0310-9956-ffa450edef68
2012-10-25 05:42:39 +00:00
Herve Boutemy 9f28c88bc9 improved message
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1400382 13f79535-47bb-0310-9956-ffa450edef68
2012-10-20 07:37:40 +00:00
Herve Boutemy 23097a37a0 [MNG-5350] improved warning message: when in debug mode, list the goals and not only the plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1398044 13f79535-47bb-0310-9956-ffa450edef68
2012-10-14 09:46:54 +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
Benjamin Bentmann 42536ce88f Accounted for refactoring of aether-api 2012-09-30 17:37:09 +02:00
Herve Boutemy 12632512dd added a link to Maven component (*THE* core :) )
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1391791 13f79535-47bb-0310-9956-ffa450edef68
2012-09-29 12:13:08 +00:00
Herve Boutemy 6215e507a5 added generics
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1391579 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 18:02:20 +00:00
Benjamin Bentmann 2838745156 o Accounted for refactoring of aether-api 2012-09-17 00:05:23 +02:00
Herve Boutemy 3501485ed2 fixed typo
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1382585 13f79535-47bb-0310-9956-ffa450edef68
2012-09-09 21:46:28 +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
Herve Boutemy e82f1ca7b4 added a reference item for artifact handlers
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1380040 13f79535-47bb-0310-9956-ffa450edef68
2012-09-02 19:43:23 +00:00
Herve Boutemy 6d48f251e4 added missing license header
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1372515 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 17:07:29 +00:00
Herve Boutemy 19924774d9 added default artifact handlers reference documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1372514 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 17:06:44 +00:00
Olivier Lamy aa7d0a5985 [MNG-5245] default plugin version surefire to 2.12.1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1369644 13f79535-47bb-0310-9956-ffa450edef68
2012-08-05 19:15:41 +00:00
Herve Boutemy d3bc3fa684 added @since
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1365267 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 20:03:34 +00:00
Jason van Zyl e778ea6712 MNG-5312: MavenProject.getParent intolerably slow when import scope used heavily
Submitted by: Jesse Glick


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1362736 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 01:16:59 +00:00
Herve Boutemy 6b4a2a602b fixed typo
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1362617 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 19:31:27 +00:00
Milos Kleint 4fcfcb8f73 MNG-5306 : introduce ModelProblemCollectorRequest and a new ModelProblem property - version which denotes on which validation level the error/warning applies. Additionally move the logic on failing the ModelBuilding from ModelProblemCollector to ModelBuilder's protected method to allow overriding. Default maven behaviour should stay the same.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1357589 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 13:11:15 +00:00
Herve Boutemy 2f6cc7d2d5 improved javadoc: added evaluation result description
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1346694 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 01:14:15 +00:00
Herve Boutemy cd1c96a952 fixed typo
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1344490 13f79535-47bb-0310-9956-ffa450edef68
2012-05-30 22:32:42 +00:00
Herve Boutemy 4e28a9e77c added links to MavenPluginManager component
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1342436 13f79535-47bb-0310-9956-ffa450edef68
2012-05-24 21:32:04 +00:00
Herve Boutemy 32e3b6c7e6 added link to PluginParameterExpressionEvaluator
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1340560 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 20:36:16 +00:00
Herve Boutemy 2a389c2904 o reworded "bindings" to "plugin bindings"
o added an introduction to lifecycles and plugin bindings to default lifecycle

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1340397 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 10:01:00 +00:00
Herve Boutemy f8f78eca61 added javadoc
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1340266 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 21:34:17 +00:00
Herve Boutemy 53325198e8 generics
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1340254 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 21:16:58 +00:00
Herve Boutemy 691e4af5cf added @since info on methods and classes used by mirror injection
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1335785 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 21:46:14 +00:00
Herve Boutemy efbbaf668e removed unused import
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1333235 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 22:45:49 +00:00
Olivier Lamy 006075a349 make pluggable PasswordDecryptor working.
Submitted by Jason Dillon
see https://github.com/apache/maven-3/pull/4

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1310560 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 19:28:28 +00:00
Benjamin Bentmann 03b0269579 o Accounted for refactoring of aether-api 2012-03-18 16:52:54 +01:00
Benjamin Bentmann 02927ead50 o Accounted for refactoring of aether-api 2012-03-11 23:18:43 +01:00
Benjamin Bentmann 25a273f744 o Accounted for refactoring of aether-api/-util 2012-03-10 17:41:02 +01:00
Herve Boutemy 2f453c69b9 improved documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1244233 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 22:07:47 +00:00
Herve Boutemy 43518f56f4 generics and Java 5 constructs
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1244229 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 21:55:36 +00:00
Olivier Lamy 7bf2294941 [MNG-5245] upgrade default plugins versions surefire version 2.12
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1244153 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 18:36:58 +00:00
Olivier Lamy 4b2c7917e0 [MNG-5233] ArtifactMetadataRetrievalException from org.apache.maven.artifact.metadata is not anymore binary compatible.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1234715 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 09:28:47 +00:00
Herve Boutemy 0ab06d9cd6 removed unused configuration: version is defined in parents' managed versions
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1234623 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 21:42:49 +00:00
Benjamin Bentmann 8cf8d36777 o Made Aether session read-only once setup 2012-01-08 20:02:32 +01:00
Benjamin Bentmann e02c8abdd1 Accounted for refactoring of aether-api 2012-01-08 20:01:59 +01:00
Olivier Lamy 76ad2345c1 [MNG-5225] The default version of the maven-site-plugin as defined in the site-lifecycle must be 3.x
merge -r1227324:1227325 https://svn.apache.org/repos/asf/maven/maven-3/branches/maven-3.0.4-RCx


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1227327 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 21:15:03 +00:00
Stephen Connolly ffbdb44299 [MNG-5224] REGRESSION: Injected Settings in a Mojo are missing the profiles from settings.xml
o Some unit tests to cover some of the fix.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1226858 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 16:41:49 +00:00
Stephen Connolly d8000fa861 [MNG-5224] REGRESSION: Injected Settings in a Mojo are missing the profiles from settings.xml
o This is the fix, manually tested. Now I just have to figure out a good way to test the via a unit/integration test

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1226842 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 15:58:55 +00:00
Benjamin Bentmann 2592e158ad o Accounted for API refactoring 2012-01-01 20:05:13 +01:00
Benjamin Bentmann a7613aad86 o Accounted for API refactoring 2011-12-31 21:46:14 +01:00
Benjamin Bentmann 18b81002cd o Accounted for API refactoring 2011-12-30 22:16:02 +01:00
Benjamin Bentmann 82b345e009 o Migrated to Eclipse Aether 2011-12-30 21:43:28 +01:00
Olivier Lamy 879d07b1d7 merge -r1222269:1222270 https://svn.apache.org/repos/asf/maven/maven-3/branches/maven-3.0.4-RCx
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1222272 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 15:13:10 +00:00
Olivier Lamy 71c145a0e6 merge -r1222269:1222270 https://svn.apache.org/repos/asf/maven/maven-3/branches/maven-3.0.4-RCx
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1222272 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 15:13:10 +00:00
Olivier Lamy c07f369278 remove redundant cast
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212981 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 08:48:07 +00:00
Olivier Lamy 18de090198 remove redundant cast
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212981 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 08:48:07 +00:00
Olivier Lamy ed651a4d0e [MNG-5209] MavenProject.getTestClasspathElements can return null elements
Submitted by Jesse Glick.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212980 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 08:47:50 +00:00
Olivier Lamy 87884c7bc1 [MNG-5209] MavenProject.getTestClasspathElements can return null elements
Submitted by Jesse Glick.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212980 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 08:47:50 +00:00
Benson Margulies a15a2646a3 MNG-5214: Dependency resolution substitutes g🅰️v:jar for j🅰️v:something-else when something-else isn't in the reactor
o allow ejb-client types artifacts to dance with jar artifacts to allow reactor resolution to target/classes, thus
unbreaking some integration tests.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212793 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 13:54:49 +00:00
Benson Margulies 4b637c5a2f MNG-5214: Dependency resolution substitutes g🅰️v:jar for j🅰️v:something-else when something-else isn't in the reactor
o allow ejb-client types artifacts to dance with jar artifacts to allow reactor resolution to target/classes, thus
unbreaking some integration tests.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212793 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 13:54:49 +00:00
Benson Margulies acb711f32c MNG-5214: Dependency resolution substitutes g🅰️v:jar for j🅰️v:something-else when something-else isn't in the reactor
o rework to takine MNG-4065 back on board. We need to allow test-jar and jar to dosi-do even if we can't be having with
wsdl and jar changing places.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212720 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 02:22:55 +00:00
Benson Margulies 04d269f1da MNG-5214: Dependency resolution substitutes g🅰️v:jar for j🅰️v:something-else when something-else isn't in the reactor
o rework to takine MNG-4065 back on board. We need to allow test-jar and jar to dosi-do even if we can't be having with
wsdl and jar changing places.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212720 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 02:22:55 +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