Commit Graph

10008 Commits

Author SHA1 Message Date
Igor Fedorenko cc429e8451 MNG-5774 restored MavenCli user/global settings location contants
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-03-11 18:24:14 -04: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
Hervé Boutemy d8527aa9ce upgraded MPIR plugin to benefit from MPIR-322 2015-03-11 09:07:53 +01:00
Igor Fedorenko b7088a34ed MNG-5783 fixed slf4j is missing from ${plugin.artifacts}
Some plugins, e.g., cobertura-maven-plugin, use ${plugin.artifacts}
to setup classpath of externally launched jvms and they expect slf4j
to be available among plugin dependencies. At the same time slf4j
is already part of maven core runtime and it needs to be filtered
out from plugin and build extension realms to avoid duplicate classes
on classpath.

The fix is to move core artifact filtering from plugin dependency
resolver to class realm manager. This way ${plugin.artifacts} still
includes all compile/runtime scoped plugin dependencies but runtime
classpath only has plugin unique artifacts.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-03-10 10:07:29 -04:00
Hervé Boutemy ab5f3a9de7 added doculmentation about extension descriptor 2015-03-09 04:56:26 +01:00
Hervé Boutemy 207d18ddb6 stupid "enchancement" :) 2015-03-07 09:07:08 +01:00
Hervé Boutemy 5947c4ef71 [MNG-5771] enabled modello xdoc/xsd for core extensions mdo, with
minimum intro.
Still need to improve descriptions and info in mdo
2015-03-06 02:04:17 +01:00
Jason van Zyl 07b8477b97 Move to Java 7 2015-03-05 15:35:10 -08:00
Jason van Zyl 57a6196422 MNG-5779 Export org.slf4j.spi.* to fix the Javadoc plugin error 2015-03-05 00:40:45 -08:00
Hervé Boutemy 772df4ed2a [MNG-5778] s/3.2.6/3.3.0/ in code (@since in javadoc) 2015-03-05 08:42:23 +01:00
Jason van Zyl db9e7896ac Roll back Wagon, when someone releases it we can update 2015-03-04 11:18:47 -08: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
Hervé Boutemy cf33545c2e updated parent pom, cleanup and updated m-checkstyle-p 2015-03-04 03:19:03 +01:00
Hervé Boutemy eecdc9a171 reintroduced LineLength Checkstyle rule and fixed code... 2015-03-04 03:17:46 +01:00
Jason van Zyl be3fb20032 MNG-5775 Make the project graph building code pluggable to allow for new/different implementations. 2015-03-01 12:39:30 -08:00
Jason van Zyl 7997634209 MNG-5774 Provide an extension point for alternate CLI configuration source 2015-03-01 10:22:26 -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
Hervé Boutemy e7f3768b51 [MNG-5740] added maven-builder-support to dependency image 2015-02-28 18:12:16 +01: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 7b3e956753 MNG-5767 updated build.xml to match maven changes
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-26 13:24:11 -05: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
Joseph Walton b8dcb08731 MNG-5734: Fail, rather than just warning, on empty '<module>' entries.
An incorrect non-blank module is currently treated as an error. Behave
the same way for a blank module, rather than simply warning about
the mistake.

Signed-off-by: Jason van Zyl <jason@tesla.io>
2015-02-21 09:22:27 -05:00
Joseph Walton fdcd34dd37 Simplify the bootstrapping instructions to remove use of M2_HOME.
As part of deprecating the M2_HOME environment variable (MNGSITE-223),
change the bootstrapping instructions so that it's no longer used.

Signed-off-by: Jason van Zyl <jason@tesla.io>
2015-02-21 09:17:50 -05:00
Igor Fedorenko 2eab8924a9 MNG-5771 disabled modello xdoc/xsd for core extensions mdo
... hopefully fixes maven site generation

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 19:17:57 -05:00
Igor Fedorenko eaef349685 MNG-5771 updated bootstrap ant build to match pom.xml changes
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 14:45:06 -05:00
Igor Fedorenko bdb4c32ec4 MNG-5772 upgrade to sisu 0.3.0 and sisu guice 3.2.5
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 14:22:23 -05:00
Igor Fedorenko 6efacdb3fc MNG-5771 user-defined core extensions
read ${maven.projectBasedir}/.mvn/extensions.xml and create core
extensions realms during maven runtime bootstrap. this required
short-lived bootstrap plexus container to resolve extensions.

