Commit Graph

740 Commits

Author SHA1 Message Date
rfscholte a2f81065ff [MNG-6656] Features must use userProperties instead of systemProperties 2021-07-23 11:21:18 +02:00
rfscholte f582ce88fc [MNG-7047] Validate that repo configuration does not contain any expression 2021-07-21 10:34:43 +02:00
Michael Osipov 78fc3734f9 Trim trailing whitespace 2021-07-02 18:47:10 +02:00
Michael Osipov cbaf7f7b48 Change @since from 3.7.0 to 4.0.0 2021-06-27 00:04:50 +02:00
Sylwester Lachiewicz ab95197436 Fix Checkstyle reported issues with maven-shared-resources 3 2021-05-30 12:00:03 +02:00
Ravil Galeyev 3fabb639a3
[MNG-6802] Fix bug in FileProfileActivator (#347)
* [MNG-6802] FileProfileActivator changes exists

FileProfileActivator changes FileProfileActivator.exists
which lets flattened resolveCiFriendliesOnly depending
fail activating profile.

* [MNG-6802] Add java docs

* [MNG-6802] PR comments fixes

* Make ProfileActivationFilePathInterpolator a class
* call super.tearDown() last

* [MNG-6802] PR comments fixes

* Get rid of reusing local variables
* Rename file-> activationFile
* Move if ( missing ) to try block
* Update javadocs
* Replace string format with concatenation
* Replace FileReader to FileInputStream

* [MNG-6802] Update javadoc

* [MNG-6802] Switch to commons lang3 StringUtils

* [MNG-6802] Switch to commons lang3 StringUtils

* [MNG-6802] Switch to plexus-utils StringUtils back

* [MNG-6802] Switch to plexus-utils StringUtils back

* [MNG-6802] Resolve conflicts

* [MNG-6802] Upgrade tests

* [MNG-6802] Fix for windows

* [MNG-6802] Remove annotation

* [MNG-6802] Create a temp dir

* [MNG-6802] Remove space

* [MNG-6802] Small refactoring

* [MNG-6802] Use JUnit5 tempDir

* [MNG-6802] Use static import

* [MNG-6802] Remove plexus

* [MNG-6802] Remove plexus

* [MNG-6802] Fix checklstyle

* [MNG-6802] Restart build

* [MNG-6802] Restart build

* [MNG-6802] Restart build (last attempt)

* [MNG-6802] Fix PR comments

* [MNG-6802] Refactor try-catch

* [MNG-6802] Fix comments in FileProfileActivatorTest

* [MNG-6802] Use primitive

* [MNG-6802] Push down path
2021-05-15 11:51:15 +00:00
Hervé Boutemy 1b6caed1ea [MNG-6656] rename build+consumer filters to buildToRaw+rawToConsumer 2021-04-04 19:49:51 +02:00
Hervé Boutemy e25cf17d3b [MNG-6656] move to o.a.m.model.transform + .sax 2021-04-04 19:39:05 +02:00
Hervé Boutemy 22954a04ff [MNG-6656] rename maven-xml module to maven-model-transform 2021-04-04 13:24:41 +02:00
Michael Osipov 1e19805097 [MNG-6075] Increase the model validation level to the next minor level version
This closes #455
2021-03-20 15:09:33 +01:00
Hervé Boutemy 612dfddd26 [MNG-3220] fix doc: dependencyManagement import require scope import 2021-03-16 22:27:15 +01:00
Michael Osipov a5c68f7a4a Revert "[MNG-7046] Revert MNG-5639 and make repo config static only"
This reverts commit 8c9c303f9c.
2021-03-13 17:09:40 +01:00
Guillaume Nodet 9e19b57c72 [MNG-7111] Deadlock when reading pom
Signed-off-by: rfscholte <rfscholte@apache.org>
2021-03-13 11:58:02 +01:00
rfscholte aa90370ff4 [MNG-7110] Different behavior of extensions
restore configuration of importRequest
2021-03-12 18:24:13 +01:00
Christian Schulte c3dba0e5ba [MNG-6113] Rename the 'Central Repository' to 'Maven Central Repository' in the 4.0.0 super POM 2021-02-28 20:16:29 +01:00
Hervé Boutemy d740200811 [MNG-7107] relax profile id validation, different from coordinate id 2021-02-26 18:05:25 +01:00
Guillaume Nodet 619973b91c [MNG-7063] Infinite loop using Shade plugin and JUnit 5 dependency
Signed-off-by: rfscholte <rfscholte@apache.org>
2021-02-14 15:52:04 +01:00
Michael Osipov eae3074c63 [MNG-7029] Remove super POM release profile
This closes #411
2021-02-02 17:40:24 +01:00
boris-unckel 1e575a2bd7 [MNG-7068] Active dependency management for Google Guice/Guava
This closes #462
2021-02-02 14:17:43 +01:00
Maarten Mulders 8defd16965 [MNG-7051] Optionally skip non-existing profiles and break on missing required profiles. 2021-02-02 08:20:21 +01:00
Michael Osipov ceb08cfa77 Test for empty locations and avoid printing them 2021-01-30 23:04:46 +01:00
Guillaume Nodet bb916d0784 [MNG-7035] Migrate unit tests to Unit 5
Signed-off-by: rfscholte <rfscholte@apache.org>
2021-01-15 15:07:06 +01:00
Sylwester Lachiewicz b7510d627f [MNG-6909] Convert to JSR330 - use sisu plugin 2021-01-08 03:55:24 +01:00
rfscholte 94612f96fa [MNG-7060] Let build fail fast in case any maven-gpg-plugin goal is called 2021-01-03 13:09:59 +01:00
Michael Osipov 8eda091d4e Replace tabs with proper count of spaces 2020-12-24 19:50:27 +01:00
Michael Osipov 673a7d1fef Trim trailing whitespace 2020-12-24 19:09:10 +01:00
Michael Osipov 8c9c303f9c [MNG-7046] Revert MNG-5639 and make repo config static only
This closes #409
2020-12-24 15:23:59 +01:00
Christian Schulte d2adab7bf3 [MNG-6054] Remove super POM plugin management section
This closes #410
2020-12-24 00:05:32 +01:00
rfscholte 9f88494b60 [MNG-6957] Versionless reactor dependencies/parent should work even if modules are aggregated in reverse order
This closes #391
2020-12-22 16:30:37 +01:00
Guillaume Nodet be8ced6be3 [MNG-7034] StackOverflowError thrown if a cycle exists in BOM imports
This closes #399
2020-12-13 15:10:53 +01:00
Michael Osipov b24c34bb23 [MNG-7041] Update @since, version ranges and other version related strings
This closes #404
2020-11-29 11:23:53 +01:00
rfscholte 3736be9c15 Updating version in preparation for Maven 4 2020-11-27 12:22:47 +01:00
rfscholte a89a3d315d [MNG-6999] prevent potential race condition 2020-11-08 15:16:53 +01:00
rfscholte e7eef9d34f [MNG-6999] Chained (consumer) XMLFilters can result in "floating" comments 2020-10-30 12:39:23 +01:00
rfscholte 2e66809e0e [MNG-6952] Fail early if pom cannot be transformed 2020-07-04 23:27:12 +02:00
rfscholte 65ec04c236 [MNG-6948] Repository files should not pass build-filters 2020-06-29 20:35:31 +02:00
rfscholte bdec668de9 [MNG-6656] Introduce base for build/consumer pom 2020-06-22 21:24:49 +02:00
Michael Osipov ef8c95eb39 [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
2020-06-11 22:16:30 +02:00
Sylwester Lachiewicz b4725dbe06 Fix maven-checkstyle-plugin 3.1.1 reported error
- with maven-shared-resources v3
2020-06-11 20:53:36 +02:00
Sylwester Lachiewicz 8177d3d114 [MNG-6819] Fix also NPE in StringSearchModelInterpolator 2020-05-23 10:07:16 +02:00
Sylwester Lachiewicz be3c4eb406 [MNG-6819] Refactor unit tests for ModelInterpolator 2020-05-23 10:07:16 +02:00
碎镜 14c9e156bc [MNG-6819] Fix NullPointerException in StringVisitorModelInterpolator
Closes #301
2020-05-23 10:07:16 +02:00
Sylwester Lachiewicz 5cf6d6b53d [MNG-6893] Super POM - upgrade maven-antrun-plugin to 3.0.0
Closes #343
2020-05-05 14:24:29 +02:00
Sylwester Lachiewicz eda1b92906 [MNG-6856] Remove dependency to Powermock 2020-05-03 22:09:25 +02:00
Christian Schulte be16fc66b9 [MNG-2478] add "resources-filtered" filtered resource directories to super POM 2020-04-27 22:13:45 +02:00
rfscholte 5cdb8332f9 [MNG-5669] Fix infinitive loop in case pom.xml is being updated during the process (e.g. maven-shade-plugin writing reduced-pom with excluded dependencies) 2020-03-13 09:08:00 +01:00
rfscholte 716cc1fe02 [MNG-5669] same pom.xml is read multiple times 2020-01-29 21:18:42 +01:00
Lipmanpoi e6c897efb6 [MNG-6855] Simplify some code
Closes #279
2020-01-26 11:13:18 +01:00
Sylwester Lachiewicz ace32fdbe0 [MNG-6855] Simplify code - computeIfAbsent() 2020-01-26 11:13:09 +01:00
Rostislav Krasny 1697e7a06b [MNG-6855] Simplify code
- use Integer/Long.compare()
- use List.removeIf()
- remove unused imports
- redundant .toString()

Closes #319
2020-01-26 11:12:53 +01:00
Artem Krosheninnikov ddb454ac83 [MNG-6831] Replace Anonymous classes by lambdas
Closes #303
2020-01-25 22:52:20 +01:00
Artem Krosheninnikov 39492281b2 [MNG-6847] Explicit type can be replaced by the diamond operator
This closes #315
2020-01-13 20:57:35 +01:00
Artem Krosheninnikov 735b72fcf1 [MNG-6844] Use StandardCharsets and remove outdated @SuppressWarnings
This closes #312
2020-01-09 18:09:44 +01:00
Artem Krosheninnikov 1ad780143c [MNG-6827] Replace deprecated StringUtils#defaultString() from Plexus Utils
This closes #302
2019-12-22 12:57:34 +01:00
rfscholte 11b8b2d5d4 [MNG-6824] ModelMerger is broken
Fix modules
Apply Java 8 Functions
2019-12-21 15:03:04 +01:00
Karl Heinz Marbaise f7ca74da53
[MNG-6812] - Remove unused files from maven-embedder 2019-12-07 19:57:14 +01:00
rfscholte ead06d23d4 [maven-release-plugin] prepare for next development iteration 2019-11-19 20:17:36 +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