Commit Graph

15150 Commits

Author SHA1 Message Date
Michael Osipov e2a8db3f02 Remove unneeded exclusion 2023-02-19 15:45:54 +01:00
Andrey Bruykhov b17c968a0b Close stream with try-with-resources
This closes #997
2023-02-17 20:59:36 +01:00
Tamas Cservenak 37474485fe No logic change, just improve logging (#241)
This IT helped a lot to figure out problems around parallel deploy,
and I had locally applied these changes to improve ability to
track down what is actually happening on server side.
2023-02-15 22:32:51 +01:00
Alexey Venderov b82479bf11
[MNG-7689] Check if execution lifecycle phase is not null (#996) 2023-02-15 08:49:39 +01:00
Andrey Bruykhov 7b38457506 Normalize regex patterns
This #990
2023-02-09 18:47:51 +01:00
Andrey Bruykhov 6e25a2674b [MNG-7686] Speed up by replacing non-pattern #replaceAll() with #replace() or precompiled patterns
This closes #984
2023-02-07 21:55:12 +01:00
Andrey Bruykhov ef3cf56b51 Added missing @Deprecated/@deprecated annotations
@Deprecated annotatio is helpful to prevent usage of deprecated API.
For example: developer can see crossed out method/field name if this item
is deprecated.

This closes #985
2023-02-07 20:46:28 +01:00
Tamas Cservenak 769f2f3a47 Add maven 3.9.0 release to doap 2023-02-06 13:05:03 +01:00
Christoph Läubrich 0525d90d42 [MNG-7544] MavenMetadataSource#retrieve(MetadataResolutionRequest) does not check for null when reading from project map
Currently, if a project is returned from the workspace reader, but is not part
of the reactor, a NPE occurs. In this case, the repositories are read from
the model instead.

This closes #981
2023-02-05 13:17:09 +01:00
Tamas Cservenak f9ea10688c
Add bin packages to SHA512 checksumming as well (#978)
Not only src but bin needs SHA512 as well. Plugin now does:
```
[INFO] --- checksum:1.11:artifacts (source-release-checksum) @ apache-maven ---
[INFO] apache-maven-4.0.0-alpha-5-SNAPSHOT-bin.tar.gz - SHA-512 : 2ee4c27ff611852caffab6543582918c06d900da184cdd389e64bae05fb8a2ac959edf27a946c60c9129c87baa6ec593a64d25edf3739339dd3f8d3d7942c7db
[INFO] apache-maven-4.0.0-alpha-5-SNAPSHOT-bin.zip - SHA-512 : 078667f3aad060163cad692eab7ced00fa377ba3a89f43431b23bd5248fc1603d3668cd68a7f096abcbc460ef4fbb47981b6bf5acc236a522e40fd700bb415c6
[INFO] apache-maven-4.0.0-alpha-5-SNAPSHOT-src.tar.gz - SHA-512 : ad2ca325ef138389fa967bde5e176a2447b5dd9e7edfa5cd1bf3f586fd39b93a1d415b55bb41b29e996104a4e14d4ef5fcc0e2c2eff65609121595f2695c96d4
[INFO] apache-maven-4.0.0-alpha-5-SNAPSHOT-src.zip - SHA-512 : 060de415118365954918079c73bf0ecc5d1ea8989b1864b32e3ebccd94306263878805c6d997d6c4a69700ebedd6fe42485a3692570c6466deb5e1be136e3e3e
```
2023-02-01 08:17:09 +01:00
Guillaume Nodet 80bd00c9b0 Add maven 4.0.0-alpha-4 release to doap 2023-01-31 18:16:53 +01:00
Tamas Cservenak 489e4e6526 [MNG-7676] Fix checksum plugin configuration (#977)
Wrong goal is being used that does not honor classifiers. Also,
have to reshuffle the config, move it inside execution otherwise
ASF parent pom execution is NOT overridden.

---

https://issues.apache.org/jira/browse/MNG-7676
2023-01-31 13:22:31 +01:00
Tamas Cservenak dfb406c5b3
Fix site plugin warning (#974)
As date format in these two files were not parsed.
2023-01-30 16:20:35 +01:00
Guillaume Nodet 41429b15ab
[MNG-7673] IllegalArgumentException thrown for invalid checksum 'never' (#972) 2023-01-30 15:11:30 +01:00
Guillaume Nodet 30fafa6741
[MNG-7672] Fork should only execute the project and its submodules (#968) 2023-01-30 15:08:08 +01:00
Guillaume Nodet fbeefb85ab [maven-release-plugin] prepare for next development iteration 2023-01-27 16:33:47 +01:00
Guillaume Nodet 009cf4a721 [maven-release-plugin] prepare release maven-4.0.0-alpha-4 2023-01-27 16:33:38 +01:00
Guillaume Nodet f153ac134c
[MNG-7598] Fix compatibility issues with toolchains and settings (#971)
* Split the header on two lines
* Properly delegates equals/hashCode to the v4 models
* Introduce object tracking in settings / toolchains
* Get back to a single template for v3 models
* Switch settings / toolchains mergers to deep merge
* Fix binary compatibility with 3.x
2023-01-27 15:56:16 +01:00
Karl Heinz Marbaise 74cf7eae8f
[MNG-7543] - Upgrade JUnit Jupiter Version 5.9.1 (#837)
Co-authored-by: Guillaume Nodet <gnodet@gmail.com>
2023-01-27 15:51:08 +01:00
Guillaume Nodet f77de570b7
[MNG-7646] Do not parse the whole reactor unless required by command line options (#963) 2023-01-26 11:42:23 +01:00
Guillaume Nodet d45dba3073 [MNG-7646] Fix IT broken by the change to not always read the whole reactor (#239) 2023-01-26 11:42:13 +01:00
Tamas Cservenak 38b447b85f
Get rid of surefire warning (#966)
* Get rid of surefire warning

As we use deprecated configuration.

* Fix it
2023-01-25 15:22:26 +01:00
Tamas Cservenak 8918c8144f
[MNG-7622] Maven Transformation and Consumer POM (#907)
Maven Consumer POM redone, it happens only in "maven3 realm" (before resolver), and allows use cases like m-gog-p and checksum-m-p work as before.

Key aspects:
* consumer POM is injected to build earliest possible as attached artifact
* it lives and is visible just like any other attached artifact (so m-gpg-p can process it)
* just before the install/deploy, they are "swapped out" to replace POM along with all "extras" it may have (checksum, signature)
* to support use cases like MNG-7067 (in memory model is changed, but not POM file), OnChangeTransformer could be extended to take into account both: file content and model content.

---

https://issues.apache.org/jira/browse/MNG-7622
2023-01-25 11:27:00 +01:00
Hervé Boutemy 74548dde8e
[MNG-7664] consolidate Velocity templates used to generate code from models (#949) 2023-01-20 00:38:51 +01:00
Guillaume Nodet c1a900190f
[MNG-7629] Change reactor reader to copy packaged artifacts and reuse them across builds if needed (#954) 2023-01-19 11:55:20 +01:00
Guillaume Nodet 49c12573d6 [MNG-7629] Change reactor reader to copy packaged artifacts and reuse them across builds if needed (#234) 2023-01-19 11:54:42 +01:00
Slawomir Jaranowski 20f7c65a52 Execute IT tests with clean local repository 2023-01-17 19:48:48 +01:00
Tamas Cservenak 348170eef1 [MNG-7608] Adjust IT for default transport (#237)
If 3.9 uses native as default as well, there is no need anymore
to distinguish between 3.9 and 4+.

---

https://issues.apache.org/jira/browse/MNG-7608
2023-01-17 09:51:09 +01:00
Guillaume Nodet 25c982eeb8 Remove a few system properties before initializing the maven verifier (#232) 2023-01-17 00:20:18 +01:00
Tamas Cservenak 01ba8291cd
[MNG-7666] Update default binding and lifecycle plugin versions (#956)
Finally use 3.x plugins for all.

---

https://issues.apache.org/jira/browse/MNG-7666
2023-01-16 14:30:48 +01:00
Tamas Cservenak 2fba4471c9
[MNG-7668] Update Resolver to 1.9.4 (#959)
Update Maven Resolver to 1.9.4

---

https://issues.apache.org/jira/browse/MNG-7668
2023-01-16 14:29:21 +01:00
Tamas Cservenak 76c0d133a3 [MNG-7667] Fix DownloadMojo to properly resolve (#236)
The m-p-p depends on m-p-tools-ant and m-p-tools-beanshell as runtime/optional, and the way DownloadMojo resolves every artifact causes that OptionalDependencySelector filter these out even at "collection" stage (as depth >= 2).

Hence, fix DownloadMojo to resolve properly, that actually shifts all the tree "one level up", and hence result is same as in Maven, as the optional dependencies become "first level sibling".

---

https://issues.apache.org/jira/browse/MNG-7667
2023-01-16 14:13:55 +01:00
Petr Široký 8d8dba4c6f [MNG-7661] Replace deprecated 'verifier.setMavenDebug()' 2023-01-15 22:32:54 +01:00
Petr Široký 40aa1115e6 [MNG-7661] Replace deprecated 'verifier.newDefaultFilterProperties()' 2023-01-15 19:45:20 +01:00
Petr Široký 3f029c11a9 [MNG-7661] Replace deprecated 'verifier.addCliOption()' 2023-01-13 17:16:59 +01:00
Slawomir Jaranowski c0d942b56b
Jenkinsfile: pickup results from ITs and Maven 3.8.x for build (#953)
Co-authored-by: Petr Široký <petr.siroky@pm.me>
2023-01-13 12:00:48 +01:00
Slawomir Jaranowski ff9047ab6b Fix MavenITmng5669ReadPomsOnce
In test, we check if pom files are read only once.

When we update plugin or dependencies in test,
number of read items can change again.

So should be good enough to check if duplicate items exist in log file.
2023-01-13 09:01:24 +01:00
Tamas Cservenak b035fb3037 [MNG-7667] Fix Bootstrap IT (#230)
This change extends Bootstrap IT (1st IT that fills in local repo) to hunt down some plugins that are bound in lifecycles provided by Maven under test.

Changes:
* the Bootstrap IT invokes only the phase where DownloadMojo is bound
* DownloadMojo (the "bootstrap") changed to do "this or that": it either resolves all artifacts from provided file OR collects plugins for given project packaging plugin versions provided by tested Maven default lifecycle.
* Split more Bootstrap project POMs, now we have 4 modules, we can add more (even extension if needed)

---

https://issues.apache.org/jira/browse/MNG-7667
2023-01-12 22:34:16 +01:00
Tamas Cservenak 11e8501adb Fix plexus-component-metadata plugin version (#229)
A parent POM have it removed, but the plgMgmt does
not have this entry of IT project.
2023-01-12 13:07:09 +01:00
Tamas Cservenak 1b31813b91 [MNG-7665] Update Jetty to latest Java8 capable version (#228)
Update Jetty to latest 9.4.50, last Java 8 capable version. Apply API changes and also remove jetty-servlet as ITs does NOT use servlet aspect of Jetty HTTP server.. This will simplify our lives in future, to make jump to later versions (that are Java 11+). Also, drop jetty-servlet as test do not use any servlet aspect.

---

https://issues.apache.org/jira/browse/MNG-7665
2023-01-12 11:20:33 +01:00
Petr Široký cb51050ea6 [MNG-7661] Fix verifier 'clean' call in one of the ITs (#227) 2023-01-11 13:42:55 +01:00
Guillaume Nodet 59f503bece Modernize IT plugins to use annotations (#184)
* Modernize IT plugins to use annotations

* Align some tests to maven 3.8.6

# Conflicts:
#	core-it-suite/src/test/resources-filtered/bootstrap.txt
#	core-it-suite/src/test/resources/mng-3221/report/pom.xml
#	core-it-suite/src/test/resources/mng-3428/pom.xml
#	core-it-suite/src/test/resources/mng-3530/build-path/plugin/pom.xml
#	core-it-suite/src/test/resources/mng-3530/pom-property/plugin/pom.xml
#	core-it-suite/src/test/resources/mng-3530/resource-object/plugin/pom.xml
#	core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/pom.xml
#	core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-check-plugin/pom.xml
#	core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml
#	core-it-suite/src/test/resources/mng-3743/project/pom.xml
#	core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/0.1/maven-it-plugin-a-0.1.pom
#	core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/0.2-SNAPSHOT/maven-it-plugin-a-0.2-20090315.124508-1.pom
#	core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml
#	core-it-suite/src/test/resources/mng-7310-lifecycle-activated-in-specified-module/project/pom.xml

* Add dependencies on all support artifacts to ensure multithreaded builds can use correct ordering

* Add missing dependencies on plexus-utils

* Fix for mng-7335 test

* Fix ITs for maven 4

* Rename Component -> TestComponent to leave room for the annotation

* Upgrade a few plugin versions

* Upgrade some JDK requirements to 1.8

* Remove unwanted parentheseses

* Convert the last mojo to annotations

* Force timestamped build

* Fix ITs following Component -> TestComponent rename

* Remove commented block

* Remove versions infered from plugin management

* The implementation parameter is not supported anymore

* Align maven core version

* Fix bad merge
2023-01-11 13:35:56 +01:00
Petr Široký 5ec94529d2 [MNG-7661] Replace deprecated 'verifier.executeGoal()' 2023-01-09 17:55:26 +01:00
Petr Široký 9eb3ee980f [MNG-7661] Use provided scope for Maven deps in IT plugins 2023-01-09 16:46:14 +01:00
Guillaume Nodet 1968951a53
[MNG-7642] Restore compatibility with flatten-maven-plugin (#947)
Revert "[MNG-7505] Remove ReportingConverter (#906)"
This reverts commit adf89ef63f.
2023-01-09 16:06:48 +01:00
Petr Široký 1a78c89175 [MNG-7661] Remove deprecated 'verifier.resetStreams()'
* the method itself is empty in newer versions of verifier,
   so this change is not removing any behavior
2023-01-05 19:35:02 +01:00
Guillaume Nodet fc2d94f077 [MNG-7652] switch to Modello Velocity (#944) 2023-01-04 13:57:45 +01:00
Petr Široký e24b2edf84 Upgrade Groovy in one of the ITs to support JDK 19 2023-01-04 08:55:58 +01:00
Hervé Boutemy a7399a4d52
[MNG-7652] switch to Modello Velocity (#944) 2023-01-03 22:08:35 +01:00
Guillaume Nodet a00a44f75b
[MNG-7660] Rename Dom to XmlNode in the v4 api (#946)
* Rename Dom to XmlNode and Xpp3Dom to XmlNodeImpl
* Use XmlNodeBuilder instead of DomBuilder
2023-01-03 16:52:23 +01:00