Commit Graph

11739 Commits

Author SHA1 Message Date
Hervé Boutemy 7bd5fb38b3 deploy master, 3.8.x and 3.9.x 2022-05-31 09:19:44 +02:00
Michael Osipov 3d45167203 [MNG-7488] Upgrade SLF4J to 1.7.36 2022-05-30 23:07:00 +02:00
Guillaume Nodet 7da0214d1d [MNG-7476] Display a warning when an aggregator mojo is locking other mojos executions
# Conflicts:
#	maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
2022-05-30 13:29:43 +02:00
Guillaume Nodet 2a276d0dcf [MNG-7487] Fix deadlock during forked lifecycle executions
# Conflicts:
#	maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java

# Conflicts:
#	maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
2022-05-30 13:15:06 +02:00
Guillaume Nodet 6767f2500f [MNG-7486] Create a multiline message helper for boxed log messages
This closes #746
2022-05-29 13:35:24 +02:00
Karl Heinz Marbaise 3ad4fe5a1a [MNG-7448] Don't ignore bin/ otherwise bin/ in apache-maven module cannot be readded
This closes #742
2022-05-27 22:05:38 +02:00
Tamas Cservenak fc1962e659
[MNG-7478] Transport selection should use config properties (#739)
Instead of user properties, as this allows making "permanent" the
selection by using MAVEN_OPTS and other places as well. Currently
only via command line works.

Also, do not modify existing Maven behavior, so introduce "default" branch
in selection. See comment in code
2022-05-17 08:54:29 +02:00
Guillaume Nodet ef1c17f62a
[MNG-7405] Update animal-sniffer to 1.21 (#671) 2022-05-13 08:01:08 +02:00
Tamas Cservenak a83ed86c48 [MNG-7471] Make Resolver util and connector-basic provided (#732)
Problem: resolver spi, impl and connector-basic has changes in 1.8.0 (SPI interface RepositoryLayout got new method, that is implemented in connector-basic, and code from impl is using it). But, Maven core exports only resolver api, spi and impl packages, while the rest is at mercy of a plugin. This means ,that these artifacts (api, spi and impl) will always come from Maven core, whatever version plugin declares, while the "rest" (connector-basic and util) will be of version that plugin declares. The current state hence prevented ANY KIND of changes on SPI interfaces that would be implemented in connector-basic (which is the case in Resolver 1.8.0).

Solution: make all these resolver artifacts "provided" (to behave like maven-core or maven-plugin-api is behaving): simply put, whatever resolver artifact plugin depends on, it should NOT use it's own version, but the version from Maven. This ensures that api-spi-impl-connector-basic as "aligned" and are same version.

Details:

The change is to make util is exportedArtifact AND exportedPackage, while connector-basic is only exportedArtifact.

Reasoning:
* exportedArtifact -- prevents "own" artifact to be added to realm
* exportedPackage -- makes it "visible" in realm

So, this basically prevents bad versions of util and connector-basic
enter the plugin realm (as they will be not added to it), while
util remains "visible" to plugins, as the intent was, most
common due GenericVersions etc.

This change also results in simpler expectations to plugin developers:
resolver libraries should really behave like maven-core or maven-compat:
when plugin declares dependency on these (w/ scope provided as best
practice), they really get version of these that are of version that
maven runs in, not version they declare. So same thing happens now with
resolver: you will get same version of resolver that maven uses your plugin
runs in.

Before this change, it was a mixed bag: api, spi and impl was from maven,
while util and connector-basic was version you pulled in as dep.
2022-05-11 16:09:52 +02:00
Guillaume Nodet 1c22f94522 [MNG-7459] Revert "[MNG-7347] SessionScoped beans should be singletons for a given session (#621)"
This reverts commit faf5d5d274.
2022-05-09 10:11:54 +02:00
Slawomir Jaranowski 3dd0afd897 [MNG-7464] Warn about using read-only parameters for Mojo in configuration 2022-05-05 21:12:25 +02:00
Hervé Boutemy 1e95011a30
configure Jira integration 2022-05-02 17:37:27 +02:00
Giovanni van der Schelde 93196d4bb7 [MNG-7404] Drop deprecated prefixless expressions
Fixed failing unit tests to use the 'project.' prefix and removed legacy
unit tests that tested support for prefixless expressions.

Closes #696.
2022-04-27 20:12:57 +02:00
Tamas Cservenak ca9aa8f4f3
[MNG-7466] Align assembly XSD version with plugin used (#728)
As title says, XSD is ancient old 2.0.0, while all
latest assembly plugins uses 2.1.0.

Not that this matters or changes anything at all,
this is more about correctness.
2022-04-27 15:14:24 +02:00
Slawomir Jaranowski 702f52d0ea [MNG-7457] Warn about deprecated plugin Mojo 2022-04-24 09:57:10 +02:00
Slawomir Jaranowski 9ac2d08dc7 [MNG-5222] Improvement in deprecated params detection 2022-04-23 09:24:22 +02:00
Tamas Cservenak bdfd8de968 Drop Java 16 from matrix
8, 11 and 17 is good enough
2022-04-22 18:19:28 +02:00
Tamas Cservenak 3fef9c685d
[MNG-7453] Update Resolver to 1.8.0 (#723)
Updates Maven Resolver to latest 1.8.0.
2022-04-22 16:51:12 +02:00
Tamas Cservenak 551009ab49
[MNG-7454] Include resolver-transport-http in Maven (#720)
Addendum to be2b7f890d98af20eb0753650b6605a68a97ac05:
* fix property name to align with existing ones
* fix logging configuration as no more shaded httpClient
* fix constant names
2022-04-16 18:19:23 +02:00
Hervé Boutemy 643d1e7828 [MNG-7438] add execution id to "configuring mojo" debug message
[DEBUG] Configuring mojo execution
'org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M5:test:default-test'
with basic configurator

rephrase "Configuring" to "Loading" mojo "from plugin realm"
to differentiate from "configuring mojo" = apply configuration

rename populatePluginFields(..) private method
to populateMojoExecutionFields(..) to better match the intent
2022-04-15 18:42:02 +02:00
Tamas Cservenak be2b7f890d
[MNG-7454] Include resolver-transport-http in Maven (#711)
But keep Wagon as default transport. This PR merely includes
resolver http and file transport and switches wagon-http
to non-shaded one.

Changes:
* switch to non-shaded wagon-http (as httpClient is now shared)
* include resolver http and file transport
* override resolver default behaviour (native transport preferred over wagon, when both on classpath)
* provide simplistic means to choose transport

The chosen transport can be seen in debug (-X) output on line
`[DEBUG] Using transporter XXX...`

The `-Dmaven.transport` simplistic switch can be used to choose transport:
* not set: default, that is Wagon
* `wagon`: explicitly sets Wagon
* `resolver`: explicitly sets resolver native transports (file and http)
* `auto`: relies on resolver "auto discovery" (priorities, etc). This is MUST to keep transport pluggable with 3rd party transports. In fact, this was the default so far in Maven, along with the fact that native resolver transports were not included (as resolver prefers native ones over Wagon).
2022-04-13 12:51:37 +02:00
Gabriel Belingueres c99028b9fb [MNG-5222] Maven 3 no longer logs warnings about deprecated plugin parameters
- Added warning when setting deprecated parameter with value different
than the default.
- Changed Logger to SLF4J.
2022-04-12 20:49:24 +02:00
Tamas Cservenak bdb35f2deb [MNG-7432] Resolver session contains non-MavenWorkspaceReader
As Resolver session contains non-MavenWorkspaceReader, the reactor models (already resolved w/ profiles applied) are re-built when using Resolver within Mojo, instead to get them via ReactorReader as expected. The rebuilt models will lack explicit (-P on CLI) profiles applied, as resolver itself is not maven aware, hence there is no way to "tell" resolver to apply them. Building reactor models w/ profiles applied is NOT done using resolver, but by Maven when loading up reactor, as profiles are NOT applied for downstream transitive dependencies (see discussion on MNG-1388 why).

Signed-off-by: Christoph Läubrich <christoph@laeubi-soft.de>
Co-authored-by: Christoph Läubrich <christoph@laeubi-soft.de>
Co-authored-by: Tamas Cservenak <tamas@cservenak.net>
2022-04-08 10:46:30 +02:00
Tamas Cservenak d14bb3b8d3 [MNG-7441] Update version of loback
This issue is fluke, as logback is actually optional
dependency, but still, to cut reports like these from
root, let's do this update.
2022-04-08 10:06:56 +02:00
Karl Heinz Marbaise 896c707d32
[MNG-7447] - Several Improvements by using Stream API 2022-04-04 20:39:14 +02:00
Jacky d92538b80f
[MNG-7445] - Refactoring, remove the useless line
Contribution by JakcyHu Gakiii

Signed-off-by: Karl Heinz Marbaise <khmarbaise@apache.org>
2022-04-01 22:20:38 +02:00
Hervé Boutemy e85ff889b3 [MNG-7413] fix anchor for XML elements with same name but not content 2022-03-27 14:28:04 +02:00
Guillaume Nodet 31193cbf0c
[MNG-7391] Fix MojosExecutionStrategy lookup to be able to look into the SessionScope (#693) 2022-03-15 06:56:07 +01:00
Michael Osipov 7c79e634ce Update DOAP with Maven 3.8.5 release 2022-03-13 13:04:19 +01:00
Guillaume Nodet 97c1e4b4aa
Remove unused test which should have been removed with MNG-7047 (#686) 2022-03-09 13:44:01 +01:00
Guillaume Nodet b3d5c12c7a
[master][MNG-7350] Introduce a factory for ModelCache (#629)
* [MNG-7350] Introduce a factory for ModelCache
* [MNG-7350] Introduce a factory for ModelCache
Fix missing javadoc and binding
2022-03-09 13:29:51 +01:00
Hervé Boutemy 8e5676c84a
[MNG-7391] add execution strategy+runner required by Maven Build Cache (#661)
* [MNG-7391] add execution strategy+runner required by Maven Build Cache
* Fix previous commit
* Fix javadoc
* Fix checkstyle
Co-authored-by: Guillaume Nodet <gnodet@gmail.com>
2022-03-09 11:35:05 +01:00
Michael Osipov e8c35ae4ab [MNG-7206] Properly prioritize JVM options from MAVEN_OPTS and jvm.config
This closes #638
2022-03-05 23:52:54 +01:00
Arturo Bernal 48fc4c9937 [MNG-7299] Simplify conditional expressions
This closes #583
2022-03-05 23:32:14 +01:00
Arturo Bernal 20b6cec44a [MNG-7304] Use try-with-resources statement
This closes #589
2022-03-05 23:28:12 +01:00
Michael Osipov 1fff17398e [MNG-7428] Upgrade Maven Parent to 35 2022-03-05 23:18:21 +01:00
Michael Osipov e1d359aa6d [MNG-7330] Revert MNG-7329 2022-03-05 23:11:48 +01:00
Michael Osipov 48be53abbc [MNG-7428] Upgrade Maven Parent to 35 2022-03-03 13:19:24 +01:00
Maarten Mulders 09e51544df Remove unused import 2022-03-03 10:40:03 +01:00
Michael Osipov 83bbbb3cfb [MNG-6960] Use RuntimeInformation instead of reading properties
This closes #685
2022-02-27 19:27:25 +01:00
Karsten Thoms 5394e750d9 (refactoring) Resolve usage of deprecated method
Replace usage of
  MavenExecutionRequest#getSelectedProjects()
by
  MavenExecutionRequest#getProjectActivation().getOptionalActiveProjectSelectors()

Signed-off-by: Karsten Thoms <karsten.thoms@karakun.com>

This closes #664
2022-02-27 12:58:35 +01:00
Tomi Pakarinen 1e33a57264 [MNG-5180] Versioning's snapshot version list is not included in metadata merge
Co-authored-by: Konrad Windszus <kwin@apache.org>

This closes #681
2022-02-27 12:09:17 +01:00
Christoph Läubrich e327be3d85 [MNG-7402] BuildListCalculator never detaches the classloader
This closes #683
2022-02-26 21:38:56 +01:00
Sylwester Lachiewicz 69d6c6d5a2 [MNG-7417] Several classes do not set properties properly for building requests
This closes #306
2022-02-20 19:17:47 +01:00
Martin Kanters 03df5f7c63 [MNG-7390] Allow selecting modules outside the cwd into the reactor using --projects
This closes #677
2022-02-19 23:59:40 +01:00
Giovanni van der Schelde b2a21f12f8 [MNG-7244] Remove deprecated WARNING for usage of pom.X placeholders
This closes #678
2022-02-19 23:05:27 +01:00
Christoph Läubrich 2798ee9196 [MNG-7395] Support interpolation in extensions.xml
This adds support for property interpolation in extensions.xml to allow
advanced use cases where one wants to contribute certain things via the
commandline.

This closes #665
2022-02-19 22:01:10 +01:00
Christoph Läubrich 62cf29bab3 [MNG-7407] Introduce a ModelVersionProcessor component to make CI Friendly Versions pluggable
This closes #675
2022-02-19 17:49:59 +01:00
Maarten Mulders 0be5e406d7 [MNG-7406] Do not include formatted details in Exception message
Closes #672
2022-02-16 22:11:52 +01:00
Tamas Cservenak cc51006f29
[MNG-6776] Inconsistent list of parameters for MojoDescriptor (#584)
It may lead to confusion as parameters (list) and
parametersMap (map) may "fall apart" easily.

Also, parametersMap did not honor parameter
ordering while parameters list makes it look
that order is important.
Simply, rebuild the map always and retain
ordering as well.

Added UT and also removed some cruft provided
by java8.

---

https://issues.apache.org/jira/browse/MNG-7309
2022-02-14 12:26:51 +01:00