This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MODELTESTS_IMPROVEMENT in repository https://gitbox.apache.org/repos/asf/maven.git.
discard d835922 WIP - Fixed code issue. discard 4218c0a Added author. discard ad88f7a Using displayName in Interface. discard bba2bb8 Removed all DisplayName annotations from test classes and replaced with DisplayName generator. discard af669d3 Removing code redundancy Using assertj, JUnit Jupiter add fe3b2dc get MVNW_USERNAME and MVNW_PASSWORD from env add f8b556c Get maven user home (~/.m2) with the same logic with maven add c1ee195 [MNG-6900] Upgrade Jansi to 1.18 add 66f7954 [MNG-6919] drop wrapperUrl from maven-wrapper.properties Ensure maven-wrapper can handle spaced paths add b3e3972 Add a Jenkinsfile to run it test (per default it runs it master branch but now there is a parameter to use a different it source branch) (#355) add cde15f4 fix mvnDebug which was not working anymore for unix add 295c205 [MNG-5868] No duplicate artifacts in attached artifacts if attached artifacts already contains the artifact remove it and add the new one add 2537e53 [MNG-6828] DependencyResolutionException breaks serialization add b4725db Fix maven-checkstyle-plugin 3.1.1 reported error add ef8c95e [MNG-6937] StringSearchModelInterpolatorTest fails on symlinked paths add 377fc86 Fixes alignment in settings.xml add 1f8e073 Do not create empty file on error add 46ed754 Revert "[MNG-6562] added WARNING on default bindings plugins unlocked versions" add a7771a1 [MNG-6562] WARN if plugins injected by default lifecycle bindings don't have their version locked in pom.xml or parent add c7aa002 Merge remote-tracking branch 'remotes/origin/MNG-6562' add 658ad90 [MNG-5760] Add `-r/--resume` to automatically resume from the last failure point add 954cd81 [MNG-6942] Arbitrary file write during archive extraction ("Zip Slip") in wrapper add 1e5bf55 [MNG-6891] delete useless codes add 1e21770 [MNG-6863] Support --also-make flag in combination with --resume-from. add 45e91f0 [MNG-6878] Bump guice from 4.2.2 to 4.2.3 add e183080 [MNG-6866] extract methods, apply SLA, introduce mass mojo adding add dae7505 [MNG-6882] - Change the URL's in tests etc. from http to https add 0f519b4 [MNG-5577] Simplify tests to reduce use of wiring. add c0b291e [MNG-5577] Don't use LegacyRepositoryLayout in tests. add 5e2a0b6 [MNG-5577] Convert maven-core to JSR 330 add c297773 [MNG-6867] extract methods, apply SLA add f6d96b2 Revert "[MNG-6867] extract methods, apply SLA" add 6ca2a98 [MNG-6884] - Cleanup POM File after version upgrade add 24da558 [MNG-6886] upgrade plexus-cipher to 1.8 and update changed groupId (#335) add 008639d update xmlunit (#336) add 589da69 README improvement add 58b67bb added Jira badge add 26b35a8 [MNG-4660] --resume-from flag resolves inter-module dependencies add 4bdbc9b [MNG-6863] --also-make is being ignored when calling --resume-from add 58e6a38 apache-rat-plugin - section not needed after upgrading the parent pom add 530cb53 [MNG-6897] Upgrade Maven Wagon to 3.4.0 add 8f6befd [MNG-6672] Upgrade Maven Resolver to 1.4.2 add 50119d4 [MNG-2478] add "resources-filtered" filtered resource directories to super POM add 7aef391 [MNG-6891] Improve user-friendliness --fail-on-severity add 1b0aa22 [MNG-6856] Remove dependency to Powermock add cde855d [MNG-6893] Super POM - upgrade maven-antrun-plugin to 3.0.0 add ba16eb1 [MNG-6873] Align JUnit version to 4.13 add a850495 A copy of the gradle wrapper ported for use with maven Lightly touched to better mesh with current maven builds. (some of which my not have been necessary in hind sight) add fbcb4e9 Adding simple README add d9c472d correcting README formatting add 5136195 Update properties file to point to maven 3.2.3 add c4ab161 Update to Maven 3.3.1 which resides in Maven Central add f18d430 Formatting add 1cd6b2f Make sure the maven.multiModuleProjectDirectory envar is set for proper 3.3.1+ execution add 1c97b40 Update the wrapper jar add a84a48f Use the now standard .mvn directory add 073ed72 Use the Maven 3.3.1 startup scripts to account for jvm.config and maven.config add 8e97812 Use provisio packaging to produce an archive that can be deployed for use in a Maven plugin add 0c157e1 Use a released version of provisio add 3b64300 [maven-release-plugin] prepare release maven-wrapper-0.1.0 add f129f91 [maven-release-plugin] prepare for next development iteration add 8d82d0e Update location for searching for the version add 6e98e46 [maven-release-plugin] prepare release maven-wrapper-0.1.1 add d64377a [maven-release-plugin] prepare for next development iteration add 79e6e17 Update properties path Whatever add e630603 [maven-release-plugin] prepare release maven-wrapper-0.1.2 add fc68fd6 [maven-release-plugin] prepare for next development iteration add 90b5c10 Update the README.md with instructions add 00c691d Fix a few typos add 8b5a696 Add a note about using the windows script add a111c65 Fix typo add ccf486b Remove some unused parts of the windows scripts and rename them to .cmd add 2d36e2a Add license file add 252caf7 Add license stanza to POM add 10296a8 Fix while loop so that basedir is detected in current dir add a31d5b0 Correct name of Windows script in README add 763a2b2 super-mega minor typo add b607a31 Align Un*x and Windows scripts to both use MAVEN_CONFIG consistently add 218ebca Use basedir location instead of "." to locate wrapper jar add 9959135 [maven-release-plugin] prepare release maven-wrapper-0.1.3 add c362966 [maven-release-plugin] prepare for next development iteration add 978ad9e Use working files to create wrapper jar add 7815511 [maven-release-plugin] prepare release maven-wrapper-0.1.4 add a9de0f7 [maven-release-plugin] prepare for next development iteration add 9649876 Use org.apache.ant add 325dd71 Fix typo add b55dfdd handle MAVEN_PROJECTBASEDIR correctly in cygwin add 7589e43 avoid using MAVEN_CMD_LINE_ARGS for invocation since that can losse parameter escaping add b1564e3 Remove whitespace (#22) add 999b2e8 Update to release version of parent add 636a1a6 use @REM instead of # (#27) add 8a3714d Update release version add b952d36 Use Apple-recommended strategy for locating JAVA_HOME. This works correctly with both Oracle and Apple JDKs. add ec6db49 upped version to new snapshot since 0.1.6 is already on central add 9621b2a Be defensive about creating directories for files add c61dabf Fix path escaping add 27eabec remove unused MAVEN_CMD_LINE_ARGS add c3d69ec adding changelog add 9d47c12 Quote paths in commands add cc4f84b one more PR merge and changelog update add ef9cbe6 upgraded provisio maven plugin add a0f66eb updated to 0.2.0-SNAPSHOT as version due to number of changes add 2014957 updated parent to latest release add 241aa78 updated wrapper maven version to 3.3.9 add 65fd2ba fix to avoid usage of stale maven wrapper jar add 5e42c7c changelog updates add bd28530 support spaces in folder names on nix, simplified from https://github.com/takari/maven-wrapper/pull/25 add b18f554 added changelog entry about spaces fix add 6fb2b29 updated wrapper maven version to 3.5.0 add 2daa978 Add .DS_Store to .gitignore add 57557a1 Upgraded default Maven version to 3.5.0 add 33ded77 ammeded changelog add 1f66af5 added note about dash testing add 2ffb15c Use of bashisms make this script fail in minimal /bin/sh implementations like dash add 312fcd2 upgraded parent add 4f37364 fixing issue on Solaris add 8852843 added section about supported systems add a908f60 solaris support changelog entry and release date add 8bfc821 [maven-release-plugin] prepare release maven-wrapper-0.2.0 add 6ebdbb1 [maven-release-plugin] prepare for next development iteration add 4a5f7c7 improved wording on supported systems add b06a890 Make artifact compatible with older Java add 353a487 Ignore IntelliJ files add 220a94e added doc about Java version add 40302af added changelog entry for java 1.5 change and release add ad8b2ef [maven-release-plugin] prepare release maven-wrapper-0.2.1 add 789de49 [maven-release-plugin] prepare for next development iteration add ae4dda4 fixed version in changelog add 274ffb6 formatting, added update via plugin add 1859142 Print out maven wrapper version at every invocation add 96eae5d added changelog entry, added Takari to output add 7773b68 Fix typo add 90d5ab7 words are missing - I think this is what you mean... add 59ffd08 cleaned up version output add 70f1adc added verbose mode activated with MVNW_VERBOSE set to true add 5112bed [maven-release-plugin] prepare release maven-wrapper-0.2.2 add 3fe315a [maven-release-plugin] prepare for next development iteration add fb82a01 updated wrapper jar add b77616c Fix NPE due to missing MVNW_VERBOSE add 8c6d458 update info on wrapper add 6faca99 [maven-release-plugin] prepare release maven-wrapper-0.2.3 add 6f4b588 [maven-release-plugin] prepare for next development iteration add dd97d37 wrapper file upgrade add 93f6c7b set title of command window add cd4c904 respect MVNW_VERBOSE when printing diagnostic stuff add db83880 fix to actually read the environment variable value add 79660d0 set to new maven version add fd091d9 added recent pr merges add 15745d0 upped version add 1e705f0 [pom] Use empty relativePath add 036f099 [pom] Update junit to 4.12 add 0e8dd0e [pom] Update mockito-core to 2.8.47 add 15d67d8 [pom] Update commons-io to 2.5 add 4f8adb9 [pom] Update ant to 1.9.9 add 5874d0e [pom] Update provision-maven-plugin to 0.1.50 add 89d11a2 removed redundant empty element add 4f3c4b0 added warning about issues found from provisio upgrade add 3aed953 much less verbose progress reporting since it is now a new line each add 2b40a1d added chunk size change add 81ea5f2 added chunk size change add b583874 [maven-release-plugin] prepare release maven-wrapper-0.3.0 add 0a5f358 [maven-release-plugin] prepare for next development iteration add bef721a - Added an initial version of an auto-downloader for the maven-wrapper.jar add 5a6e53d Cleaned up the code a little to not exit with 0 in case of an error. add 69369d2 - Made the script use curl or wget if available and fallback to java in case none of them are. - Moved the Java source code to the filesystem. add 70e5171 - Added a download extension for windows add 7ffeb1f - Added Apache header to the downloader java class add 1fd63e5 - Changed the curl and wget detection to the "possix way" using "command" add b5858c2 - Changed the wget command to use "-O" instead of "--output-document=" add 5a145c8 - Made the wrapperUrl configurable from the maven-wrapper.properties file - Updated and tested the linux/unix/mac version of the script - Updated and tested the Java downloader - Updated the windows cmd (but not tested yet) add 25f27fc Fixed the windows version of the script add b63badc Removed a hack to force the script to use curl or wget ... add 03b48ae Updated the download url to the https version add 85b58d9 Updated to the latest maven-wrapper version. add 5e926af updated to wrapper jar 0.3.0 add 7de6277 updated version add c0337e2 added user doc for no jar approach add 8ea5449 added author creds add 6178de4 introduced intermediary var for path to jar since it didnt work without that in bash add b761d75 changed URL to official maven repo URL add 6aea81c added note about URL change add 2c04747 adapted to honor the MVNW_VERBOSE flag add 6f57788 dev and release help add f10e578 updated to new wrapper version in default URLs add 975bb6d added release date to changelog add 0f47d07 [maven-release-plugin] prepare release maven-wrapper-0.4.0 add 1b71bf6 [maven-release-plugin] prepare for next development iteration add 3ea2993 notes for next relase add 7a13000 added link to fixed issue add 2297cc5 updated to latest parent add 3314c43 spelling fix add 2e274f2 update to Maven 3.5.4 as default add 8b952b8 ant and commons-io upgrades add 6d207a2 added changes add c77c8ea updated static files to point to 0.4.1 release add 3bf4aad [maven-release-plugin] prepare release maven-wrapper-0.4.1 add d52a3e5 [maven-release-plugin] prepare for next development iteration add f1bc328 added wrapper version in cmd add 43bd236 updated to wrapper 0.4.2 in prep of new release add 27a9472 [maven-release-plugin] prepare release maven-wrapper-0.4.2 add ab4c534 [maven-release-plugin] prepare for next development iteration add 8224098 Fixed typos add 026965e Removed todo comment add a7b7273 Download maven wrapper with authentication if availble add 7fb195f Download using authentication with properties add 7282ff8 Update README.md add 81ae853 Added macOS as name add 205fea1 updated to Maven 3.6.0, also in plugin add 99f860b On Windows, use TLS 1.2 add 9483d5c fix compile path for cygwin add 7c7cf36 fix wrapper path for cygwin add a3a5411 added recently merged PRs add 73130c5 add info about using MAVEN_USER_HOME add 5b2b5c5 Update referenced Maven version to 3.6.0 add 7c10128 use quoted string for filepath add e9d72b7 add basic auth support add ffc8cc2 use MVNW_USER and MVNW_PASSWORD instead of system properties add f06e657 use warning instead of info add aa7c22e remove unintended line add 0e55dc7 added recent merged PRs add bca8bfd consistent usage of MVNW_USERNAME and MVWN_PASSWORD add e4b26a6 version update to 0.5.0-SNAPSHOT for next release add 755d6fa License header cleanup (#105) add a9854a8 added pr and issue links add 112e6ad better instructions for dev and test add 7a343e9 fixed test install command add a1f92c8 added debug flag for testing help add b5f530e add repo manager usage docs, dev doc updates add 9fcc635 usage of MVNW_REPOURL for wrapper download add 98db3ff MVN_REPOURL env var usage for Maven binary download add 8d0a19a updated everything to version 0.5.0 add e7f144d [maven-release-plugin] prepare release maven-wrapper-0.5.0 add 0f4b974 [maven-release-plugin] prepare for next development iteration add 1def3bd Windows note add 8d7b65a typo fix add 9955638 MVNW_REPOURL parsing fix for mvnw.cmd (#107) add 8dbb1c6 style improvement add 512de7c prep for 0.5.1 release add f01496d [maven-release-plugin] prepare release maven-wrapper-0.5.1 add fe331b8 [maven-release-plugin] prepare for next development iteration add 732b156 On Windows, use TLS 1.2 add a5a149f prep for 0.5.2 release add 1029d53 [maven-release-plugin] prepare release maven-wrapper-0.5.2 add 96d1f17 [maven-release-plugin] prepare for next development iteration add ac931c7 Add missing required space between 'true' and ']' add 5a3cf06 usage of MVNW_REPOURL for wrapper download add d9c00d4 resolved add b8401db title fix add 418c6c9 [maven-release-plugin] prepare release maven-wrapper-0.5.3 add 0c6bf13 [maven-release-plugin] prepare for next development iteration add e9f0fe4 Added version to default usage add 1628179 Adapt mvnw.cmd to also honour MVNW_VERBOSE add 96dbf77 Added recent changes add ccaa9e6 Provide a 'standardized' way to retrieve CLI arguments add 4108f82 Updated with recent changes add 6fe97c4 updated changelog and docs for dev to fix #78 add 38317c8 prepped for 0.5.4 release add 0399af0 prepped for 0.5.4 release add 801223a [maven-release-plugin] prepare release maven-wrapper-0.5.4 add 26d3ce0 [maven-release-plugin] prepare for next development iteration add d61c58e update to new release add f0827a0 removed wrong space in jar download URL add d4f8476 update to Maven 3.6.1 add 0b1c63e update to default to Maven 3.6.1 add 174bc24 update for 0.5.5 release add bb19cf9 [maven-release-plugin] prepare release maven-wrapper-0.5.5 add fa18ae0 [maven-release-plugin] prepare for next development iteration add 1fcc45a update to latest release add bdb5b52 source format only add 3aa7e96 more details about what happens for users add 82720d6 Corrects the false Maven2 reference in the startup scripts (#121) add 0535244 Remove trailing whitespace add 49da8ba Fix typo add f02a81c Update to Maven 3.6.3 add a66affb Update for 0.5.6 release add 9b7027e [maven-release-plugin] prepare release maven-wrapper-0.5.6 add edd0bfc [maven-release-plugin] prepare for next development iteration add 84b3bae [MNG-5937] Fix licenses, removed unwanted root files add e613b06 [MNG-5937] Split wrapper jar from assemblies Remove unused cli package Reformat code add f813d54 [MNG-5937] Optimize code for Java 8 add 59183ac [MNG-5937] Adjust JenkinsFile to pick up wrapper dists Improve assembly add ba3234e [MNG-6914] Align mvn and mvnw scripts add 2df6101 [MNG-6819] Fix NullPointerException in StringVisitorModelInterpolator add 7b3b585 [MNG-6819] Refactor unit tests for ModelInterpolator add de0d576 [MNG-6819] Fix also NPE in StringSearchModelInterpolator add 14449e4 [MNG-6819] Undo unintended changes after rebase add 6fba7aa get MVNW_USERNAME and MVNW_PASSWORD from env add 5db4951 Get maven user home (~/.m2) with the same logic with maven add 3848a47 [MNG-6900] Upgrade Jansi to 1.18 add 6cf17fd [MNG-6919] drop wrapperUrl from maven-wrapper.properties Ensure maven-wrapper can handle spaced paths add 466ac17 Add a Jenkinsfile to run it test (per default it runs it master branch but now there is a parameter to use a different it source branch) (#355) add ff9ac46 fix mvnDebug which was not working anymore for unix add bc9e7eb [MNG-5868] No duplicate artifacts in attached artifacts if attached artifacts already contains the artifact remove it and add the new one add 1c12bf6 [MNG-6828] DependencyResolutionException breaks serialization add 872f941 Fix maven-checkstyle-plugin 3.1.1 reported error add 1cf99bc [MNG-6937] StringSearchModelInterpolatorTest fails on symlinked paths add 95660b5 Fixes alignment in settings.xml add c4ad91e Do not create empty file on error add 9583806 Revert "[MNG-6562] added WARNING on default bindings plugins unlocked versions" add 628a575 [MNG-6562] WARN if plugins injected by default lifecycle bindings don't have their version locked in pom.xml or parent add d35573e [MNG-5760] Add `-r/--resume` to automatically resume from the last failure point add 101caea [MNG-6942] Arbitrary file write during archive extraction ("Zip Slip") in wrapper add 0925462 [MNG-6891] delete useless codes add 7b93993 [MNG-6863] Support --also-make flag in combination with --resume-from. add b373bb0 Merge branch 'MNG-6878' add 8812749 [MNG-6917] Introduce wrapper lifecycle add bdec668 [MNG-6656] Introduce base for build/consumer pom add a945ca4 [MNG-6944] Fix ordering lifecycles add 76427d2 [MNG-6946] Build/consumer incorrectly transforms name of artifactId add 65ec04c [MNG-6948] Repository files should not pass build-filters add 2e66809 [MNG-6952] Fail early if pom cannot be transformed add c9d1788 [MNG-6949] Add a GitHub Actions Workflow for building and integration testing changes add 3b442ba [MNG-6949] Run integration tests on large matrix, build on small one. add 117cfde [MNG-5760] Several fixes for the --resume feature. add 51c0399 [MNG-6967] Improve the command line output from maven-artifact. add 4f193b3 [MNG-6964] Maven version sorting is internally inconsistent. add 5739b12 Resume from generates misleading hint when multiple projects fail. add 6087444 [MNG-6972] Allow access to org.apache.maven.graph add 4927b1d Use Maven 3.6.3 for builds add f211600 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven add 4de92e4 add 15-ea build add 9864cdb only 8 and 11 add 9120d86 [MNG-6977] Use hyphen when creating builder threads (names) add 001310a disable publishers add fe26a18 Update README add dd54c1e update ASF CI url add e26f2f0 update ASF CI url add 2a23d7b [MNG-6772] Prevent Super POM central entry from overriding add 8b7f6f0 [MNG-6987] Reorder groupId before artifactId when writing an exclusion using maven-model add 5fbe40a Bump ant from 1.10.4 to 1.10.8 in /maven-wrapper add ac80f5c Refactor MavenCli.populateRequest add 2c3949c Run Github CI builds with Java 8, 11, 15 and 16-ea add 0e3c7a4 [MNG-6949] Get the correct PR origin user and branch name from the GitHub Actions context, in order to run the matching integration tests repo and branch. add df67c00 [MNG-6991] Restore how the local repository is determined add 39641ac [MNG-6983] Plugin key can get out of sync with artifactId and groupId add d5a5bc5 [MNG-6992] Allow access to org.eclipse.aether.transform add ecfff26 [MNG-6993] Upgrade SLF4J to 1.7.30 add c61e630 [MNG-6965] Extensions suddenly have org.codehaus.plexus:plexus-utils:jar:1.1 on their classpath add 7c7de41 [MNG-6996] Upgrade Maven Resolver to 1.6.1 add 789d75f Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven add 8393b9e [MNG-7000] metadata.mdo contains invalid link to schema add a5b292d [MNG-6118] Make Maven aware of all projects in a multi module project when using -f or when changing directory to a submodule. add 87670dd [MNG-6931] Deprecate custom logging approach add 42af8ba [MNG-6981] Include the child projects (modules) of the selected projects with --pl in the reactor. add 8913502 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven add afd17a3 [MNG-7002] Added a test scenario for including child modules when using the --pl switch. add 6034102 Merge pull request #387 from infosupport/MNG-7002-include-unit-test-for-pl-including-children add d98844c [MNG-7004] Replacing set-env in the GitHub Actions workflow with the new way to set environment variables, since set-env is deprecated. add 3a51a3a [MNG-6873] update junit dependency to 4.13.1 add 449e6dc [MNG-6873] update junit dependency to 4.13.1 - also in unit tests add 2469718 Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven add e7eef9d [MNG-6999] Chained (consumer) XMLFilters can result in "floating" comments add ba7a037 Refactor ProjectsCollector.collectProjects add a89a3d3 [MNG-6999] prevent potential race condition add 7a4b77b [MNG-6548] Lifecycle plugin version upgrades add 230773a [MNG-6554] Packaging 'ear' binding plugin upgrades add 6d75136 [MNG-6552] Packaging 'ejb' binding plugin upgrades add 658b7a9 [MNG-6552] Packaging 'rar' binding plugin upgrades add 033a7a2 [MNG-6553] Packaging 'war' binding plugin upgrades add 7b04f82 [MNG-6556] Packaging 'maven-plugin' binding plugin upgrades add 7251b8d [MNG-6551] Packaging 'jar' binding plugin upgrades add 2072372 [MNG-6550] Packaging 'pom' binding plugin upgrades add 7268880 [MNG-6754] Set the same timestamp in multi module builds add 827224c [MNG-7019] Notify also at start when profile is missing add 3736be9 Updating version in preparation for Maven 4 add b24c34b [MNG-7041] Update @since, version ranges and other version related strings add b6cf710 [MNG-7042] Upgrade Maven Wagon to 3.4.2 new 1ce0a2d Removing code redundancy Using assertj, JUnit Jupiter new d09bdc3 Removed all DisplayName annotations from test classes and replaced with DisplayName generator. new c63e722 Using displayName in Interface. new 531d255 Added author. new 6dab523 WIP - Fixed code issue. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d835922) \ N -- N -- N refs/heads/MODELTESTS_IMPROVEMENT (6dab523) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/maven.yml | 132 +++++ Jenkinsfile | 18 +- Jenkinsfile.its | 58 +++ README.md | 20 +- apache-maven/README.txt | 2 +- apache-maven/maven-wrapper.pom | 4 +- apache-maven/pom.xml | 2 +- apache-maven/src/assembly/maven/conf/settings.xml | 2 +- apache-maven/src/assembly/shared/run | 3 +- apache-maven/src/assembly/wrapper/script/download | 8 +- .../src/assembly/wrapper/script/download.cmd | 4 - .../shared/.mvn/wrapper/maven-wrapper.properties | 1 - .../src/assembly/wrapper/source/download.cmd | 4 +- ...f4j-api-1.7.29.txt => MIT-slf4j-api-1.7.30.txt} | 2 +- maven-artifact/pom.xml | 2 +- .../artifact/versioning/ComparableVersion.java | 43 +- .../artifact/versioning/ComparableVersionTest.java | 15 + maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- .../apache/maven/artifact/ArtifactScopeEnum.java | 2 +- .../installer/DefaultArtifactInstaller.java | 1 + .../transform/ReleaseArtifactTransformation.java | 1 + .../resolver/transform/SnapshotTransformation.java | 1 + maven-core/pom.xml | 24 +- .../main/java/org/apache/maven/DefaultMaven.java | 50 +- .../metadata/AbstractRepositoryMetadata.java | 1 - .../metadata/io/DefaultMetadataReader.java | 4 +- ...ldSuccess.java => BuildResumptionAnalyzer.java} | 24 +- .../maven/execution/BuildResumptionData.java | 67 +++ .../execution/BuildResumptionDataRepository.java | 56 ++ .../BuildResumptionPersistenceException.java} | 15 +- .../execution/DefaultBuildResumptionAnalyzer.java | 178 +++++++ .../DefaultBuildResumptionDataRepository.java | 154 ++++++ .../execution/DefaultMavenExecutionRequest.java | 22 +- .../execution/DefaultMavenExecutionResult.java | 14 + .../maven/execution/MavenExecutionRequest.java | 12 + .../maven/execution/MavenExecutionResult.java | 15 + .../apache/maven/graph/DefaultGraphBuilder.java | 346 ++++++------- .../aether/ConsumerModelSourceTransformer.java | 113 +++++ .../DefaultRepositorySystemSessionFactory.java | 55 +- .../apache/maven/lifecycle/DefaultLifecycles.java | 86 ++-- .../lifecycle/internal/BuildThreadFactory.java | 4 +- .../internal/DefaultLifecyclePluginAnalyzer.java | 6 +- .../lifecycle/internal/builder/BuilderCommon.java | 21 + .../plugin/DefaultLifecycleBindingsInjector.java | 36 +- .../DefaultPluginDependenciesResolver.java | 12 +- .../maven/plugin/internal/PlexusUtilsInjector.java | 87 ---- .../project/DefaultModelBuildingListener.java | 2 +- .../maven/project/DefaultProjectBuilder.java | 77 ++- .../project/DefaultProjectBuildingHelper.java | 5 +- .../project/DependencyResolutionException.java | 2 +- .../org/apache/maven/project/MavenProject.java | 24 +- .../apache/maven/project/ProjectModelResolver.java | 48 +- .../org/apache/maven/project/ReactorModelPool.java | 120 ++++- .../project/collector/DefaultProjectsSelector.java | 103 ++++ .../collector/MultiModuleCollectionStrategy.java | 194 +++++++ .../collector/PomlessCollectionStrategy.java | 65 +++ .../collector/ProjectCollectionStrategy.java} | 27 +- .../collector/ProjectsSelector.java} | 31 +- .../collector/RequestPomCollectionStrategy.java | 54 ++ .../toolchain/io/DefaultToolchainsReader.java | 4 +- .../toolchain/io/DefaultToolchainsWriter.java | 2 +- .../DefaultConsumerPomXMLFilterFactory.java | 65 +++ .../main/resources/META-INF/maven/extension.xml | 2 + .../main/resources/META-INF/plexus/components.xml | 26 +- .../resources/META-INF/plexus/default-bindings.xml | 100 ++-- .../maven/AbstractCoreMavenComponentTestCase.java | 5 + .../java/org/apache/maven/DefaultMavenTest.java | 31 +- .../DefaultBuildResumptionAnalyzerTest.java | 150 ++++++ .../DefaultBuildResumptionDataRepositoryTest.java | 108 ++++ .../maven/graph/DefaultGraphBuilderTest.java | 240 ++++++--- .../aether/ConsumerModelSourceTransformerTest.java | 70 +++ .../maven/lifecycle/DefaultLifecyclesTest.java | 90 +++- .../maven/lifecycle/LifecycleExecutorTest.java | 14 +- .../lifecycle/internal/BuilderCommonTest.java | 44 +- .../internal/stub/DefaultLifecyclesStub.java | 4 +- .../stub/LifecycleExecutionPlanCalculatorStub.java | 15 +- .../apache/maven/project/PomConstructionTest.java | 2 +- .../apache/maven/project/ProjectBuilderTest.java | 108 ++-- .../maven/repository/TestRepositorySystem.java | 4 +- .../project-with-inheritance/pom.xml | 2 +- .../project-with-inheritance/pom.xml | 2 +- .../test/projects/project-builder/MNG-6723/pom.xml | 38 -- .../project-builder/MNG-6983/parent-pom.xml | 38 ++ .../test/projects/project-builder/MNG-6983/pom.xml | 22 + .../maven-plugin-api/2.0/maven-plugin-api-2.0.pom | 2 +- .../org/apache/maven/maven/2.0/maven-2.0.pom | 2 +- .../dependency-inheritance/pom.xml | 2 +- .../dependency-inheritance/sub/pom.xml | 2 +- .../resources-project-builder/micromailer/pom.xml | 2 +- .../org/apache/maven/execution/resume.properties | 2 + .../junit/junit/3.8.1/junit-3.8.1.jar | Bin 121070 -> 0 bytes .../junit/junit/3.8.1/junit-3.8.1.jar.md5 | 1 - .../junit/junit/3.8.1/junit-3.8.1.jar.sha1 | 1 - .../junit/junit/3.8.1/junit-3.8.1.pom | 29 -- .../junit/junit/3.8.1/junit-3.8.1.pom.md5 | 1 - .../junit/junit/3.8.1/junit-3.8.1.pom.sha1 | 1 - .../wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom | 2 +- .../plexus-active-collections-1.0-beta-1.pom | 2 +- .../plexus-classworlds-1.2-alpha-10.pom | 2 +- .../1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom | 2 +- .../plexus-containers-1.0-alpha-16.pom | 2 +- .../plexus-containers-1.0-alpha-32.pom | 2 +- .../plexus/plexus/1.0.10/plexus-1.0.10.pom | 2 +- .../plexus/plexus/1.0.11/plexus-1.0.11.pom | 2 +- .../codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom | 2 +- .../codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom | 2 +- .../codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom | 2 +- .../resources/org/apache/maven/lifecycle/pom.xml | 2 +- .../project-dynamism/plugin-level-dep.pom.xml | 2 +- .../test/resources/projects/transform/after.pom | 2 + .../test/resources/projects/transform/before.pom | 5 + maven-embedder/pom.xml | 4 +- maven-embedder/src/examples/simple-project/pom.xml | 2 +- .../main/java/org/apache/maven/cli/CLIManager.java | 3 + .../main/java/org/apache/maven/cli/MavenCli.java | 562 ++++++++++++--------- .../java/org/apache/maven/cli/MavenCliTest.java | 127 +++++ maven-model-builder/pom.xml | 8 +- .../Features.java} | 56 +- .../building/AbstractModelSourceTransformer.java | 238 +++++++++ .../maven/model/building/ArtifactModelSource.java | 40 +- .../building/BuildModelSourceTransformer.java | 89 ++++ .../building/DefaultBuildPomXMLFilterFactory.java | 96 ++++ .../maven/model/building/DefaultModelBuilder.java | 275 ++++++++-- .../model/building/DefaultModelBuilderFactory.java | 9 +- .../building/DefaultModelBuildingRequest.java | 30 +- ...ner.java => DefaultModelSourceTransformer.java} | 20 +- .../model/building/FilterModelBuildingRequest.java | 27 +- .../maven/model/building/ModelBuildingRequest.java | 20 + .../apache/maven/model/building/ModelCache.java | 4 +- .../apache/maven/model/building/ModelProblem.java | 3 +- ...lProcessor.java => ModelSourceTransformer.java} | 18 +- .../maven/model/building/TransformerContext.java | 64 +++ .../maven/model/building/TransformerException.java | 21 +- .../apache/maven/model/io/DefaultModelReader.java | 47 +- .../apache/maven/model/io/DefaultModelWriter.java | 4 +- .../model/validation/DefaultModelValidator.java | 39 +- .../maven/model/validation/ModelValidator.java | 16 +- .../model/building/FileToRawModelMergerTest.java | 82 +++ .../DefaultInheritanceAssemblerTest.java | 26 +- .../StringSearchModelInterpolatorTest.java | 2 +- .../validation/DefaultModelValidatorTest.java | 21 +- maven-model/pom.xml | 2 +- maven-model/src/main/mdo/maven.mdo | 16 +- maven-plugin-api/pom.xml | 2 +- .../apache/maven/monitor/logging/DefaultLog.java | 5 +- .../java/org/apache/maven/plugin/AbstractMojo.java | 10 +- .../main/java/org/apache/maven/plugin/Mojo.java | 9 +- .../java/org/apache/maven/plugin/logging/Log.java | 5 +- .../maven/plugin/logging/SystemStreamLog.java | 5 +- maven-repository-metadata/pom.xml | 2 +- .../src/main/mdo/metadata.mdo | 2 +- maven-resolver-provider/pom.xml | 2 +- .../repository/internal/DefaultModelResolver.java | 2 +- .../internal/DefaultVersionRangeResolver.java | 2 +- .../internal/DefaultVersionResolver.java | 2 +- .../repository/internal/LocalSnapshotMetadata.java | 15 +- .../internal/LocalSnapshotMetadataGenerator.java | 7 +- .../maven/repository/internal/MavenMetadata.java | 8 +- .../repository/internal/MavenSnapshotMetadata.java | 5 +- .../internal/RemoteSnapshotMetadata.java | 14 +- .../internal/RemoteSnapshotMetadataGenerator.java | 9 +- .../repository/internal/VersionsMetadata.java | 13 +- .../internal/VersionsMetadataGenerator.java | 7 +- .../internal/RemoteSnapshotMetadataTest.java | 2 +- maven-settings-builder/pom.xml | 2 +- .../maven/settings/io/DefaultSettingsReader.java | 4 +- .../maven/settings/io/DefaultSettingsWriter.java | 4 +- maven-settings/pom.xml | 2 +- maven-slf4j-provider/pom.xml | 2 +- maven-slf4j-wrapper/pom.xml | 2 +- .../apache/maven/logwrapper/LogLevelRecorder.java | 9 +- maven-wrapper/pom.xml | 6 +- .../apache/maven/wrapper/DefaultDownloader.java | 6 +- .../java/org/apache/maven/wrapper/Installer.java | 2 +- .../org/apache/maven/wrapper/MavenWrapperMain.java | 20 +- {maven-slf4j-wrapper => maven-xml}/pom.xml | 27 +- .../main/java/org/apache/maven/xml/Factories.java | 80 +++ .../java/org/apache/maven/xml/sax/SAXEvent.java | 15 +- .../org/apache/maven/xml/sax/SAXEventFactory.java | 144 ++++++ .../org/apache/maven/xml/sax/SAXEventUtils.java | 28 +- .../maven/xml/sax/ext/CommentRenormalizer.java | 108 ++++ .../xml/sax/filter/AbstractEventXMLFilter.java | 290 +++++++++++ .../maven/xml/sax/filter/AbstractSAXFilter.java | 143 ++++++ .../maven/xml/sax/filter/BuildPomXMLFilter.java | 48 +- .../xml/sax/filter/BuildPomXMLFilterFactory.java | 114 +++++ .../xml/sax/filter/BuildPomXMLFilterListener.java | 25 +- .../maven/xml/sax/filter/CiFriendlyXMLFilter.java | 127 +++++ .../maven/xml/sax/filter/ConsumerPomXMLFilter.java | 60 +++ .../sax/filter/ConsumerPomXMLFilterFactory.java | 88 ++++ .../apache/maven/xml/sax/filter/DependencyKey.java | 57 ++- .../maven/xml/sax/filter/FastForwardFilter.java | 126 +++++ .../maven/xml/sax/filter/ModulesXMLFilter.java | 109 ++++ .../maven/xml/sax/filter/ParentXMLFilter.java | 212 ++++++++ .../xml/sax/filter/ReactorDependencyXMLFilter.java | 171 +++++++ .../xml/sax/filter/RelativePathXMLFilter.java | 106 ++++ .../maven/xml/sax/filter/RelativeProject.java | 17 +- .../apache/maven/xml/sax/ChainedFilterTest.java | 150 ++++++ .../apache/maven/xml/sax/SAXEventUtilsTest.java | 31 +- .../maven/xml/sax/ext/CommentRenormalizerTest.java | 84 +++ .../xml/sax/filter/AbstractXMLFilterTests.java | 205 ++++++++ .../xml/sax/filter/CiFriendlyXMLFilterTest.java | 67 +++ .../xml/sax/filter/ConsumerPomXMLFilterTest.java | 254 ++++++++++ .../maven/xml/sax/filter/ModulesXMLFilterTest.java | 99 ++++ .../maven/xml/sax/filter/ParentXMLFilterTest.java | 216 ++++++++ .../sax/filter/ReactorDependencyXMLFilterTest.java | 150 ++++++ .../xml/sax/filter/RelativePathXMLFilterTest.java | 115 +++++ pom.xml | 28 +- 208 files changed, 7939 insertions(+), 1460 deletions(-) create mode 100644 .github/workflows/maven.yml create mode 100644 Jenkinsfile.its rename apache-maven/src/main/appended-resources/licenses/{MIT-slf4j-api-1.7.29.txt => MIT-slf4j-api-1.7.30.txt} (94%) copy maven-core/src/main/java/org/apache/maven/execution/{BuildSuccess.java => BuildResumptionAnalyzer.java} (59%) create mode 100644 maven-core/src/main/java/org/apache/maven/execution/BuildResumptionData.java create mode 100644 maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java copy maven-core/src/main/java/org/apache/maven/{repository/ArtifactDoesNotExistException.java => execution/BuildResumptionPersistenceException.java} (71%) create mode 100644 maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java create mode 100644 maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java create mode 100644 maven-core/src/main/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformer.java delete mode 100644 maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java create mode 100644 maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java create mode 100644 maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java create mode 100644 maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java copy maven-core/src/main/java/org/apache/maven/{execution/BuildSuccess.java => project/collector/ProjectCollectionStrategy.java} (64%) copy maven-core/src/main/java/org/apache/maven/{execution/BuildSuccess.java => project/collector/ProjectsSelector.java} (54%) create mode 100644 maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java create mode 100644 maven-core/src/main/java/org/apache/maven/xml/internal/DefaultConsumerPomXMLFilterFactory.java create mode 100644 maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java create mode 100644 maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java create mode 100644 maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java create mode 100644 maven-core/src/test/projects/project-builder/MNG-6983/parent-pom.xml create mode 100644 maven-core/src/test/projects/project-builder/MNG-6983/pom.xml create mode 100644 maven-core/src/test/resources/org/apache/maven/execution/resume.properties delete mode 100644 maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.jar delete mode 100644 maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.jar.md5 delete mode 100644 maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.jar.sha1 delete mode 100644 maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.pom delete mode 100644 maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.pom.md5 delete mode 100644 maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.pom.sha1 copy maven-model-builder/src/test/resources/poms/factory/simple.xml => maven-core/src/test/resources/projects/transform/after.pom (99%) copy maven-model-builder/src/test/resources/poms/factory/simple.xml => maven-core/src/test/resources/projects/transform/before.pom (95%) copy maven-model-builder/src/main/java/org/apache/maven/{model/building/ArtifactModelSource.java => feature/Features.java} (54%) create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelSourceTransformer.java create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/building/BuildModelSourceTransformer.java create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java copy maven-model-builder/src/main/java/org/apache/maven/model/building/{AbstractModelBuildingListener.java => DefaultModelSourceTransformer.java} (64%) copy maven-model-builder/src/main/java/org/apache/maven/model/building/{ModelProcessor.java => ModelSourceTransformer.java} (74%) create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContext.java copy maven-core/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java => maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerException.java (72%) create mode 100644 maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java copy {maven-slf4j-wrapper => maven-xml}/pom.xml (63%) create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/Factories.java copy maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java => maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEvent.java (75%) create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEventFactory.java copy maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java => maven-xml/src/main/java/org/apache/maven/xml/sax/SAXEventUtils.java (58%) create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/ext/CommentRenormalizer.java create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/filter/AbstractEventXMLFilter.java create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/filter/AbstractSAXFilter.java copy maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java => maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilter.java (52%) create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilterFactory.java copy maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java => maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilterListener.java (65%) create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/filter/CiFriendlyXMLFilter.java create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilter.java create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterFactory.java copy maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java => maven-xml/src/main/java/org/apache/maven/xml/sax/filter/DependencyKey.java (54%) create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/filter/FastForwardFilter.java create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ModulesXMLFilter.java create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ParentXMLFilter.java create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilter.java create mode 100644 maven-xml/src/main/java/org/apache/maven/xml/sax/filter/RelativePathXMLFilter.java copy maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java => maven-xml/src/main/java/org/apache/maven/xml/sax/filter/RelativeProject.java (83%) create mode 100644 maven-xml/src/test/java/org/apache/maven/xml/sax/ChainedFilterTest.java copy maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java => maven-xml/src/test/java/org/apache/maven/xml/sax/SAXEventUtilsTest.java (63%) create mode 100644 maven-xml/src/test/java/org/apache/maven/xml/sax/ext/CommentRenormalizerTest.java create mode 100644 maven-xml/src/test/java/org/apache/maven/xml/sax/filter/AbstractXMLFilterTests.java create mode 100644 maven-xml/src/test/java/org/apache/maven/xml/sax/filter/CiFriendlyXMLFilterTest.java create mode 100644 maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterTest.java create mode 100644 maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ModulesXMLFilterTest.java create mode 100644 maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ParentXMLFilterTest.java create mode 100644 maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ReactorDependencyXMLFilterTest.java create mode 100644 maven-xml/src/test/java/org/apache/maven/xml/sax/filter/RelativePathXMLFilterTest.java