Commit Graph

722 Commits

Author SHA1 Message Date
Tamas Cservenak e9d570889f Reformat 2023-01-31 10:22:08 +01:00
Michael Osipov 4e8773bc44 [MNG-7658] CI-friendly versions should only come from/rely on user properties
This closes #945
2023-01-01 21:10:52 +01:00
Pavel Horal 86d6e2aeff [MNG-7648] Fix locationTracking in DefaultModelBuildingRequest copy constructor (#940)
- Fix locationTracking in DefaultModelBuildingRequest copy constructor
- Add location tracking unit test
2023-01-01 13:41:09 +01:00
Slawomir Jaranowski 693814f0a5 [MNG-7613] Parent POM 38 - code reformat 2022-12-02 12:54:12 +01:00
Tamas Cservenak 4c95a50332
[MNG-6609] Profile activation based on packaging (#883)
In short: do NOT set request.setRawModel as NOTHING sets it. The Maven4 vs Maven3 is different, in Maven 3 NOTHING calls request.setRawModel

Full explanation: as ModelBuildingRequest is REUSED, and nothing sets this value in Maven3, once you set it here (as in original PR https://github.com/apache/maven/pull/849 ) results in awkward situation in Maven3: it will not load any other model...

---

https://issues.apache.org/jira/browse/MNG-6609
2022-12-01 12:51:18 +01:00
Tamas Cservenak 36ff9a65e6 Revert "[MNG-6609] Maven 3.9: profile activation by packaging (#849)"
This reverts commit e921f1564e.
2022-11-28 09:06:29 +01:00
Konrad Windszus e921f1564e
[MNG-6609] Maven 3.9: profile activation by packaging (#849)
Generate raw model before profile activation context is generated
2022-11-27 16:49:43 +01:00
Michael Osipov 0f4387543d [MNG-7556] Clean up notion between user properties and system properties 2022-10-29 20:19:49 +02:00
Sylwester Lachiewicz 2f7dfcfe82 [MNG-7502] Upgrade to Guice 5.1.0
(cherry picked from commit 5502c0c8db)
2022-09-11 10:00:07 +02:00
Karl Heinz Marbaise c604db3c3a
[MNG-7447] - Several Improvements by using Stream API 2022-04-05 21:24:58 +02:00
boris-unckel e1b46e2339 [MNG-7068] Active dependency management for Google Guice/Guava
This closes #462
2022-03-06 20:46:56 +01:00
Michael Osipov 78ca83e2a4 Bump version to 3.9.0-SNAPSHOT 2022-03-06 10:46:56 +01:00
Michael Osipov 0a6f12fba1 [maven-release-plugin] prepare for next development iteration 2022-03-05 12:41:16 +01:00
Michael Osipov 3599d3414f [maven-release-plugin] prepare release maven-3.8.5 2022-03-05 12:41:04 +01:00
Christoph Läubrich 2bb1228de6 [MNG-7407] Introduce a ModelVersionProcessor component to make CI Friendly Versions pluggable
This closes #674
2022-02-19 17:51:35 +01:00
Guillaume Nodet d79485ff23
[MNG-6727] Using version range in parent and CI Friendly Version fails 2022-02-01 14:26:54 +01:00
Michael Osipov f4fd031828 Fix checkstyle issue 2022-01-06 22:26:58 +01:00
Ravil Galeyev 0f3c39b8ed [MNG-6802] FileProfileActivator changes FileProfileActivator.exists which lets flattened resolveCiFriendliesOnly depending fail activating profile
Cherry picked from 3fabb639a3

This closes #649
2022-01-06 18:50:10 +01:00
Michael Osipov 8af0a674db [maven-release-plugin] prepare for next development iteration 2021-11-14 10:14:54 +01:00
Michael Osipov 9b656c72d5 [maven-release-plugin] prepare release maven-3.8.4 2021-11-14 10:14:42 +01:00
Michael Osipov 21e597ec77 [maven-release-plugin] prepare for next development iteration 2021-09-27 20:28:37 +02:00
Michael Osipov ff8e977a15 [maven-release-plugin] prepare release maven-3.8.3 2021-09-27 20:28:25 +02:00
Michael Osipov d1aa1e1f0a [MNG-7252] Fix warnings issued by dependency:analyze
This closes #541
2021-09-16 11:54:33 +02:00
Michael Osipov 383cabf9e4 [MNG-7216] [Regression] Revert MNG-7170
This reverts commit 5a89973126.

This closes #524
2021-09-12 16:42:13 +02:00
Michael Osipov 865dcaa6ff [maven-release-plugin] prepare for next development iteration 2021-08-04 21:03:42 +02:00
Michael Osipov ea98e05a04 [maven-release-plugin] prepare release maven-3.8.2 2021-08-04 21:03:30 +02:00
Guillaume Nodet b74199ed44 [MNG-7034] StackOverflowError thrown if a cycle exists in BOM imports
This closes #484
2021-07-23 19:58:08 +02:00
Artem Krosheninnikov 9ae1d95a58 [MNG-6844] Use StandardCharsets and remove outdated @SuppressWarnings
This closes #312
2021-07-02 14:53:16 +02:00
Artem Krosheninnikov a659ade9a0 [MNG-6827] Replace deprecated StringUtils#defaultString() from Plexus Utils
This closes #302
2021-07-02 10:46:56 +02:00
Mickael Istria 5a89973126 [MNG-7170] Allow to associate pomFile/${basedir} with DefaultProjectBuilder.build(ModelSource, ...)
Actually a subset backport of MNG-5669 (5cdb8332f9)

Also-By: rfscholte <rfscholte@apache.org>

This closes #478
2021-06-27 00:33:40 +02:00
Michael Osipov a9f337fd63 [MNG-6937] StringSearchModelInterpolatorTest fails on symlinked paths
Don't compare baseDir in a canonical form when the second comparing value
(System.getProperty( "user.dir" )) is not canonicalized.

This closes #361
2021-06-26 22:46:59 +02:00
碎镜 2f144dec13 [MNG-6819] Fix NullPointerException in StringVisitorModelInterpolator
Closes #301
2021-06-26 21:59:19 +02:00
rfscholte 5213f43df1 [maven-release-plugin] prepare for next development iteration 2021-03-30 19:15:13 +02:00
rfscholte 05c21c65bd [maven-release-plugin] prepare release maven-3.8.1 2021-03-30 19:14:35 +02:00
Hervé Boutemy a46906806a next version in branch 3.8.x is 3.8.1-SNAPSHOT 2021-03-24 19:33:13 +01:00
rfscholte dad8a3e1c5 [maven-release-plugin] prepare for next development iteration 2021-03-21 22:31:55 +01:00
rfscholte 6aa1f4acf5 [maven-release-plugin] prepare release maven-3.8.0 2021-03-21 22:31:24 +01:00
Hervé Boutemy a96fd11b1f [MNG-3220] fix doc: dependencyManagement import require scope import 2021-03-16 18:00:20 +01:00
Michael Osipov e2891667dd Bump version to 3.8.0-SNAPSHOT 2021-03-16 17:59:50 +01:00
rfscholte cecedd3430 [maven-release-plugin] prepare release maven-3.6.3 2019-11-19 20:17:06 +01:00
Christian Wansart 0c7c69f78b [MNG-6778] - Use https for maven schemaLocations 2019-11-07 16:16:39 +01:00
Hervé Boutemy 3a80ae08aa [MNG-6799] deprecate StringSearchModelInterpolator and remove @Named 2019-11-07 13:30:45 +01:00
rfscholte 07ab962c85 [MNG-6765] tycho pom-less builds fails with 3.6.2 2019-10-19 18:23:57 +02:00
Enrico Olivelli d9a0eee7fe [maven-release-plugin] prepare for next development iteration 2019-08-27 16:59:23 +02:00
Enrico Olivelli 40f5233313 [maven-release-plugin] prepare release maven-3.6.2 2019-08-27 16:59:01 +02:00
tibordigana 829a2c9aae small refactoring in StringSearchModelInterpolator (removed unnecessary 'public' modifier in private class, inlined variable declaration in loop - not reachable after the loop) 2019-08-11 11:46:28 +02:00
tibordigana b893c3eca4 small refactoring in StringSearchModelInterpolator (removed unused variables, removed too open modifier 'protected') 2019-08-11 11:32:11 +02:00
tibordigana 203cfc67cc [MNG-6729] StringSearchModelInterpolator introspects objects from Java API 2019-08-09 16:00:03 +02:00
Guillaume Nodet 690841e9be [MNG-6697] New fast model interpolator not using reflection (#261)
* [MNG-6697] New fast model interpolator not using reflection

* [MNG-6697] Fix management key in case a field has been modified

* [MNG-6697] Remove the unused FIELDS_CACHE and make the InnerInterpolator private

* [MNG-6697] Clean up the code to remove a few warnings
2019-07-24 12:30:12 +10:00
Guillaume Nodet 53f04f03e3 [MNG-6705] Speep up Artifact version check and Parent interpolation
This closes #260
2019-07-10 21:29:23 +02:00
Guillaume Nodet 9b8ae7d528 [MNG-6702] Improve DefaultModelValidator performance:
Avoid tons of string concatenations that are done but usually not used

This closes #268
2019-07-10 21:27:36 +02:00
Joseph Walton 4fa882c30f [MNG-6703] DefaultUrlNormalizer doesn't normalize all relative URIs
* Switch behaviour on relative URIs to match Path#normalize()
* Adopt RFC 3986 behaviour for traversal past the root
* Add a test that this isn't applied to relative URI references

This closes #264
2019-07-10 11:56:42 +02:00
AElMehdi 8da81ce73c [MNG-6701] Document maven.repo.local property
This closes #265
2019-07-06 18:15:49 +02:00
Joseph Walton 353d3eaa8f [MNG-6685] Convert Maven Model Builder to JSR 330
This closes #256
2019-06-23 00:20:54 +02:00
Stefan Oehme 8f1cac0b1c [MNG-6671] Upgrade Modello to 1.11 2019-06-10 15:18:30 +02:00
Michael Osipov 92b5191726 Revert "Modello changes"
They weren't properly squashed and worded.

This reverts commit 5035837094.
This reverts commit 8aaeb8adf5.
2019-06-10 13:55:38 +02:00
Stefan Oehme 8aaeb8adf5 [MNG-6581] - Update to latest Modello plugin version 2019-06-10 11:08:29 +02:00
Stephen Connolly 01405a2d60
[MNG-6667] Enhance the error reporting when trying to build a modelVersion that the current Maven doesn't understand 2019-06-03 21:33:44 +01:00
Hervé Boutemy 5350ed8a1f [MNG-6644] don't fail if no input location tracking available
this can happen when the POM is not parsed by Maven core from XML
2019-04-28 19:42:25 +02:00
Stefan Oehme baed5a294f [MNG-6629] - Make ID validation faster
Use a simple list of allowed characters instead of a regex.
2019-04-27 18:03:20 +02:00
Karl Heinz Marbaise 5222f03d05
[maven-release-plugin] prepare for next development iteration 2019-04-04 20:56:37 +02:00
Karl Heinz Marbaise d66c9c0b31
[maven-release-plugin] prepare release maven-3.6.1 2019-04-04 20:56:16 +02:00
Hervé Boutemy 49c8f17ed4 [MNG-6601] add input location tracking for m-site-p converted reports 2019-03-11 23:44:32 +01:00
Hervé Boutemy 4bec5502d5 [MNG-6600] add inputlocation tracking for default lifecycle executions 2019-03-11 23:44:31 +01:00
Hervé Boutemy 37676a2617 [MNG-6599] use version from parent if necessary, like groupId 2019-03-11 23:44:31 +01:00
Hervé Boutemy bd4a3a0d22 [MNG-6593] track input location for super-pom content 2019-02-17 15:28:39 +01:00
Michael Osipov c674bcfb42 [MNG-6495] ModelResolver cannot be null 2019-02-16 22:37:27 +01:00
Hervé Boutemy 8e5ecf0622 fixed link (that goes to implementation in maven-core) 2019-01-12 18:36:44 +01:00
Michael Warnecke 9c946263fa [MNG-6213] Validate scope in dependencyManagement
This closes #131
2018-12-28 23:45:45 +01:00
Fabiano C. de Oliveira 9f07b0362f [MNG-6261] - using File apis to compare 2018-11-23 23:37:56 -02:00
Sylwester Lachiewicz 78f605e377 [MNG-6515] Fix Javadoc build errors 2018-11-12 17:23:56 +01:00
Hervé Boutemy 07bd5507ae [MNG-6505] tweaked distributionManagement.site inheritance
child.site.url.inherit.append.path is inherited independantly from
id/name/url
2018-11-11 19:30:31 +01:00
Hervé Boutemy f97316ceec [MNG-6505] inherit child.x.y.inherit.append.path values 2018-11-11 19:30:31 +01:00
Hervé Boutemy db462ae0b3 [MNG-6059] renamed attributes to get more flexibility for scm urls 2018-11-11 19:30:31 +01:00
Karl Heinz Marbaise 6e376d424e
[maven-release-plugin] prepare for next development iteration 2018-10-24 20:38:30 +02:00
Karl Heinz Marbaise 97c98ec64a
[maven-release-plugin] prepare release maven-3.6.0 2018-10-24 20:38:06 +02:00
HoaPhan ba74b96633
[MNG-6492] - Minor improvement on Array construction, conversion performance 2018-10-24 18:07:13 +02:00
Sylwester Lachiewicz e4b53d3f2c [MNG-6490] Maven shall not fail reporting circular dependency when the dependency is a classified secondary artifact 2018-10-20 21:27:25 +02:00
Christian Schulte 44826ab446 [MNG-6164] Collections inconsistently immutable
Make non-empty collections returned immutable just like those returned by
java.util.Collections.
2018-10-09 22:12:50 +02:00
Sylwester Lachiewicz 91fa89ea28 [MNG-6479] Upgrade XMLUnit to 2.2.1 (#183) 2018-09-17 07:33:54 +10:00
Hervé Boutemy 2e8e09f25b [MNG-5951] add an option to avoid path addition to inherited URLs
This is done as child.inherit.append.path XML attribute on 3 locations:
- project, for project.url
- project.distributionManagement.site for its url
- project.scm, for the 3 scm urls in one unique config
2018-09-16 16:44:12 +02:00
Phillip Webb 01f098efd1
[MNG-6475] Remove unused Guava dependencies 2018-09-13 20:45:25 +02:00
Karl Heinz Marbaise 396f49d75e
[MGN-6383] - ProjectBuilder unnecessarily rebuilds modules with ci-friendly versions
o Thanks to Christoph Kunze for offering the fix.
2018-07-31 22:13:20 +02:00
rfscholte 72dca39807 Replace org.apache.commons.lang3.Validate#notNull with java.util.Objects#requireNonNull 2018-07-15 10:36:08 +02:00
Stephen Connolly bf0bd6350e Master is now on 3.6.0-SNAPSHOT 2018-06-17 22:38:49 +01:00
Stephen Connolly 1efd571b0a [maven-release-plugin] prepare for next development iteration 2018-06-17 19:29:56 +01:00
Stephen Connolly 1edded0938 [maven-release-plugin] prepare release maven-3.5.4 2018-06-17 19:29:25 +01:00
Christian Schulte 5b4e173f7d [MNG-5940] Change the maven-source-plugin jar goal into jar-no-fork in Maven Super POM
This closes #168
2018-06-10 13:12:53 +02:00
Michael Osipov 8e0efaa107 [MNG-6386] ${project.baseUri} is not a valid URI (according to RFC 3986)
File#toURI()#toString() produces a non-compliant URI making tools like
Subversion or Git to choke on those URIs. Whereas Path#toUri()#toASCIIString()
does the right job.
2018-05-07 22:35:43 +02:00
Stephen Connolly 85b4e3d8e8 [maven-release-plugin] prepare for next development iteration 2018-02-24 19:29:56 +00:00
Stephen Connolly 3383c37e1f [maven-release-plugin] prepare release maven-3.5.3 2018-02-24 19:29:21 +00:00
Sylwester Lachiewicz b8c06e61ab Remove Google Guava usage (move to Java7) 2018-02-11 11:54:17 +01:00
Sylwester Lachiewicz d925081794 Reduce number of global checkstyle rule violations
Fix code for following checkstyle rules:
ConstantName, FileLength, InnerAssignment, JavadocType, MagicNumber, MethodLength, MethodName, NewlineAtEndOfFile, ParameterNumber, RedundantThrows, VisibilityModifier

Fixes #149
2018-02-11 11:41:16 +01:00
Hervé Boutemy 0dc70cc691 upgrade m-site-p to 3.7 + Fluido 1.7 + edit button 2018-02-10 11:42:33 +01:00
Hervé Boutemy cf7b0a3ec0 fixed new issues reported by Checkstyle 6.18 2018-02-10 11:42:33 +01:00
Hervé Boutemy 085ee9f275 [MNG-5992] Upgrade default version of maven-release-plugin to 2.5.3
avoids exposing Git password during release
this fixes #152
2018-02-08 08:02:04 +01:00
Karl Heinz Marbaise 5988085525 [MNG-6342] Emit a WARNING about LATEST/RELEASE in parent 2018-01-19 23:43:59 +01:00
Karl Heinz Marbaise 6b83f7e6bb [MNG-6305] Validation of CI friendly version incorrect
o Followup removed unused declarations.
2017-12-30 22:09:02 +01:00
Karl Heinz Marbaise 2295c17b45 [MNG-6305] Validation of CI friendly version incorrect
o Checkin that only the three expression changelist,
   revision and sha1 are valid in a version.
 o Added some tests.
2017-12-30 21:41:18 +01:00
rfscholte df5169bdf9 [MNG-6330] Parents relativePath not verified anymore 2017-12-29 10:39:45 +01:00