You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/06/21 09:35:54 UTC
[maven] branch MNG-6878 updated (45e91f0 -> 7b93993)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MNG-6878
in repository https://gitbox.apache.org/repos/asf/maven.git.
from 45e91f0 [MNG-6878] Bump guice from 4.2.2 to 4.2.3
new e183080 [MNG-6866] extract methods, apply SLA, introduce mass mojo adding
new dae7505 [MNG-6882] - Change the URL's in tests etc. from http to https
new 0f519b4 [MNG-5577] Simplify tests to reduce use of wiring.
new c0b291e [MNG-5577] Don't use LegacyRepositoryLayout in tests.
new 5e2a0b6 [MNG-5577] Convert maven-core to JSR 330
new c297773 [MNG-6867] extract methods, apply SLA
new f6d96b2 Revert "[MNG-6867] extract methods, apply SLA"
new 6ca2a98 [MNG-6884] - Cleanup POM File after version upgrade
new 24da558 [MNG-6886] upgrade plexus-cipher to 1.8 and update changed groupId (#335)
new 008639d update xmlunit (#336)
new 589da69 README improvement
new 58b67bb added Jira badge
new 26b35a8 [MNG-4660] --resume-from flag resolves inter-module dependencies
new 4bdbc9b [MNG-6863] --also-make is being ignored when calling --resume-from
new 58e6a38 apache-rat-plugin - section not needed after upgrading the parent pom
new 530cb53 [MNG-6897] Upgrade Maven Wagon to 3.4.0
new 8f6befd [MNG-6672] Upgrade Maven Resolver to 1.4.2
new 50119d4 [MNG-2478] add "resources-filtered" filtered resource directories to super POM
new 7aef391 [MNG-6891] Improve user-friendliness --fail-on-severity
new 1b0aa22 [MNG-6856] Remove dependency to Powermock
new cde855d [MNG-6893] Super POM - upgrade maven-antrun-plugin to 3.0.0
new ba16eb1 [MNG-6873] Align JUnit version to 4.13
new 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)
new fbcb4e9 Adding simple README
new d9c472d correcting README formatting
new 5136195 Update properties file to point to maven 3.2.3
new c4ab161 Update to Maven 3.3.1 which resides in Maven Central
new f18d430 Formatting
new 1cd6b2f Make sure the maven.multiModuleProjectDirectory envar is set for proper 3.3.1+ execution
new 1c97b40 Update the wrapper jar
new a84a48f Use the now standard .mvn directory
new 073ed72 Use the Maven 3.3.1 startup scripts to account for jvm.config and maven.config
new 8e97812 Use provisio packaging to produce an archive that can be deployed for use in a Maven plugin
new 0c157e1 Use a released version of provisio
new 3b64300 [maven-release-plugin] prepare release maven-wrapper-0.1.0
new f129f91 [maven-release-plugin] prepare for next development iteration
new 8d82d0e Update location for searching for the version
new 6e98e46 [maven-release-plugin] prepare release maven-wrapper-0.1.1
new d64377a [maven-release-plugin] prepare for next development iteration
new 79e6e17 Update properties path Whatever
new e630603 [maven-release-plugin] prepare release maven-wrapper-0.1.2
new fc68fd6 [maven-release-plugin] prepare for next development iteration
new 90b5c10 Update the README.md with instructions
new 00c691d Fix a few typos
new 8b5a696 Add a note about using the windows script
new a111c65 Fix typo
new ccf486b Remove some unused parts of the windows scripts and rename them to .cmd
new 2d36e2a Add license file
new 252caf7 Add license stanza to POM
new 10296a8 Fix while loop so that basedir is detected in current dir
new a31d5b0 Correct name of Windows script in README
new 763a2b2 super-mega minor typo
new b607a31 Align Un*x and Windows scripts to both use MAVEN_CONFIG consistently
new 218ebca Use basedir location instead of "." to locate wrapper jar
new 9959135 [maven-release-plugin] prepare release maven-wrapper-0.1.3
new c362966 [maven-release-plugin] prepare for next development iteration
new 978ad9e Use working files to create wrapper jar
new 7815511 [maven-release-plugin] prepare release maven-wrapper-0.1.4
new a9de0f7 [maven-release-plugin] prepare for next development iteration
new 9649876 Use org.apache.ant
new 325dd71 Fix typo
new b55dfdd handle MAVEN_PROJECTBASEDIR correctly in cygwin
new 7589e43 avoid using MAVEN_CMD_LINE_ARGS for invocation since that can losse parameter escaping
new b1564e3 Remove whitespace (#22)
new 999b2e8 Update to release version of parent
new 636a1a6 use @REM instead of # (#27)
new 8a3714d Update release version
new b952d36 Use Apple-recommended strategy for locating JAVA_HOME. This works correctly with both Oracle and Apple JDKs.
new ec6db49 upped version to new snapshot since 0.1.6 is already on central
new 9621b2a Be defensive about creating directories for files
new c61dabf Fix path escaping
new 27eabec remove unused MAVEN_CMD_LINE_ARGS
new c3d69ec adding changelog
new 9d47c12 Quote paths in commands
new cc4f84b one more PR merge and changelog update
new ef9cbe6 upgraded provisio maven plugin
new a0f66eb updated to 0.2.0-SNAPSHOT as version due to number of changes
new 2014957 updated parent to latest release
new 241aa78 updated wrapper maven version to 3.3.9
new 65fd2ba fix to avoid usage of stale maven wrapper jar
new 5e42c7c changelog updates
new bd28530 support spaces in folder names on nix, simplified from https://github.com/takari/maven-wrapper/pull/25
new b18f554 added changelog entry about spaces fix
new 6fb2b29 updated wrapper maven version to 3.5.0
new 2daa978 Add .DS_Store to .gitignore
new 57557a1 Upgraded default Maven version to 3.5.0
new 33ded77 ammeded changelog
new 1f66af5 added note about dash testing
new 2ffb15c Use of bashisms make this script fail in minimal /bin/sh implementations like dash
new 312fcd2 upgraded parent
new 4f37364 fixing issue on Solaris
new 8852843 added section about supported systems
new a908f60 solaris support changelog entry and release date
new 8bfc821 [maven-release-plugin] prepare release maven-wrapper-0.2.0
new 6ebdbb1 [maven-release-plugin] prepare for next development iteration
new 4a5f7c7 improved wording on supported systems
new b06a890 Make artifact compatible with older Java
new 353a487 Ignore IntelliJ files
new 220a94e added doc about Java version
new 40302af added changelog entry for java 1.5 change and release
new ad8b2ef [maven-release-plugin] prepare release maven-wrapper-0.2.1
new 789de49 [maven-release-plugin] prepare for next development iteration
new ae4dda4 fixed version in changelog
new 274ffb6 formatting, added update via plugin
new 1859142 Print out maven wrapper version at every invocation
new 96eae5d added changelog entry, added Takari to output
new 7773b68 Fix typo
new 90d5ab7 words are missing - I think this is what you mean...
new 59ffd08 cleaned up version output
new 70f1adc added verbose mode activated with MVNW_VERBOSE set to true
new 5112bed [maven-release-plugin] prepare release maven-wrapper-0.2.2
new 3fe315a [maven-release-plugin] prepare for next development iteration
new fb82a01 updated wrapper jar
new b77616c Fix NPE due to missing MVNW_VERBOSE
new 8c6d458 update info on wrapper
new 6faca99 [maven-release-plugin] prepare release maven-wrapper-0.2.3
new 6f4b588 [maven-release-plugin] prepare for next development iteration
new dd97d37 wrapper file upgrade
new 93f6c7b set title of command window
new cd4c904 respect MVNW_VERBOSE when printing diagnostic stuff
new db83880 fix to actually read the environment variable value
new 79660d0 set to new maven version
new fd091d9 added recent pr merges
new 15745d0 upped version
new 1e705f0 [pom] Use empty relativePath
new 036f099 [pom] Update junit to 4.12
new 0e8dd0e [pom] Update mockito-core to 2.8.47
new 15d67d8 [pom] Update commons-io to 2.5
new 4f8adb9 [pom] Update ant to 1.9.9
new 5874d0e [pom] Update provision-maven-plugin to 0.1.50
new 89d11a2 removed redundant empty element
new 4f3c4b0 added warning about issues found from provisio upgrade
new 3aed953 much less verbose progress reporting since it is now a new line each
new 2b40a1d added chunk size change
new 81ea5f2 added chunk size change
new b583874 [maven-release-plugin] prepare release maven-wrapper-0.3.0
new 0a5f358 [maven-release-plugin] prepare for next development iteration
new bef721a - Added an initial version of an auto-downloader for the maven-wrapper.jar
new 5a6e53d Cleaned up the code a little to not exit with 0 in case of an error.
new 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.
new 70e5171 - Added a download extension for windows
new 7ffeb1f - Added Apache header to the downloader java class
new 1fd63e5 - Changed the curl and wget detection to the "possix way" using "command"
new b5858c2 - Changed the wget command to use "-O" instead of "--output-document="
new 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)
new 25f27fc Fixed the windows version of the script
new b63badc Removed a hack to force the script to use curl or wget ...
new 03b48ae Updated the download url to the https version
new 85b58d9 Updated to the latest maven-wrapper version.
new 5e926af updated to wrapper jar 0.3.0
new 7de6277 updated version
new c0337e2 added user doc for no jar approach
new 8ea5449 added author creds
new 6178de4 introduced intermediary var for path to jar since it didnt work without that in bash
new b761d75 changed URL to official maven repo URL
new 6aea81c added note about URL change
new 2c04747 adapted to honor the MVNW_VERBOSE flag
new 6f57788 dev and release help
new f10e578 updated to new wrapper version in default URLs
new 975bb6d added release date to changelog
new 0f47d07 [maven-release-plugin] prepare release maven-wrapper-0.4.0
new 1b71bf6 [maven-release-plugin] prepare for next development iteration
new 3ea2993 notes for next relase
new 7a13000 added link to fixed issue
new 2297cc5 updated to latest parent
new 3314c43 spelling fix
new 2e274f2 update to Maven 3.5.4 as default
new 8b952b8 ant and commons-io upgrades
new 6d207a2 added changes
new c77c8ea updated static files to point to 0.4.1 release
new 3bf4aad [maven-release-plugin] prepare release maven-wrapper-0.4.1
new d52a3e5 [maven-release-plugin] prepare for next development iteration
new f1bc328 added wrapper version in cmd
new 43bd236 updated to wrapper 0.4.2 in prep of new release
new 27a9472 [maven-release-plugin] prepare release maven-wrapper-0.4.2
new ab4c534 [maven-release-plugin] prepare for next development iteration
new 8224098 Fixed typos
new 026965e Removed todo comment
new a7b7273 Download maven wrapper with authentication if availble
new 7fb195f Download using authentication with properties
new 7282ff8 Update README.md
new 81ae853 Added macOS as name
new 205fea1 updated to Maven 3.6.0, also in plugin
new 99f860b On Windows, use TLS 1.2
new 9483d5c fix compile path for cygwin
new 7c7cf36 fix wrapper path for cygwin
new a3a5411 added recently merged PRs
new 73130c5 add info about using MAVEN_USER_HOME
new 5b2b5c5 Update referenced Maven version to 3.6.0
new 7c10128 use quoted string for filepath
new e9d72b7 add basic auth support
new ffc8cc2 use MVNW_USER and MVNW_PASSWORD instead of system properties
new f06e657 use warning instead of info
new aa7c22e remove unintended line
new 0e55dc7 added recent merged PRs
new bca8bfd consistent usage of MVNW_USERNAME and MVWN_PASSWORD
new e4b26a6 version update to 0.5.0-SNAPSHOT for next release
new 755d6fa License header cleanup (#105)
new a9854a8 added pr and issue links
new 112e6ad better instructions for dev and test
new 7a343e9 fixed test install command
new a1f92c8 added debug flag for testing help
new b5f530e add repo manager usage docs, dev doc updates
new 9fcc635 usage of MVNW_REPOURL for wrapper download
new 98db3ff MVN_REPOURL env var usage for Maven binary download
new 8d0a19a updated everything to version 0.5.0
new e7f144d [maven-release-plugin] prepare release maven-wrapper-0.5.0
new 0f4b974 [maven-release-plugin] prepare for next development iteration
new 1def3bd Windows note
new 8d7b65a typo fix
new 9955638 MVNW_REPOURL parsing fix for mvnw.cmd (#107)
new 8dbb1c6 style improvement
new 512de7c prep for 0.5.1 release
new f01496d [maven-release-plugin] prepare release maven-wrapper-0.5.1
new fe331b8 [maven-release-plugin] prepare for next development iteration
new 732b156 On Windows, use TLS 1.2
new a5a149f prep for 0.5.2 release
new 1029d53 [maven-release-plugin] prepare release maven-wrapper-0.5.2
new 96d1f17 [maven-release-plugin] prepare for next development iteration
new ac931c7 Add missing required space between 'true' and ']'
new 5a3cf06 usage of MVNW_REPOURL for wrapper download
new d9c00d4 resolved
new b8401db title fix
new 418c6c9 [maven-release-plugin] prepare release maven-wrapper-0.5.3
new 0c6bf13 [maven-release-plugin] prepare for next development iteration
new e9f0fe4 Added version to default usage
new 1628179 Adapt mvnw.cmd to also honour MVNW_VERBOSE
new 96dbf77 Added recent changes
new ccaa9e6 Provide a 'standardized' way to retrieve CLI arguments
new 4108f82 Updated with recent changes
new 6fe97c4 updated changelog and docs for dev to fix #78
new 38317c8 prepped for 0.5.4 release
new 0399af0 prepped for 0.5.4 release
new 801223a [maven-release-plugin] prepare release maven-wrapper-0.5.4
new 26d3ce0 [maven-release-plugin] prepare for next development iteration
new d61c58e update to new release
new f0827a0 removed wrong space in jar download URL
new d4f8476 update to Maven 3.6.1
new 0b1c63e update to default to Maven 3.6.1
new 174bc24 update for 0.5.5 release
new bb19cf9 [maven-release-plugin] prepare release maven-wrapper-0.5.5
new fa18ae0 [maven-release-plugin] prepare for next development iteration
new 1fcc45a update to latest release
new bdb5b52 source format only
new 3aa7e96 more details about what happens for users
new 82720d6 Corrects the false Maven2 reference in the startup scripts (#121)
new 0535244 Remove trailing whitespace
new 49da8ba Fix typo
new f02a81c Update to Maven 3.6.3
new a66affb Update for 0.5.6 release
new 9b7027e [maven-release-plugin] prepare release maven-wrapper-0.5.6
new edd0bfc [maven-release-plugin] prepare for next development iteration
new 84b3bae [MNG-5937] Fix licenses, removed unwanted root files
new e613b06 [MNG-5937] Split wrapper jar from assemblies Remove unused cli package Reformat code
new f813d54 [MNG-5937] Optimize code for Java 8
new 59183ac [MNG-5937] Adjust JenkinsFile to pick up wrapper dists Improve assembly
new ba3234e [MNG-6914] Align mvn and mvnw scripts
new 2df6101 [MNG-6819] Fix NullPointerException in StringVisitorModelInterpolator
new 7b3b585 [MNG-6819] Refactor unit tests for ModelInterpolator
new de0d576 [MNG-6819] Fix also NPE in StringSearchModelInterpolator
new 14449e4 [MNG-6819] Undo unintended changes after rebase
new 6fba7aa get MVNW_USERNAME and MVNW_PASSWORD from env
new 5db4951 Get maven user home (~/.m2) with the same logic with maven
new 3848a47 [MNG-6900] Upgrade Jansi to 1.18
new 6cf17fd [MNG-6919] drop wrapperUrl from maven-wrapper.properties Ensure maven-wrapper can handle spaced paths
new 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)
new ff9ac46 fix mvnDebug which was not working anymore for unix
new bc9e7eb [MNG-5868] No duplicate artifacts in attached artifacts if attached artifacts already contains the artifact remove it and add the new one
new 1c12bf6 [MNG-6828] DependencyResolutionException breaks serialization
new 872f941 Fix maven-checkstyle-plugin 3.1.1 reported error
new 1cf99bc [MNG-6937] StringSearchModelInterpolatorTest fails on symlinked paths
new 95660b5 Fixes alignment in settings.xml
new c4ad91e Do not create empty file on error
new 9583806 Revert "[MNG-6562] added WARNING on default bindings plugins unlocked versions"
new 628a575 [MNG-6562] WARN if plugins injected by default lifecycle bindings don't have their version locked in pom.xml or parent
new d35573e [MNG-5760] Add `-r/--resume` to automatically resume from the last failure point
new 101caea [MNG-6942] Arbitrary file write during archive extraction ("Zip Slip") in wrapper
new 0925462 [MNG-6891] delete useless codes
new 7b93993 [MNG-6863] Support --also-make flag in combination with --resume-from.
The 279 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:
Jenkinsfile | 21 +-
Jenkinsfile.its | 58 ++++
README.md | 14 +-
apache-maven/maven-wrapper.pom | 139 ++++++++++
apache-maven/pom.xml | 31 ++-
.../src/{main/assembly => assembly/maven}/bin.xml | 2 +-
.../src/{ => assembly/maven}/bin/.gitattributes | 0
apache-maven/src/{ => assembly/maven}/bin/m2.conf | 0
apache-maven/src/{ => assembly/maven}/bin/mvnDebug | 0
.../src/{ => assembly/maven}/bin/mvnDebug.cmd | 0
apache-maven/src/{ => assembly/maven}/bin/mvnyjp | 0
.../assembly => assembly/maven}/component.xml | 42 ++-
.../maven}/conf/logging/simplelogger.properties | 0
.../src/{ => assembly/maven}/conf/settings.xml | 2 +-
.../src/{ => assembly/maven}/conf/toolchains.xml | 0
.../src/{main/assembly => assembly/maven}/dir.xml | 2 +-
.../src/{ => assembly/maven}/lib/ext/README.txt | 0
.../maven}/lib/jansi-native/README.txt | 0
.../src/{main/assembly => assembly/maven}/src.xml | 0
apache-maven/src/assembly/shared/init | 128 +++++++++
apache-maven/src/assembly/shared/init.cmd | 97 +++++++
apache-maven/src/assembly/shared/mvnlauncher | 4 +
apache-maven/src/assembly/shared/mvnlauncher.cmd | 4 +
apache-maven/src/assembly/shared/mvnvalidate | 23 ++
apache-maven/src/assembly/shared/mvnvalidate.cmd | 8 +
.../{bin/mvnDebug => assembly/shared/mvnwDebug} | 4 +-
.../mvnDebug.cmd => assembly/shared/mvnwDebug.cmd} | 2 +-
apache-maven/src/assembly/shared/mvnwlauncher | 4 +
apache-maven/src/assembly/shared/mvnwlauncher.cmd | 4 +
apache-maven/src/assembly/shared/run | 23 ++
apache-maven/src/assembly/shared/run.cmd | 29 ++
.../src/{bin/mvnyjp => assembly/shared/validate} | 42 ++-
.../mvnDebug.cmd => assembly/shared/validate.cmd} | 36 ++-
apache-maven/src/assembly/wrapper/bin.xml | 89 +++++++
apache-maven/src/assembly/wrapper/script.xml | 81 ++++++
apache-maven/src/assembly/wrapper/script/download | 51 ++++
.../src/assembly/wrapper/script/download.cmd | 32 +++
.../shared/.mvn/wrapper/maven-wrapper.properties | 7 +-
apache-maven/src/assembly/wrapper/source.xml | 89 +++++++
.../.mvn/wrapper/MavenWrapperDownloader.java | 131 +++++++++
apache-maven/src/assembly/wrapper/source/download | 34 +++
.../src/assembly/wrapper/source/download.cmd | 21 ++
apache-maven/src/bin/mvn | 199 --------------
apache-maven/src/bin/mvn.cmd | 201 --------------
.../apache/maven/settings/GlobalSettingsTest.java | 2 +-
maven-compat/pom.xml | 5 +
.../apache/maven/artifact/ArtifactScopeEnum.java | 2 +-
.../factory/DefaultArtifactFactoryTest.java | 10 +
.../transform/TransformationManagerTest.java | 10 +
.../project/AbstractMavenProjectTestCase.java | 2 +-
.../apache/maven/project/ProjectClasspathTest.java | 13 +-
.../apache/maven/project/TestProjectBuilder.java | 28 --
.../maven/repository/LegacyRepositoryLayout.java | 89 -------
.../repository/legacy/DefaultWagonManagerTest.java | 10 +
.../resolver/DefaultArtifactCollectorTest.java | 10 +
.../conflict/AbstractConflictResolverTest.java | 10 +
.../DefaultGraphConflictResolutionPolicyTest.java | 7 +-
maven-core/pom.xml | 3 +-
.../main/java/org/apache/maven/DefaultMaven.java | 76 +++++-
.../maven/DefaultProjectDependenciesResolver.java | 13 +-
.../main/java/org/apache/maven/ReactorReader.java | 105 +++++++-
.../artifact/factory/DefaultArtifactFactory.java | 11 +-
.../artifact/handler/DefaultArtifactHandler.java | 6 +-
.../manager/DefaultArtifactHandlerManager.java | 11 +-
.../repository/layout/DefaultRepositoryLayout.java | 7 +-
.../metadata/io/DefaultMetadataReader.java | 11 +-
.../resolver/DefaultResolutionErrorHandler.java | 6 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 23 +-
.../internal/DefaultBeanConfigurator.java | 7 +-
.../eventspy/internal/EventSpyDispatcher.java | 13 +-
.../maven/exception/DefaultExceptionHandler.java | 7 +-
...ldSuccess.java => BuildResumptionAnalyzer.java} | 24 +-
...{BuildSuccess.java => BuildResumptionData.java} | 34 ++-
.../execution/BuildResumptionDataRepository.java | 56 ++++
.../BuildResumptionPersistenceException.java} | 17 +-
.../execution/DefaultBuildResumptionAnalyzer.java | 162 +++++++++++
.../DefaultBuildResumptionDataRepository.java | 145 ++++++++++
.../execution/DefaultMavenExecutionRequest.java | 16 ++
.../DefaultMavenExecutionRequestPopulator.java | 2 +
.../execution/DefaultMavenExecutionResult.java | 14 +
.../maven/execution/MavenExecutionRequest.java | 11 +
.../maven/execution/MavenExecutionResult.java | 15 ++
.../org/apache/maven/execution/MavenSession.java | 2 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 240 ++++++++---------
.../maven/lifecycle/DefaultLifecycleExecutor.java | 33 +--
.../apache/maven/lifecycle/DefaultLifecycles.java | 13 +-
.../lifecycle/internal/BuildListCalculator.java | 15 +-
.../internal/DefaultExecutionEventCatapult.java | 7 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 26 +-
.../internal/DefaultLifecycleMappingDelegate.java | 18 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 22 +-
.../DefaultLifecycleTaskSegmentCalculator.java | 21 +-
.../internal/DefaultMojoExecutionConfigurator.java | 7 +-
.../lifecycle/internal/LifecycleDebugLogger.java | 23 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 23 +-
.../internal/LifecyclePluginResolver.java | 17 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 25 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 27 +-
.../maven/lifecycle/internal/MojoExecutor.java | 35 +--
.../lifecycle/internal/builder/BuilderCommon.java | 42 ++-
.../multithreaded/MultiThreadedBuilder.java | 13 +-
.../singlethreaded/SingleThreadedBuilder.java | 18 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 47 +---
.../maven/plugin/DefaultBuildPluginManager.java | 21 +-
.../maven/plugin/DefaultExtensionRealmCache.java | 7 +-
.../maven/plugin/DefaultPluginArtifactsCache.java | 7 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 7 +-
.../maven/plugin/DefaultPluginRealmCache.java | 7 +-
.../plugin/internal/DefaultLegacySupport.java | 8 +-
.../plugin/internal/DefaultMavenPluginManager.java | 31 ++-
.../DefaultPluginDependenciesResolver.java | 13 +-
.../plugin/internal/DefaultPluginManager.java | 23 +-
.../internal/DefaultPluginPrefixResolver.java | 19 +-
.../internal/DefaultPluginVersionResolver.java | 19 +-
.../maven/project/DefaultMavenProjectHelper.java | 18 +-
.../maven/project/DefaultProjectBuilder.java | 25 +-
.../project/DefaultProjectBuildingHelper.java | 21 +-
.../DefaultProjectDependenciesResolver.java | 15 +-
.../maven/project/DefaultProjectRealmCache.java | 7 +-
.../project/DependencyResolutionException.java | 2 +-
.../org/apache/maven/project/MavenProject.java | 24 +-
.../artifact/DefaultMavenMetadataCache.java | 7 +-
.../project/artifact/DefaultMetadataSource.java | 7 +-
.../artifact/DefaultProjectArtifactsCache.java | 7 +-
.../project/artifact/MavenMetadataSource.java | 32 ++-
.../rtinfo/internal/DefaultRuntimeInformation.java | 11 +-
.../settings/DefaultMavenSettingsBuilder.java | 11 +-
.../maven/toolchain/DefaultToolchainManager.java | 13 +-
.../toolchain/DefaultToolchainManagerPrivate.java | 7 +-
.../maven/toolchain/DefaultToolchainsBuilder.java | 11 +-
.../toolchain/io/DefaultToolchainsReader.java | 4 +-
.../toolchain/io/DefaultToolchainsWriter.java | 2 +-
.../maven/toolchain/java/JavaToolchainFactory.java | 11 +-
.../java/org/apache/maven/DefaultMavenTest.java | 31 ++-
.../configuration/DefaultBeanConfiguratorTest.java | 8 +-
.../DefaultBuildResumptionAnalyzerTest.java | 150 +++++++++++
.../DefaultBuildResumptionDataRepositoryTest.java | 78 ++++++
.../maven/graph/DefaultGraphBuilderTest.java | 295 +++++++++++++++++++++
.../maven/lifecycle/DefaultLifecyclesTest.java | 10 +
.../lifecycle/internal/BuilderCommonTest.java | 44 ++-
.../stub/LifecycleExecutionPlanCalculatorStub.java | 11 +-
.../apache/maven/project/PomConstructionTest.java | 116 ++++----
.../apache/maven/project/TestMetadataSource.java | 10 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 2 +-
.../artifact/DefaultProjectArtifactsCacheTest.java | 7 +-
.../maven/repository/LegacyRepositoryLayout.java | 89 -------
.../repository/TestRepositoryConnectorFactory.java | 7 +-
.../maven/repository/TestRepositorySystem.java | 22 +-
.../internal/DefaultRuntimeInformationTest.java | 11 +
.../project-with-inheritance/pom.xml | 2 +-
.../project-with-inheritance/pom.xml | 2 +-
.../test/projects/project-builder/MNG-6723/pom.xml | 38 ---
.../artifact-id-inheritance/child/pom.xml | 2 +-
.../artifact-id-inheritance/pom.xml | 4 +-
.../basedir-aligned-interpolation/pom.xml | 2 +-
.../pom-with-unusual-name.xml | 2 +-
.../baseuri-interpolation/pom.xml | 2 +-
.../boolean-interpolation/pom.xml | 2 +-
.../build-extension-inheritance/pom.xml | 2 +-
.../build-extension-inheritance/sub/pom.xml | 2 +-
.../complete-model/w-parent/pom.xml | 2 +-
.../complete-model/w-parent/sub/pom.xml | 34 +--
.../complete-model/wo-parent/pom.xml | 34 +--
.../contributors-inheritance/child-2/pom.xml | 2 +-
.../contributors-inheritance/pom.xml | 2 +-
.../dependency-inheritance/maven-parent.xml | 2 +-
.../dependency-inheritance/pom.xml | 4 +-
.../dependency-inheritance/sub/pom.xml | 4 +-
.../dependency-order/w-plugin-mgmt/pom.xml | 2 +-
.../dependency-order/wo-plugin-mgmt/pom.xml | 2 +-
.../developers-inheritance/child-2/pom.xml | 2 +-
.../developers-inheritance/pom.xml | 2 +-
.../distribution-management/pom.xml | 2 +-
.../resources-project-builder/empty-scm/pom.xml | 2 +-
.../equal-plugin-deps/pom.xml | 2 +-
.../equal-plugin-exec-ids/pom.xml | 2 +-
.../full-interpolation/pom.xml | 2 +-
.../pom.xml | 4 +-
.../sub/pom.xml | 2 +-
.../active-profile/pom.xml | 2 +-
.../active-profile/sub/pom.xml | 2 +-
.../no-profile/pom.xml | 2 +-
.../no-profile/sub/pom.xml | 2 +-
.../interpolation-cli-wins/pom.xml | 2 +-
.../jdk-activation/pom.xml | 2 +-
.../join-different-containers-same-id/pom.xml | 2 +-
.../licenses-inheritance/child-2/pom.xml | 4 +-
.../licenses-inheritance/pom.xml | 4 +-
.../limited-inheritance/child/pom.xml | 6 +-
.../limited-inheritance/pom.xml | 10 +-
.../mailing-lists-inheritance/child-2/pom.xml | 2 +-
.../mailing-lists-inheritance/pom.xml | 2 +-
.../managed-profile-dependency/pom.xml | 2 +-
.../managed-profile-dependency/sub/pom.xml | 2 +-
.../merged-filter-order/pom.xml | 2 +-
.../merged-filter-order/sub/pom.xml | 2 +-
.../w-plugin-mgmt/pom.xml | 2 +-
.../w-plugin-mgmt/sub/pom.xml | 2 +-
.../wo-plugin-mgmt/pom.xml | 2 +-
.../wo-plugin-mgmt/sub/pom.xml | 2 +-
.../w-plugin-mgmt/pom.xml | 2 +-
.../w-plugin-mgmt/sub/pom.xml | 2 +-
.../wo-plugin-mgmt/pom.xml | 2 +-
.../wo-plugin-mgmt/sub/pom.xml | 2 +-
.../merged-plugin-exec-order/w-plugin-mgmt/pom.xml | 2 +-
.../w-plugin-mgmt/sub/pom.xml | 2 +-
.../wo-plugin-mgmt/pom.xml | 2 +-
.../wo-plugin-mgmt/sub/pom.xml | 2 +-
.../resources-project-builder/micromailer/pom.xml | 4 +-
.../micromailer/spice-parent-9.pom | 2 +-
.../multiple-repos/pom.xml | 4 +-
.../multiple-repos/sub/pom.xml | 4 +-
.../nested-build-dir-interpolation/pom.xml | 2 +-
.../parent-pom-packaging/pom.xml | 2 +-
.../parent-pom-packaging/sub/pom.xml | 2 +-
.../platform-file-separator/pom.xml | 2 +-
.../plugin-config-append/no-profile/pom.xml | 2 +-
.../no-profile/subproject/pom.xml | 2 +-
.../plugin-config-append/with-profile/pom.xml | 2 +-
.../with-profile/subproject/pom.xml | 2 +-
.../plugin-config-attributes/w-plugin-mgmt/pom.xml | 2 +-
.../plugin-config-attributes/w-profile/pom.xml | 2 +-
.../wo-plugin-mgmt/pom.xml | 2 +-
.../plugin-config-merging/child/pom.xml | 2 +-
.../plugin-config-merging/pom.xml | 2 +-
.../plugin-config-order/w-plugin-mgmt/pom.xml | 2 +-
.../plugin-config-order/wo-plugin-mgmt/pom.xml | 2 +-
.../plugin-exec-config-order/w-plugin-mgmt/pom.xml | 2 +-
.../wo-plugin-mgmt/pom.xml | 2 +-
.../plugin-exec-goals-order/w-plugin-mgmt/pom.xml | 2 +-
.../plugin-exec-goals-order/wo-plugin-mgmt/pom.xml | 2 +-
.../plugin-exec-inheritance/pom.xml | 2 +-
.../plugin-exec-inheritance/w-merge/pom.xml | 2 +-
.../plugin-exec-inheritance/wo-merge/pom.xml | 2 +-
.../pom.xml | 2 +-
.../sub/pom.xml | 2 +-
.../plugin-exec-merging-wo-version/pom.xml | 2 +-
.../plugin-exec-merging-wo-version/sub/pom.xml | 2 +-
.../plugin-exec-merging/w-plugin-mgmt/pom.xml | 2 +-
.../plugin-exec-merging/w-plugin-mgmt/sub/pom.xml | 2 +-
.../plugin-exec-merging/wo-plugin-mgmt/pom.xml | 2 +-
.../plugin-exec-merging/wo-plugin-mgmt/sub/pom.xml | 2 +-
.../plugin-exec-order-and-default-exec/pom.xml | 2 +-
.../plugin-exec-order-with-lifecycle/pom.xml | 2 +-
.../plugin-exec-order/w-plugin-mgmt/pom.xml | 2 +-
.../plugin-exec-order/wo-plugin-mgmt/pom.xml | 2 +-
.../plugin-exec-w-and-wo-id/w-plugin-mgmt/pom.xml | 2 +-
.../plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml | 2 +-
.../plugin-inheritance-merge-order/pom.xml | 2 +-
.../plugin-inheritance-merge-order/sub/pom.xml | 2 +-
.../plugin-inheritance-order/child/pom.xml | 2 +-
.../plugin-inheritance-order/pom.xml | 2 +-
.../plugin-injection-merge-order/pom.xml | 2 +-
.../plugin-management-duplicate/pom.xml | 2 +-
.../plugin-management-duplicate/sub/pom.xml | 2 +-
.../child/pom.xml | 2 +-
.../plugin-management-for-implicit-plugin/pom.xml | 2 +-
.../plugin-management-inheritance/pom.xml | 2 +-
.../pom-encoding/latin-1/pom.xml | 2 +-
.../pom-encoding/utf-8/pom.xml | 2 +-
.../pom-inheritance/pom.xml | 22 +-
.../pom-inheritance/sub/pom.xml | 2 +-
.../prerequisites-inheritance/child/pom.xml | 2 +-
.../prerequisites-inheritance/pom.xml | 2 +-
.../profile-dependencies-multiple-profiles/pom.xml | 2 +-
.../profile-injected-dependencies/pom.xml | 2 +-
.../profile-injection-order/pom.xml | 2 +-
.../profile-plugin-mng-dependencies/pom.xml | 2 +-
.../profile-plugin-mng-dependencies/sub/pom.xml | 2 +-
.../profile-plugins/pom.xml | 2 +-
.../profile-properties-interpolation/pom.xml | 4 +-
.../properties-inheritance/pom.xml | 2 +-
.../properties-inheritance/sub/pom.xml | 2 +-
.../repo-inheritance/pom.xml | 2 +-
.../reporting-plugin-config/pom.xml | 2 +-
.../reporting-plugin-config/sub/pom.xml | 2 +-
.../system-property-interpolation/pom.xml | 2 +-
.../resources-project-builder/unc-path/pom.xml | 2 +-
.../resources-project-builder/unc-path/sub/pom.xml | 2 +-
.../dep-mgmt-in-profile/pom.xml | 2 +-
.../unique-dependency-key/dep-mgmt/pom.xml | 2 +-
.../unique-dependency-key/deps-in-profile/pom.xml | 2 +-
.../unique-dependency-key/deps/pom.xml | 2 +-
.../artifact-repo-in-profile/pom.xml | 6 +-
.../unique-repo-id/artifact-repo/pom.xml | 6 +-
.../unique-repo-id/plugin-repo-in-profile/pom.xml | 6 +-
.../unique-repo-id/plugin-repo/pom.xml | 6 +-
.../child/pom.xml | 14 +-
.../unprefixed-expression-interpolation/pom.xml | 2 +-
.../url-append/child/pom.xml | 2 +-
.../url-append/parent/pom.xml | 10 +-
.../url-inheritance/another-parent/pom.xml | 2 +-
.../url-inheritance/another-parent/sub/pom.xml | 2 +-
.../url-inheritance/pom.xml | 24 +-
.../url-inheritance/sub/pom.xml | 2 +-
.../url-no-decoding/pom.xml | 10 +-
.../xml-coalesce-text/pom.xml | 2 +-
.../xml-markup-interpolation/pom.xml | 2 +-
.../xml-whitespace/pom.xml | 2 +-
.../xml-whitespace/sub/pom.xml | 2 +-
.../resources/org/apache/maven/lifecycle/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
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 | 65 +++--
.../java/org/apache/maven/cli/MavenCliTest.java | 57 +++-
maven-model-builder/pom.xml | 5 -
.../StringSearchModelInterpolator.java | 4 +-
.../StringVisitorModelInterpolator.java | 2 +-
.../apache/maven/model/io/DefaultModelReader.java | 4 +-
.../apache/maven/model/io/DefaultModelWriter.java | 4 +-
.../resources/org/apache/maven/model/pom-4.0.0.xml | 10 +-
.../AbstractModelInterpolatorTest.java | 203 +++++++-------
.../StringSearchModelInterpolatorTest.java | 91 ++++---
.../StringVisitorModelInterpolatorTest.java | 22 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 10 +
.../plugin/descriptor/PluginDescriptorBuilder.java | 128 ++++++---
.../internal/DefaultVersionRangeResolver.java | 2 +-
.../internal/DefaultVersionResolver.java | 2 +-
.../maven/settings/io/DefaultSettingsReader.java | 4 +-
.../maven/settings/io/DefaultSettingsWriter.java | 4 +-
.../apache/maven/logwrapper/LogLevelRecorder.java | 28 +-
.../maven/logwrapper/LogLevelRecorderTest.java | 21 +-
{maven-slf4j-wrapper => maven-wrapper}/pom.xml | 42 ++-
.../apache/maven/wrapper/BootstrapMainStarter.java | 59 +++++
.../apache/maven/wrapper/DefaultDownloader.java | 192 ++++++++++++++
.../java/org/apache/maven/wrapper/Downloader.java | 52 ++++
.../java/org/apache/maven/wrapper/Installer.java | 226 ++++++++++++++++
.../main/java/org/apache/maven/wrapper/Logger.java | 23 +-
.../org/apache/maven/wrapper/MavenWrapperMain.java | 105 ++++++++
.../org/apache/maven/wrapper/PathAssembler.java | 131 +++++++++
.../apache/maven/wrapper/WrapperConfiguration.java | 116 ++++++++
.../org/apache/maven/wrapper/WrapperExecutor.java | 175 ++++++++++++
.../org/apache/maven/wrapper/DownloaderTest.java | 72 +++++
.../org/apache/maven/wrapper/InstallerTest.java | 210 +++++++++++++++
.../apache/maven/wrapper/PathAssemblerTest.java | 120 +++++++++
.../apache/maven/wrapper/WrapperExecutorTest.java | 207 +++++++++++++++
.../org/apache/maven/wrapper/wrapper.properties | 7 +-
pom.xml | 110 ++++----
339 files changed, 5736 insertions(+), 1915 deletions(-)
create mode 100644 Jenkinsfile.its
create mode 100644 apache-maven/maven-wrapper.pom
rename apache-maven/src/{main/assembly => assembly/maven}/bin.xml (93%)
rename apache-maven/src/{ => assembly/maven}/bin/.gitattributes (100%)
rename apache-maven/src/{ => assembly/maven}/bin/m2.conf (100%)
copy apache-maven/src/{ => assembly/maven}/bin/mvnDebug (100%)
mode change 100755 => 100644
copy apache-maven/src/{ => assembly/maven}/bin/mvnDebug.cmd (100%)
copy apache-maven/src/{ => assembly/maven}/bin/mvnyjp (100%)
mode change 100755 => 100644
rename apache-maven/src/{main/assembly => assembly/maven}/component.xml (70%)
rename apache-maven/src/{ => assembly/maven}/conf/logging/simplelogger.properties (100%)
rename apache-maven/src/{ => assembly/maven}/conf/settings.xml (99%)
rename apache-maven/src/{ => assembly/maven}/conf/toolchains.xml (100%)
rename apache-maven/src/{main/assembly => assembly/maven}/dir.xml (93%)
rename apache-maven/src/{ => assembly/maven}/lib/ext/README.txt (100%)
rename apache-maven/src/{ => assembly/maven}/lib/jansi-native/README.txt (100%)
rename apache-maven/src/{main/assembly => assembly/maven}/src.xml (100%)
create mode 100755 apache-maven/src/assembly/shared/init
create mode 100755 apache-maven/src/assembly/shared/init.cmd
create mode 100644 apache-maven/src/assembly/shared/mvnlauncher
create mode 100644 apache-maven/src/assembly/shared/mvnlauncher.cmd
create mode 100644 apache-maven/src/assembly/shared/mvnvalidate
create mode 100644 apache-maven/src/assembly/shared/mvnvalidate.cmd
rename apache-maven/src/{bin/mvnDebug => assembly/shared/mvnwDebug} (94%)
mode change 100755 => 100644
copy apache-maven/src/{bin/mvnDebug.cmd => assembly/shared/mvnwDebug.cmd} (98%)
create mode 100755 apache-maven/src/assembly/shared/mvnwlauncher
create mode 100755 apache-maven/src/assembly/shared/mvnwlauncher.cmd
create mode 100755 apache-maven/src/assembly/shared/run
create mode 100755 apache-maven/src/assembly/shared/run.cmd
rename apache-maven/src/{bin/mvnyjp => assembly/shared/validate} (58%)
mode change 100755 => 100644
rename apache-maven/src/{bin/mvnDebug.cmd => assembly/shared/validate.cmd} (58%)
create mode 100644 apache-maven/src/assembly/wrapper/bin.xml
create mode 100644 apache-maven/src/assembly/wrapper/script.xml
create mode 100755 apache-maven/src/assembly/wrapper/script/download
create mode 100755 apache-maven/src/assembly/wrapper/script/download.cmd
copy maven-core/src/test/resources/projects/build.properties => apache-maven/src/assembly/wrapper/shared/.mvn/wrapper/maven-wrapper.properties (84%)
create mode 100644 apache-maven/src/assembly/wrapper/source.xml
create mode 100644 apache-maven/src/assembly/wrapper/source/.mvn/wrapper/MavenWrapperDownloader.java
create mode 100644 apache-maven/src/assembly/wrapper/source/download
create mode 100644 apache-maven/src/assembly/wrapper/source/download.cmd
delete mode 100755 apache-maven/src/bin/mvn
delete mode 100644 apache-maven/src/bin/mvn.cmd
delete mode 100644 maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
copy maven-core/src/main/java/org/apache/maven/execution/{BuildSuccess.java => BuildResumptionAnalyzer.java} (59%)
copy maven-core/src/main/java/org/apache/maven/execution/{BuildSuccess.java => BuildResumptionData.java} (54%)
create mode 100644 maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java
copy maven-core/src/main/java/org/apache/maven/{BuildAbort.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/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/graph/DefaultGraphBuilderTest.java
delete mode 100644 maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
copy maven-core/src/main/java/org/apache/maven/BuildAbort.java => maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java (70%)
copy {maven-slf4j-wrapper => maven-wrapper}/pom.xml (57%)
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/DefaultDownloader.java
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/Downloader.java
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/Installer.java
copy maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java => maven-wrapper/src/main/java/org/apache/maven/wrapper/Logger.java (65%)
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/PathAssembler.java
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperConfiguration.java
create mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
create mode 100644 maven-wrapper/src/test/java/org/apache/maven/wrapper/DownloaderTest.java
create mode 100644 maven-wrapper/src/test/java/org/apache/maven/wrapper/InstallerTest.java
create mode 100644 maven-wrapper/src/test/java/org/apache/maven/wrapper/PathAssemblerTest.java
create mode 100644 maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
copy maven-core/src/test/resources/projects/build.properties => maven-wrapper/src/test/resources/org/apache/maven/wrapper/wrapper.properties (83%)