individual extensions realms are wired to maven.ext realm according
to META-INF/maven/extension.xml exported packages specification

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 14:05:54 -05:00
Igor Fedorenko e2a0792840 exit session scope in finally {} block
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 10:26:15 -05:00
Igor Fedorenko 6b79ac5e33 use eclipse sisu plugin, lock version with rest of sisu
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 10:26:15 -05:00
Igor Fedorenko 5f150940c1 extracted RepositorySystemSessionFactory from DefaultMaven
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 10:26:15 -05:00
Igor Fedorenko 586e65f381 added javax.inject and slf4j-api to the exported artifacts list
javax.inject.* and org.slf4j.* packages were already exported, but
corresponding artifacts were not. this resulted in same classes
present in multiple classlaoders and caused hard-to-troubleshoot
build failures in some cases.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 10:26:15 -05:00
Igor Fedorenko 8631d79ca3 MNG-5771 use extension.xml to define core exported artifacts and packages
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 10:26:14 -05:00
Igor Fedorenko 45563ff5cb mechanism to carryover session scope seeds from one thread to another
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 10:26:14 -05:00
Igor Fedorenko 117df855e2 dispose dynamically created class realms
this is mostly to help integration tests reuse the same realm ids,
but plugging resource leaks is generally a good thing.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 10:26:04 -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 ee7dbab69d MNG-5768 @execution-id syntax for direct plugin goal invocation
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 07:58:31 -05:00
Igor Fedorenko cd52e5b51e MNG-5766 consistently handle all throwables in LifecycleModuleBuilder
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-18 10:47:52 -05:00
Hervé Boutemy c28348024a improved javadoc 2015-02-15 20:56:54 +01: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
Jason van Zyl d52e5c4294 Allow munge to remove another deprecated method 2015-02-09 03:26:29 -05:00
Jason van Zyl 103f6418cf Experimenting with Munge to chop out deprecated code for a Maven 4.x codebase
I will try and collect all deprecated code at the bottom of classes with Munge markers and
use this in conjunction with a definitive list of classes to be purged in order to use
one code line to safely experiment with Maven 4.x.
2015-02-09 02:28:35 -05:00
Jason van Zyl d6e9226b60 No longer need the settings decrypter 2015-02-09 01:55:07 -05:00
Jason van Zyl dd5eb31a08 Fold back into MavenRepositorySystem and work from there to clean up all references to the legacy system and Settings. 2015-02-09 01:44:32 -05:00
Jason van Zyl 2d34e67eed First pass at cleaning up MavenExecutionRequestPopulator and its use.
Push MavenExecutionRequestPopulator down to only operate in the MavenCli. Two of the three methods were already called from MavenCli so now all of them are. In the process I deleted a bunch of code and pursue my quest to remove Settings from the core in order to make a general configuration mechanism that can be plugged into the core via the MavenCli.

Also removed the requirement of the LegacyRepositorySystem in the DefaultMavenExecutionRequestPopulator which breaks another tie with the legacy code. I took the bits that were needed and a lot of the code, after tracing through it, is redundant so it has been deleted.

Turning off:

injectMirror( request, request.getRemoteRepositories(), request.getMirrors() );
injectMirror( request, request.getPluginArtifactRepositories(), request.getMirrors() );

in DefaultMavenExecutionRequestPopulator

Results :

Failed tests:
  MavenITmng4190MirrorRepoMergingTest>AbstractMavenIntegrationTestCase.runTest:220->testit:76 null expected:<[1]> but was:<[4]>

Tests in error:
  MavenITmng4991NonProxyHostsTest>AbstractMavenIntegrationTestCase.runTest:220->testit:89 » Verification
  MavenITmng4963ParentResolutionFromMirrorTest>AbstractMavenIntegrationTestCase.runTest:220->testit:58 » Verification

There is mirror evaluation code in DefaultMaven:newRepositorySession( MavenExecutionRequest request ) which appears to
duplicate this logic but not quite enough for the ITs to pass.

---

Turning off:

injectProxy( request.getRemoteRepositories(), request.getProxies() );
injectProxy( request.getPluginArtifactRepositories(), request.getProxies() );

in

DefaultMavenExecutionRequestPopulator

Result:

The ITs pass

So the code is not needed so it has been deleted.

---

Turning off:

injectProxy( request.getRemoteRepositories(), request.getProxies() );
injectProxy( request.getPluginArtifactRepositories(), request.getProxies() );
injectAuthentication( request.getRemoteRepositories(), request.getServers() );
injectAuthentication( request.getPluginArtifactRepositories(), request.getServers() );

in

DefaultMavenExecutionRequestPopulator

Result:

The ITs pass

The code in DefaultMaven:newRepositorySession( MavenExecutionRequest request ) appears to populate proxies and authentication correctly. The injectAuthentication code has been deleted.

---

This is also perfunctory in DefaultMavenExecutionRequestPopulator after tracing through it:

request.setRemoteRepositories( getEffectiveRepositories( request, request.getRemoteRepositories() ) );
request.setPluginArtifactRepositories( getEffectiveRepositories( request, request.getPluginArtifactRepositories() ) );
2015-02-08 22:26:48 -05:00
Igor Fedorenko d745f8c475 MNG-5762 populate plugin repositories in ExecutionRequestPopulator
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-04 22:26:16 -05:00
Robert Scholte 3c63c3b547 [MNG-5605] ssh-wagon hangs
Verify there's no regression with this SNAPSHOT
2015-01-29 20:33:44 +01:00
Robert Scholte 786285f1f4 Add @Override on matching methods 2015-01-24 20:45:25 +01:00