Commit Graph

2853 Commits

Author SHA1 Message Date
Anton Tanasenko 9f7971dadb MNG-5805: Fix NPE in LifecyclePhase#toString()
Signed-off-by: Jason van Zyl <jason@tesla.io>

closes #62
2015-09-11 18:36:02 -04: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
Anton Tanasenko 3677220f6e MNG-5805: Restore binary compatibility
Signed-off-by: Jason van Zyl <jason@tesla.io>
2015-07-20 13:54:53 -04:00
Karl Heinz Marbaise 15223116a6 Fixed URL's to issue tracking after transition to
Apache Software Foundation.
2015-07-19 09:53:50 +02: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
Kristian Rosenvold cfd1fbe613 More java7. Bye bye 2006 2015-06-20 15:21:10 +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
Florencia Tarditti a0babcecae Fixed typo in error output
Signed-off-by: Karl-Heinz Marbaise <khmarbaise@apache.org>
2015-05-07 01:02:15 +02:00
Jason van Zyl 4567c8319e MNG-5818: Disallow the programmatic injection of project dependencies
The first step here is deprecating the publicly accessible method that allows
plugins to inject dependencies. The only plugin I currently know of that does
this is the cobertura-maven-plugin. Looking at that plugin it appears the user
can specify the cobertura dependency for the instrumentation process but if
they do not the plugin attempts to inject the dependency. I believe the path
forward here is making sure these types of plugins instruct their users to
add the dependency explicitly.

I'm going to try and create a call-graph for all of Maven Central with my
first test to see if I can accurately detect all usages of MavenProject.setDependencyArtifacts
of artifact in Maven Central.
2015-04-30 21:39:28 -04:00
Anton Tanasenko 1d148be82b MNG-5805: Custom packaging types: configuring DefaultLifecycleMapping mojo executions
Signed-off-by: Jason van Zyl <jason@tesla.io>
2015-04-27 17:28:37 -04: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 6c53bbb293 Remove the use of more deprecated methods 2015-04-16 08:39:36 -04:00
Jason van Zyl 7d5ca3e5b3 Add another deprecated method 2015-04-16 08:39:35 -04:00
Jason van Zyl 56e6db1231 MNG-5795: Maven extensions can not be retrieved from authenticated repositories 2015-04-02 00:49:50 -04:00
Igor Fedorenko 9f50eabea5 MNG-5793 do not register same realm both with plugin and extensions realm caches
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-03-25 15:43:47 -04:00
Hervé Boutemy 4f553420c7 added @since info 2015-03-22 13:47:24 +01: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 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
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
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 368516c2aa Change version from 3.2.6-SNAPSHOT to 3.3.0-SNAPSHOT 2015-03-04 10:58:05 -08: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
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 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 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
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 4b263106db [MNG-5755] Access toolchains without maven-toolchain-plugin
Added List<Toolchain> getToolchains( MavenSession session, String type, Map<String, String> requirements ) to ToolchainManager
2015-01-18 16:53:56 +01:00
Robert Scholte b6ae8ef8ab [MNG-5754] Toolchains should be read during initialization
DefaultToolchainManagerPrivate now uses toolchains from MavenExecutionRequest
2015-01-17 17:24:00 +01:00
Robert Scholte f75008743b [MNG-5754] Toolchains should be read during initialization
MavenExecutionRequest has been extended with toolchains, which is filled by MavenCli
Interfaces have been extended with new methods, assuming only Maven provides implementations
2015-01-17 15:45:53 +01:00
Robert Scholte 99f763decd Add junit tests for DefaultToolchainsBuilder and ToolchainsBuildingException 2015-01-16 13:24:57 +01:00
Jason van Zyl 36d491a648 MNG-5753: Allow plugin implementors to choose how they want the configuration created for a particular MojoExecution 2015-01-15 15:16:59 -05:00
Robert Scholte 32053c99d7 Add junittests for DefaultToolchain
Implement toString() for better log messages
2015-01-12 23:23:31 +01:00
Robert Scholte 3e133902fb Additional unittests for DefaultToolchainManagerPrivate
Remove unnecessary null checks for Lists
Improve javadoc
2015-01-11 22:02:14 +01:00
Robert Scholte 2d0ec94269 [MNG-5716] Add unittests for DefaultToolchainManagerPrivate 2015-01-10 22:58:24 +01:00
Igor Fedorenko bb4988496a better plugin/extensions realm parent classloader
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-01-08 08:08:47 -05:00
Tibor17 3a6f63345c [MNG-5702] Final Fields on DefaultMavenExecutionResult.java 2015-01-02 20:20:26 +01:00
Tibor17 4d33358be2 [MNG-5702] Final Fields on DefaultMavenExecutionResult.java 2015-01-02 20:01:20 +01:00
Karl Heinz Marbaise 6f0318ed68 [MNG-5702] Wrong reactor summary output while using -T option
Fixed checkstyle reported errors.
2014-12-31 11:34:27 +01:00
Karl Heinz Marbaise cb91332d3d [MNG-5702] Wrong reactor summary output while using -T option
Changing into a better solution which doesn't change the
 implemented type of Map but use a synchronized one.
2014-12-31 11:25:55 +01:00
Karl Heinz Marbaise 3b671d0734 [MNG-5702] Wrong reactor summary output while using -T option
Fixed by using ConcurrentMap instead non synchronized ones.
2014-12-29 14:33:47 +01:00
Igor Fedorenko 6ab41ee8d3 MNG-5742 fixed null ComponentDescriptor#realm for extensions plugins
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-12-26 13:27:51 -05:00
Hervé Boutemy c239f6ea6f [MNG-5748] keep builderId on copy 2014-12-26 17:24:39 +01:00
Hervé Boutemy 328a777cd5 [MNG-5747] keep useLegacyLocalRepositoryManager on copy 2014-12-26 17:19:40 +01:00
Igor Fedorenko 1420d61c05 MNG-5742 fixed duplicate plugin realms when extensions=true
Consolidated plugin realm setup logic in DefaultMavenPluginManager.
Extensions realm is fully setup during project loading and the same
realm is used to both load extensions and execute plugin goals now.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-12-25 13:31:29 -05:00
Robert Scholte dbecf3b5cd Rename package so it has same structure as settings and model 2014-12-25 15:55:13 +01:00
Robert Scholte ceae922653 [MNG-3891] Modify maven-toolchain to look in ${maven.home}/conf/toolchains.xml and in ${user.home}/.m2/toolchains.xml
Also added new cmdline option: -gt / --global-toolchains
2014-12-25 14:55:02 +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
Hervé Boutemy 0252eb2a1f updated unit test 2014-12-13 18:09:45 +01:00
Hervé Boutemy 61f1d01ba8 since this class is new, immediately mark it package protected: it is
the implementation of JavaToolchain interface (even if the interface is
empty at the moment)
2014-12-13 17:52:31 +01:00
Hervé Boutemy 6f1bc80f3e added a notice about internal API 2014-12-13 15:18:31 +01:00
Igor Fedorenko d6e45a5d56 MNG-5719 reintroduced DefaultJavaToolChain
DefaultJavaToolChain was the only way to access JDK toolchain
javaHome parameter and was used by some clients, notably Tycho.
The class is now marked as deprecated and clients are adviced to
use JavaToolchainImpl instead.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-12-13 08:42:07 -05: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
Igor Fedorenko 369889296e introduced RepositorySessionDecorator
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-11-25 19:11:00 -05:00
Igor Fedorenko c15226f13f decoupled project #file and #basedir to allow pom.xml processing
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-11-25 19:11:00 -05:00
Igor Fedorenko 8643e00993 introduced ProjectArtifactFactory component
this hides use of deprecated/legacy ArtifactFactory and allows custom
project dependency artifact creation logic.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-11-25 19:11:00 -05:00
Igor Fedorenko ce6f0bfdb5 MNG-5727 fixed cryptic exception when managed depenency has no <version>
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-11-25 19:11:00 -05:00
Robert Scholte 5c84bd33ba [MNG-5714] Add Merger for Maven Toolchain 2014-11-25 22:40:18 +01:00
Michael Osipov 0343c52601 Trimmed trailing whitespace 2014-11-23 13:04:30 +01:00
Hervé Boutemy b1b80f61a4 improved explanations 2014-11-15 02:50:38 +01:00
Hervé Boutemy e661aa87f5 improved javadoc and Java toolchain implementation class name (not a
Plexus component, then DefaultComponentName convention doesn't apply)
2014-11-08 22:43:09 +01:00
Hervé Boutemy 36d746789d make algo more visible 2014-11-08 21:53:16 +01:00
Hervé Boutemy bdf5770f95 improved documentation 2014-11-05 01:36:24 +01:00
Hervé Boutemy aef3b36c0e renamed DefaultJavaToolchainFactory to JavaToolchainFactory to ease
understanding: there is no JavaToolchainFactory Plexus component
2014-11-05 01:32:21 +01:00
Hervé Boutemy eddfef3394 improved javadoc 2014-11-05 01:24:32 +01:00
Hervé Boutemy b8d220c686 prepare provides before configuration, to follown descriptor logic 2014-11-05 01:23:26 +01:00
Hervé Boutemy 44174308a6 [MNG-5719] take the case change into account 2014-11-04 01:10:56 +01:00
Hervé Boutemy b013d97ceb [MNG-5719] renamed JavaToolChain to JavaToolchain for consistency and
removed its Plexus component declaration
2014-11-04 00:58:27 +01:00
Robert Scholte fa4f7040ad [MNG-5718] Change 'provides' from Object to Properties in toolchains.xml 2014-11-03 23:10:06 +01:00
Robert Scholte 01a879384c Add tests for equals() and hashCode() 2014-11-02 22:34:19 +01:00