You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/01/06 18:47:59 UTC

[maven] branch MNG-6169_2/all-updated updated (82eb7ac -> c66bfef)

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch MNG-6169_2/all-updated
in repository https://gitbox.apache.org/repos/asf/maven.git.


    omit 82eb7ac  [MNG-6169] Lifecycle/binding plugin version updates
     add ff8f5e7  [maven-release-plugin] prepare release maven-3.5.0
     add a4b0b63  [maven-release-plugin] prepare for next development iteration
     add 4c6d3a3  Minor cleanup in MavenCli.java
     add 70eabfe  Update the DOAP to include the 3.5.0 release
     add 08f3c76  improved description of styled message API
     add 10a18cf  Added some javadoc
     add 6a93bbe  Improve Javadoc of ComparableVersion#main()
     add 567af0d  use "java -jar" command
     add ec629f7  MNG-6209 better executeMojo thread context classloader
     add c2c6259  MNG-6210 allow maven custom guice scopes in .mvn/extensions
     add 3938817  Doc improvement in simplelogger.properties
     add f7d4bce  [MNG-6149] MetadataResolutionResult#getGraph() never resolves request type 'test'
     add be22380  Add a ProjectArtifactsCache similar to PluginArtifactsCache
     add 2d44015  [MNG-6223] support -f path/to/dir when detecting .mvn
     add 2a79d1e  [MNG-6205] upgraded JAnsi to 1.16 for console encoding fix
     add 6182a20  [MNG-6186] use enhanced HawtJNI library loading (remove previous hack)
     add fd988e7  [MNG-6228] Optionality not displayed in dependency tree when run in debug mode
     add f4ede96  [MNG-5935] Optional true getting lost in managed dependencies when transitive
     add ecef59f  [MNG-6167] Clean up dependency mess (reported by dependency:analyze)
     add 4463498  improved modello and animal sniffer's execution ids
     add 66fc74d  MNG-6233 don't mix plexus and jsr330 annotations in aether-provider
     add a7dddcb  [MNG-6084] Support JSR 250 annotations
     add eb6b212  [MNG-6206] display deprecation build warning in case when dependencies use metaversions (LATEST or RELEASE)
     add 707cff6  [MNG-6186] fixed path to jansi native libs in distribution
     add 12d6471  [MNG-6207] Create WARNINGs in case of using system scope  o display deprecation build warning for dependencies with scope 'system' declaration  o Note about tests: existing 'systemPath' related tests are reused/expanded    (rationale: scope 'system' and 'systemPath' are mutually dependent)
     add a1fe421  [MNG-6240] Duplicate components in plugin extension realm when plugin depends on maven-aether-resolver
     add e520324  [MNG-6258] Upgrade to Maven Resolver 1.1.0
     add b100257  [MNG-5457] Show repository id when downloading or uploading from/to a remote repository
     add 8f8c45c  [MNG-6123] detect self references in POM and fail fast  o Added unit test and self referencing pom
     add 4f2a2db  [MNG-6174] Clean Up Maven Model
     add 842db37  [MNG-6148] Can't package and assemble with JDK9/Jigsaw
     add f1ed659  [MNG-6127] Fix plugin execution configuration interference
     add 785bad6  [MNG-6220] Add CLI options to control color output Introduce -Dstyle.color=[always|never|auto]
     add f047ea1  Squashed commit of the following:
     add e44c39c  Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm
     add 170c1ed  Revert "Squashed commit of the following:"
     add c9a288d  [MNG-6216] ArrayIndexOutOfBoundsException when parsing POM  o Upgraded to new release of plexus-utils which contains    the fix for #22 in plexus-utils.
     add 27a2bda  [MNG-6275] Maven Embedder compatible fix
     add 094e4e3  [maven-release-plugin] prepare release maven-3.5.1
     add 312eb53  [maven-release-plugin] prepare for next development iteration
     add 542a7a8  [MNG-6275] Defang the tests when their core assumption is invalid.
     add eb2db7b  [MNG-6196] updated slf4j to 1.7.25
     add 4f530c4  [MNG-6196] removed remaining Monkey patching, not really necessary
     add c19e9dc  [MNG-6242] detect Cygwin/Mingw pseudo terminal for Jansi
     add cae779e  Revert "[MNG-6275] Maven Embedder compatible fix"
     add 4b95ad9  Revert "MNG-6209 better executeMojo thread context classloader"
     add 138edd6  [maven-release-plugin] prepare release maven-3.5.2
     add 3d0efa3  [maven-release-plugin] prepare for next development iteration
     add 69c512a  Add the serverId to scm-publish so that we do not need to rely on cached svn credentials
     add 5919b74  Update DOAP
     add 4d49d3b  logging the module count to let the user identify how many module are still to be executed/processed
     add f5f76c7  [MNG-6302] display progress at end of "Building" line
     add b2afafe  Parse properties before configuring the logging settings
     add 909fb7c  Merge branch 'MNG-6296'
     add 866582d  [MNG-6306] Replace use of Guava in maven-resolver-provider with a lighter weight alternative
     add 35f3586  Start using some of the jenkinsEnv stuff
     add 3f04e94  Syntax
     add 5411c5a  Syntax
     add a670c2e  Ensure any forked Maven executions are not spied on by Jenkins
     add eee06f7  Ensure any forked Maven executions are not spied on by Jenkins
     add 98af937  [MNG-6300] Multi module release creates empty directories in war file instead of jars
     add df5169b  [MNG-6330] Parents relativePath not verified anymore
     add 2295c17  [MNG-6305] Validation of CI friendly version incorrect  o Checkin that only the three expression changelist,    revision and sha1 are valid in a version.  o Added some tests.
     add 6b83f7e  [MNG-6305] Validation of CI friendly version incorrect  o Followup removed unused declarations.
     add abd73da  [MNG-6331] Remove maven-bundle-pugin from build pluginManagement
     add 68a9d79  [MNG-6332] Cleaned up mvn.cmd Script
     add 98d2e19  [MNG-6308] added unit test for "Building" message
     add c2e3b3e  [MNG-6308] display groupId:artifactId in Building message header
     add 58cf490  [MNG-6308] added packaging in Building message footer and summary
     add 2b336ff  [MNG-6312] Update Maven Wagon dependency  o Upgrade wagon version to 3.0.0 based on CVE-2015-6748    in shaded jsoup.
     add c311e0d  [MNG-6296] 3.5.2: ClassNotFoundException: javax.annotation.security.RolesAllowed
     add 42918c3  Revert "[MNG-6296] 3.5.2: ClassNotFoundException: javax.annotation.security.RolesAllowed"
     add 6285bb9  [MNG-6298] 3.5.2: ClassNotFoundException: javax.annotation.security.RolesAllowed
     add 5988085  [MNG-6342] Emit a WARNING about LATEST/RELEASE in parent
     add 99e6622  [MNG-6340] [Performance]To make System.gc() call configurable in target summary code  o Just removed the System.gc() call.
     add 085ee9f  [MNG-5992] Upgrade default version of maven-release-plugin to 2.5.3
     add a03489b  [ MNG-6335] Update Mockito to 2.12.0
     add 867e5d5  [MNG-6255] Maven script cannot parse jvm.config with CRLF
     add 9168395  [MNG-6320] upgraded JAnsi to 1.17 to fix encoding issues
     add e2bc17b  [MNG-6282] removed workaround for MingW/GitBash detection
     add cf7b0a3  fixed new issues reported by Checkstyle 6.18
     add 0dc70cc  upgrade m-site-p to 3.7 + Fluido 1.7 + edit button
     add 40cf506  upgraded parent pom to version 31
     add d925081  Reduce number of global checkstyle rule violations
     add b8c06e6  Remove Google Guava usage (move to Java7)
     add 24b8820  [MNG-6353] Upgrade maven-shared-utils to 3.2.1
     add 22f782a  [MNG-6353] Upgrade maven-shared-utils to 3.2.1 Add o.a.m.s.u.logging.MessageUtils.registerShutdownHook() to prevent ANSI from staying active when killing an active process
     add cd34b08  Merge remote-tracking branch 'remotes/origin/MNG-6353'
     add 8f619ac  [MNG-6352] - Printout version information at the end of the build
     add 91d1edf  [MNG-6323] Deadlock in multithreaded dependency resolution In fact it was a very long sleep.....
     add 3383c37  [maven-release-plugin] prepare release maven-3.5.3
     add 85b4e3d  [maven-release-plugin] prepare for next development iteration
     add faa9ef0  [MNG-6370] ConcurrencyDependencyGraph#getNumberOfBuilds() does not remove finished projects from unfinished ones
     add b753981  update DOAP
     add 197b4be  removed configuration inherited from parent and more up-to-date
     add b04ad69  [MNG-6377] switch from Git-WIP to GitBox
     add af49a31  [MNG-6377] switch from Git-WIP to Gitbox
     add 2dbc644  [MNG-6377] switch from Git-WIP to Gitbox
     add fef1462  [MNG-6362] - Adding CONTRIBUTING, README.md pull_request_template for GitHub.
     add 0dbdda8  Add .factorypath from m2e to .gitignore
     add ef41c0e  updated model version to latest 1.1.0
     add 9c118d3  [MNG-6363] - Remove secret thread configuration property from code
     add 97e8a2b  because it is so more convenient to have this quick guide here when you are using a console to build maven and do not want to open some web link
     add 5beb347  Fix missing/improper use of @link
     add 8e0efaa  [MNG-6386] ${project.baseUri} is not a valid URI (according to RFC 3986)
     add 9abfc88  [MNG-5756] Java home output in mvn -v is misleading
     add 14365ba  [MNG-6403] Artifact#VERSION_FILE_PATTERN does not escape period between date and time
     add 9021d66  Move ArtifactUtilsTest and friends from maven-compat to maven-artifact
     add 3c3a590  [MNG-6382][MNG-6372] upgraded Jansi to 1.17.1
     add 454a4e7  [MNG-6411] Improve readability of project list returned when --resume-from option value is invalid
     add 39fdaad  added "Run ITs" prefix to IT stage names
     add 864d180  [MNG-6410] Add groupId to --resume-from suggestion if artifactId is not unique in reactor
     add 7fde626  simplified Jenkinsfile: avoid copy/paste
     add 6cb5db1  magnify a bit this line :-)
     add f1ed22d  Build core with JDK8 due to 'Received fatal alert: protocol_version' when downloading https://www.apache.org/licenses/LICENSE-2.0.txt
     add 5f8ee6d  [MNG-6423] Upgrade to Wagon 3.1.0
     add 3af07f8  [MNG-6364] run Core ITs also with Java 9
     add 29e9b50  [MNG-6344] Upgrade Guice to 4.2.0
     add 5b4e173  [MNG-5940] Change the maven-source-plugin jar goal into jar-no-fork in Maven Super POM
     add 1edded0  [maven-release-plugin] prepare release maven-3.5.4
     add 1efd571  [maven-release-plugin] prepare for next development iteration
     add bf0bd63  Master is now on 3.6.0-SNAPSHOT
     add 5f526ab  [INFRA-16467] move components documentation out of CMS space
     add a2b800d  update doap
     add 3d3c068  [MNG-6424] - Upgrade plexus-interpolation to 1.25
     add 5514aa7  Set https.protocols when running with JDK 7
     add a97b03a  Set https.protocols when running with JDK 7
     add 0e1cc11  Set https.protocols when running with JDK 7
     add 870d696  Set https.protocols when running with JDK 7
     add 6f41a82  reorganised dependency graph: group consumer vs build modules
     add 72dca39  Replace org.apache.commons.lang3.Validate#notNull with java.util.Objects#requireNonNull
     add 768e01c  [MNGSITE-339] Broken link: Mailing lists
     add 2ac9c4a  minor grammar fixes
     add e56fe97  [MNG-6449] - Upgrade parent to 32
     add 396f49d  [MGN-6383] - ProjectBuilder unnecessarily rebuilds modules with ci-friendly versions  o Thanks to Christoph Kunze for offering the fix.
     add f567471  improved documentation
     add 1f83d50  fixed typo + little javadoc improvements
     add d0f1efa  fixed dependency schema: model-builder depends on artifact
     add f87ba98  [MNG-6467] - Remove plugin definition from pom file which is inherited
     add 0627522  Update Jenkins build to use Maven 3.5.4 (#179)
     add e0db90a  [MNG-6473] Update Mockito to 2.21.0 (#181)
     add 01f098e  [MNG-6475] Remove unused Guava dependencies
     add 8bc3c20  [MNG-6311] Implement class-level ModelCache in DefaultProjectBuilder to solve slow pom resolutions
     add 10388b3  [MNG-6478] upgraded parent to 33 for sha512 checksum on release
     add ce6cc5d  [MNG-6414] Add more Apache license header patterns to skip downloading Apache license
     add 2e8e09f  [MNG-5951] add an option to avoid path addition to inherited URLs
     add 532eb24  [MNG-6358] indented code for better understanding
     add ed8bc6b  [MNG-6358] improved licenses sources for inclusion
     add 91fa89e  [MNG-6479] Upgrade XMLUnit to 2.2.1 (#183)
     add c3dfa0f  [MNG-6480] get non-Apache license from local resource
     add 421164e  Excluded the license files cause they do not contain a license of themselfs.
     add 7c1e712  [MNG-6415] Project Artifacts Cache does not retain the order of classpath entries.
     add ca45efd  [MNG-6486] Upgrade to Wagon 3.2.0
     add 2786490  Fixed typo in exception logging LegacyRepositorySystem
     add 44826ab  [MNG-6164] Collections inconsistently immutable
     add 0345cd1  [MNG-6489] Upgrade Maven Resolver to 1.3.0
     add 13a0a5f  [MNG-6491] upgraded commons-lang3 to fix tests failure with JDK 10/11
     add 6e619a1  [MNG-6496] Upgrade Maven Resolver to 1.3.1
     add 42c77a7  Repair Jenkins job - add a full path to workspace when run on Windows
     add 23f5c88  [MNG-6391] - Printout version of last built module in reactor build
     add e4b53d3  [MNG-6490] Maven shall not fail reporting circular dependency when the dependency is a classified secondary artifact
     add ba74b96  [MNG-6492] - Minor improvement on Array construction, conversion performance
     add 6688d76  [MNG-6497] - Upgrade guava / guice
     add 97c98ec  [maven-release-plugin] prepare release maven-3.6.0
     add 6e376d4  [maven-release-plugin] prepare for next development iteration
     add b5014bf  removed extra # in generated content
     add 0ee5dfb  Updated DOAP for Maven Core Release 3.6.0
     add 114a0e9  Updated Quick Build information.
     add db462ae  [MNG-6059] renamed attributes to get more flexibility for scm urls
     add f97316c  [MNG-6505] inherit child.x.y.inherit.append.path values
     add 07bd550  [MNG-6505] tweaked distributionManagement.site inheritance
     add 78f605e  [MNG-6515] Fix Javadoc build errors
     add f92bd9e  [MNG-6481] Run Maven Core Integration Tests with Java 7, 8 and 11
     add 86d4a91  [MNGSITE-357] README.md: Maven user list link not working
     add 9f07b03  [MNG-6261] - using File apis to compare
     add e4e33f7  [MNG-6261] Relative parent POM resolution failing in 3.5.0 with complex multimodule builds
     add 732e7de  [MNG-6529] ProjectBuilder.build(List<Project> ...) honor request.isResolveDependency
     add c6bdafe  [MNG-5965] Parallel build multiplies work if multiple goals are given
     add 6c4c2e3  Change to keep only 5 artifacts on master and on branches only 1 artifact.
     add c7ab987  [MNG-6544] Replace CacheUtils#{eq,hash} with Objects
     add 71128cb  spelling: vertices
     add 9c94626  [MNG-6213] Validate scope in dependencyManagement
     add 391a111  [MNG-6526] Upgrade to Wagon 3.3.1
     new c66bfef  [MNG-6169] Lifecycle/binding plugin version updates

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   (82eb7ac)
            \
             N -- N -- N   refs/heads/MNG-6169_2/all-updated (c66bfef)

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 1 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/pull_request_template.md                   |  30 +
 CONTRIBUTING.md                                    |  92 +++
 Jenkinsfile                                        | 210 +++---
 NOTICE                                             |   2 +-
 README.md                                          |  95 ++-
 apache-maven/README.txt                            |   4 +-
 apache-maven/pom.xml                               |  34 +-
 apache-maven/src/bin/mvn                           |  10 +-
 apache-maven/src/bin/mvn.cmd                       |  11 +-
 .../src/conf/logging/simplelogger.properties       |   5 +-
 .../main/appended-resources/META-INF/LICENSE.vm    |  63 +-
 .../main/appended-resources/licenses/CDDL-1.0.txt  | 384 ++++++++++
 .../main/appended-resources/licenses/EPL-1.0.txt   | 210 ++++++
 .../src/main/appended-resources/licenses/MIT.txt   |  14 +
 apache-maven/src/site/site.xml                     |   8 +-
 doap_Maven.rdf                                     |  71 +-
 maven-artifact/pom.xml                             |   2 +-
 .../java/org/apache/maven/artifact/Artifact.java   |   2 +-
 .../org/apache/maven/artifact/ArtifactUtils.java   |   3 +
 .../org/apache/maven/artifact/DefaultArtifact.java |   3 +-
 .../maven/artifact/handler/ArtifactHandler.java    |  16 +
 .../maven/artifact/metadata/ArtifactMetadata.java  |   3 +
 .../repository/ArtifactRepositoryPolicy.java       |   1 +
 .../maven/artifact/repository/Authentication.java  |   3 +
 .../layout/ArtifactRepositoryLayout2.java          |   3 +
 .../artifact/versioning/ComparableVersion.java     |  32 +-
 .../maven/artifact/versioning/VersionRange.java    |   2 +-
 .../java/org/apache/maven/repository/Proxy.java    |   3 +
 maven-artifact/src/site/site.xml                   |   8 +-
 .../apache/maven/artifact/ArtifactUtilsTest.java   |   2 +
 .../apache/maven/artifact/DefaultArtifactTest.java |   0
 .../artifact/handler/ArtifactHandlerMock.java      |   0
 maven-builder-support/pom.xml                      |  13 +-
 .../org/apache/maven/building/DefaultProblem.java  |   2 +-
 .../maven/building/DefaultProblemCollector.java    |   2 +-
 .../java/org/apache/maven/building/FileSource.java |   5 +-
 .../java/org/apache/maven/building/UrlSource.java  |   5 +-
 maven-builder-support/src/site/site.xml            |   8 +-
 maven-compat/pom.xml                               |  16 +-
 .../maven/artifact/deployer/ArtifactDeployer.java  |   3 +
 .../artifact/deployer/DefaultArtifactDeployer.java |   3 +
 .../artifact/manager/DefaultWagonManager.java      |   3 +
 .../repository/DefaultArtifactRepository.java      |   2 +-
 .../repository/layout/FlatRepositoryLayout.java    |   3 +
 .../repository/metadata/MetadataBridge.java        |   2 +-
 .../maven/artifact/resolver/ArtifactCollector.java |   4 +
 .../maven/artifact/resolver/ArtifactResolver.java  |   1 +
 .../resolver/DefaultArtifactCollector.java         |   4 +
 .../artifact/resolver/DefaultArtifactResolver.java |  11 +-
 .../resolver/filter/InversionArtifactFilter.java   |   3 +
 .../artifact/versioning/ManagedVersionMap.java     |   3 +
 .../profiles/DefaultMavenProfilesBuilder.java      |   3 +
 .../maven/profiles/DefaultProfileManager.java      |   3 +
 .../org/apache/maven/profiles/ProfileManager.java  |   3 +
 .../maven/profiles/ProfilesConversionUtils.java    |   3 +
 .../activation/DetectedProfileActivator.java       |   3 +
 .../profiles/activation/FileProfileActivator.java  |   3 +
 .../activation/JdkPrefixProfileActivator.java      |   3 +
 .../OperatingSystemProfileActivator.java           |   3 +
 .../activation/ProfileActivationException.java     |   3 +
 .../profiles/activation/ProfileActivator.java      |   3 +
 .../activation/SystemPropertyProfileActivator.java |   3 +
 .../DefaultProjectBuilderConfiguration.java        |   3 +
 .../project/InvalidProjectModelException.java      |   3 +
 .../project/MissingRepositoryElementException.java |   4 +-
 .../java/org/apache/maven/project/ModelUtils.java  |   6 +-
 .../org/apache/maven/project/ProjectUtils.java     |   3 +
 .../DefaultModelInheritanceAssembler.java          |   3 +
 .../AbstractStringBasedModelInterpolator.java      |   2 +-
 .../StringSearchModelInterpolator.java             |   7 +-
 .../maven/project/path/DefaultPathTranslator.java  |   3 +
 .../project/validation/DefaultModelValidator.java  |   2 +-
 .../maven/repository/DefaultMirrorSelector.java    |   3 +
 .../maven/repository/MetadataResolutionResult.java |  32 +-
 .../repository/UserLocalArtifactRepository.java    |   3 +
 .../legacy/DefaultUpdateCheckManager.java          |   3 +
 .../repository/legacy/DefaultWagonManager.java     |   5 +
 .../repository/legacy/LegacyRepositorySystem.java  |   6 +-
 .../maven/repository/legacy/MavenArtifact.java     |   2 +-
 .../repository/legacy/TransferListenerAdapter.java |   3 +
 .../repository/legacy/UpdateCheckManager.java      |   3 +
 .../legacy/WagonConfigurationException.java        |   4 +-
 .../maven/repository/legacy/WagonManager.java      |   3 +
 .../resolver/DefaultLegacyArtifactCollector.java   |   4 +
 .../legacy/resolver/LegacyArtifactCollector.java   |   1 +
 .../transform/ArtifactTransformationManager.java   |   4 +-
 .../transform/LatestArtifactTransformation.java    |   3 +
 .../repository/metadata/ArtifactMetadata.java      |  21 +-
 .../metadata/DefaultClasspathTransformation.java   |   2 +-
 .../repository/metadata/MetadataGraphEdge.java     |   1 +
 .../metadata/MetadataResolutionException.java      |   3 +
 .../MetadataResolutionRequestTypeEnum.java         |   3 +
 .../metadata/MetadataResolutionResult.java         |   2 +-
 .../plugin/ExpressionDocumentationException.java   |   3 +
 .../usability/plugin/ExpressionDocumenter.java     |   3 +
 maven-compat/src/site/site.xml                     |   8 +-
 maven-core/pom.xml                                 |  26 +-
 .../org/apache/maven/ArtifactFilterManager.java    |   3 +
 .../main/java/org/apache/maven/DefaultMaven.java   |   8 +-
 .../maven/DefaultProjectDependenciesResolver.java  |   5 +
 .../src/main/java/org/apache/maven/Maven.java      |   1 +
 .../org/apache/maven/MissingModuleException.java   |   3 +
 .../apache/maven/ProjectDependenciesResolver.java  |   2 +-
 .../main/java/org/apache/maven/ReactorReader.java  |   2 +-
 .../java/org/apache/maven/RepositoryUtils.java     |  78 +-
 .../maven/artifact/factory/ArtifactFactory.java    |   4 +
 .../artifact/factory/DefaultArtifactFactory.java   |   5 +
 .../metadata/AbstractArtifactMetadata.java         |   3 +
 .../ArtifactMetadataRetrievalException.java        |   3 +
 .../artifact/metadata/ArtifactMetadataSource.java  |   4 +
 .../maven/artifact/metadata/ResolutionGroup.java   |   3 +
 .../repository/LegacyLocalRepositoryManager.java   |   8 +-
 .../repository/MavenArtifactRepository.java        |   8 +-
 .../metadata/RepositoryMetadataManager.java        |   3 +
 .../metadata/io/DefaultMetadataReader.java         |   8 +-
 .../resolver/ArtifactResolutionResult.java         |  27 +-
 .../maven/artifact/resolver/ResolutionNode.java    |   4 +
 .../apache/maven/bridge/MavenRepositorySystem.java |  53 +-
 .../classrealm/ArtifactClassRealmConstituent.java  |   2 +-
 .../maven/classrealm/DefaultClassRealmManager.java |   8 +-
 .../maven/classrealm/DefaultClassRealmRequest.java |   4 +-
 .../internal/DefaultBeanConfigurator.java          |   8 +-
 .../java/org/apache/maven/eventspy/EventSpy.java   |   4 +-
 .../internal/EventSpyExecutionListener.java        |   2 +-
 .../internal/EventSpyRepositoryListener.java       |   2 +-
 .../maven/exception/DefaultExceptionHandler.java   |   3 +
 .../apache/maven/exception/ExceptionSummary.java   |   5 +-
 .../org/apache/maven/execution/BuildSummary.java   |   5 +-
 .../execution/DefaultMavenExecutionRequest.java    |  14 +-
 .../DefaultMavenExecutionRequestPopulator.java     |   3 +
 .../execution/DefaultMavenExecutionResult.java     |   6 +-
 .../org/apache/maven/execution/MavenSession.java   |   2 +
 .../org/apache/maven/execution/ReactorManager.java |   3 +
 .../apache/maven/execution/SettingsAdapter.java    |   2 +-
 .../scope/internal/MojoExecutionScope.java         |   9 +-
 .../internal/MojoExecutionScopeCoreModule.java     |   3 +
 .../scope/internal/MojoExecutionScopeModule.java   |   3 +
 .../maven/extension/internal/CoreExports.java      |  10 +-
 .../extension/internal/CoreExportsProvider.java    |   3 +
 .../extension/internal/CoreExtensionEntry.java     |  15 +-
 .../apache/maven/graph/DefaultGraphBuilder.java    |  40 +-
 .../maven/graph/DefaultProjectDependencyGraph.java |   6 +-
 .../graph/FilteredProjectDependencyGraph.java      |   8 +-
 .../internal/aether/LoggingRepositoryListener.java |   2 +-
 .../apache/maven/lifecycle/DefaultLifecycles.java  |   7 +-
 .../apache/maven/lifecycle/MavenExecutionPlan.java |   3 +
 .../internal/CompoundProjectExecutionListener.java |   2 +-
 .../lifecycle/internal/DefaultExecutionEvent.java  |   2 +-
 .../DefaultLifecycleExecutionPlanCalculator.java   |   5 +-
 .../internal/DefaultLifecycleMappingDelegate.java  |   5 +
 .../internal/DefaultLifecyclePluginAnalyzer.java   |  10 +-
 .../internal/DefaultProjectArtifactFactory.java    |   3 +
 .../internal/LifecycleDependencyResolver.java      |  60 +-
 .../maven/lifecycle/internal/MojoExecutor.java     |  18 +-
 .../internal/builder/BuilderNotFoundException.java |   3 +
 .../multithreaded/ConcurrencyDependencyGraph.java  |  15 +-
 .../multithreaded/MultiThreadedBuilder.java        |  10 +-
 .../builder/multithreaded/ThreadOutputMuxer.java   |   4 +-
 .../singlethreaded/SingleThreadedBuilder.java      |   5 +
 .../lifecycle/mapping/DefaultLifecycleMapping.java |   3 +
 .../maven/lifecycle/mapping/LifecycleMapping.java  |   3 +
 .../maven/lifecycle/mapping/LifecycleMojo.java     |   3 +
 .../maven/lifecycle/mapping/LifecyclePhase.java    |   3 +
 .../plugin/DefaultLifecycleBindingsInjector.java   |   4 +
 .../java/org/apache/maven/plugin/CacheUtils.java   | 121 +--
 .../plugin/CompoundMojoExecutionListener.java      |   2 +-
 .../maven/plugin/DefaultBuildPluginManager.java    |   3 +
 .../maven/plugin/DefaultExtensionRealmCache.java   |  10 +-
 .../maven/plugin/DefaultPluginArtifactsCache.java  |  45 +-
 .../maven/plugin/DefaultPluginDescriptorCache.java |   9 +-
 .../maven/plugin/DefaultPluginRealmCache.java      |  47 +-
 .../apache/maven/plugin/ExtensionRealmCache.java   |  27 +-
 .../plugin/InvalidPluginDescriptorException.java   |   3 +
 .../apache/maven/plugin/MavenPluginValidator.java  |   3 +
 .../org/apache/maven/plugin/MojoExecution.java     |   3 +
 .../apache/maven/plugin/PluginArtifactsCache.java  |  19 +-
 .../maven/plugin/PluginExecutionException.java     |   3 +
 .../maven/plugin/PluginParameterException.java     |   3 +
 .../plugin/PluginParameterExpressionEvaluator.java |   5 +-
 .../org/apache/maven/plugin/PluginRealmCache.java  |  20 +-
 .../plugin/internal/DefaultMavenPluginManager.java |  23 +-
 .../PluginDependencyResolutionListener.java        |   2 +-
 .../internal/ValidatingConfigurationListener.java  |   2 +-
 .../maven/plugin/internal/WagonExcluder.java       |   2 +-
 .../plugin/prefix/DefaultPluginPrefixRequest.java  |   4 +-
 .../prefix/NoPluginFoundForPrefixException.java    |   3 +
 .../prefix/internal/DefaultPluginPrefixResult.java |   6 +-
 .../version/DefaultPluginVersionRequest.java       |   2 +-
 .../version/PluginVersionNotFoundException.java    |   3 +
 .../version/PluginVersionResolutionException.java  |   3 +
 .../internal/DefaultPluginVersionResult.java       |   4 +-
 .../project/DefaultDependencyResolutionResult.java |   5 +-
 .../maven/project/DefaultMavenProjectHelper.java   |   3 +
 .../project/DefaultModelBuildingListener.java      |  13 +-
 .../maven/project/DefaultProjectBuilder.java       |  61 +-
 .../project/DefaultProjectBuildingHelper.java      |   6 +-
 .../project/DefaultProjectBuildingRequest.java     |   7 +-
 .../project/DefaultProjectBuildingResult.java      |   6 +-
 .../DefaultProjectDependenciesResolver.java        |   7 +-
 .../maven/project/DefaultProjectRealmCache.java    |  14 +-
 .../project/InvalidProjectVersionException.java    |   3 +
 .../org/apache/maven/project/MavenProject.java     |  25 +-
 .../maven/project/ProjectBuildingRequest.java      |   3 +
 .../apache/maven/project/ProjectModelResolver.java |  19 +-
 .../apache/maven/project/ProjectRealmCache.java    |  21 +-
 .../org/apache/maven/project/ProjectSorter.java    |   7 +-
 .../apache/maven/project/ReactorModelCache.java    |  10 +-
 .../org/apache/maven/project/ReactorModelPool.java |   4 +-
 .../project/artifact/ArtifactWithDependencies.java |   3 +
 .../artifact/DefaultMavenMetadataCache.java        |   9 +
 .../artifact/DefaultProjectArtifactsCache.java     | 248 +++++++
 .../maven/project/artifact/MavenMetadataCache.java |   3 +
 .../project/artifact/MavenMetadataSource.java      |   2 +-
 .../maven/project/artifact/PluginArtifact.java     |   3 +
 .../maven/project/artifact/ProjectArtifact.java    |  10 +-
 .../artifact/ProjectArtifactsCache.java}           |  48 +-
 .../repository/ArtifactDoesNotExistException.java  |   3 +
 .../ArtifactTransferFailedException.java           |   3 +
 .../maven/repository/ArtifactTransferListener.java |   3 +
 .../maven/repository/LocalArtifactRepository.java  |   3 +
 .../apache/maven/repository/RepositorySystem.java  |   3 +
 .../legacy/metadata/ResolutionGroup.java           |   3 +
 .../maven/session/scope/internal/SessionScope.java |  15 +-
 .../session/scope/internal/SessionScopeModule.java |   3 +
 .../toolchain/DefaultToolchainManagerPrivate.java  |   2 +-
 .../toolchain/io/DefaultToolchainsReader.java      |   8 +-
 .../maven/toolchain/java/JavaToolchainImpl.java    |   2 +-
 .../toolchain/merge/MavenToolchainMerger.java      |   6 +-
 .../main/resources/META-INF/maven/extension.xml    |   9 +
 maven-core/src/site/apt/artifact-handlers.apt      |  13 +-
 maven-core/src/site/apt/index.apt                  |   2 +-
 maven-core/src/site/site.xml                       |   8 +-
 .../maven/AbstractCoreMavenComponentTestCase.java  |  30 +-
 .../internal/ConcurrencyDependencyGraphTest.java   |   2 +-
 .../internal/LifecycleDependencyResolverTest.java  |  90 +++
 .../ConcurrencyDependencyGraphTest.java            |  83 +++
 .../lifecycle/internal/stub/MojoExecutorStub.java  |   5 +-
 .../project/LegacyLocalRepositoryManager.java      |   2 +-
 .../apache/maven/project/PomConstructionTest.java  |  81 +-
 .../apache/maven/project/ProjectBuilderTest.java   |  42 ++
 .../artifact/DefaultProjectArtifactsCacheTest.java |  72 ++
 .../maven/project/harness/PomTestWrapper.java      |   6 +-
 .../DefaultToolchainManagerPrivateTest.java        |  15 +-
 .../toolchain/DefaultToolchainManagerTest.java     |   4 +-
 .../building/DefaultToolchainsBuilderTest.java     |  14 +-
 .../lifecycle-dependency-resolver/lib}/pom.xml     |  10 +-
 .../lifecycle-dependency-resolver}/pom.xml         |  47 +-
 .../lifecycle-dependency-resolver/war}/pom.xml     |  34 +-
 .../pom.xml                                        |   0
 .../projects/basic-resolveDependencies.xml         |  15 +
 maven-embedder/pom.xml                             |  42 +-
 .../org/apache/maven/cli/CLIReportingUtils.java    |   7 +-
 .../java/org/apache/maven/cli/CleanArgument.java   |   5 +-
 .../main/java/org/apache/maven/cli/CliRequest.java |   3 +
 .../main/java/org/apache/maven/cli/MavenCli.java   | 182 ++---
 .../cli/configuration/ConfigurationProcessor.java  |   3 +
 .../SettingsXmlConfigurationProcessor.java         |   3 +
 .../maven/cli/event/DefaultEventSpyContext.java    |   3 +
 .../maven/cli/event/ExecutionEventLogger.java      | 114 ++-
 .../internal/BootstrapCoreExtensionManager.java    |   3 +
 .../maven/cli/logging/Slf4jConfiguration.java      |   5 +-
 .../transfer/AbstractMavenTransferListener.java    |  39 +-
 .../transfer/BatchModeMavenTransferListener.java   |   3 +
 .../cli/transfer/Slf4jMavenTransferListener.java   |  34 +-
 maven-embedder/src/site/apt/index.apt.vm           |   3 +-
 maven-embedder/src/site/site.xml                   |   8 +-
 .../java/org/apache/maven/cli/MavenCliTest.java    |  86 ++-
 .../maven/cli/event/ExecutionEventLoggerTest.java  | 106 +++
 maven-model-builder/pom.xml                        |  21 +-
 .../maven/model/building/DefaultModelBuilder.java  |  24 +-
 .../model/building/DefaultModelBuildingEvent.java  |   2 +-
 .../model/building/DefaultModelBuildingResult.java |  10 +-
 .../maven/model/building/DefaultModelProblem.java  |   1 +
 .../building/DefaultModelProblemCollector.java     |   2 +-
 .../model/building/DefaultModelProcessor.java      |   3 +
 .../maven/model/building/FileModelSource.java      |  23 +
 .../model/building/FilterModelBuildingRequest.java |   2 +-
 .../model/building/ModelBuildingException.java     |   2 +-
 .../org/apache/maven/model/building/ModelData.java |   6 +-
 .../apache/maven/model/building/ModelProblem.java  |   3 +
 .../building/ModelProblemCollectorRequest.java     |   7 +-
 .../maven/model/building/ModelProblemUtils.java    |   4 +-
 .../maven/model/building/ModelProcessor.java       |   3 +
 .../org/apache/maven/model/building/Result.java    | 109 +--
 .../inheritance/DefaultInheritanceAssembler.java   |   9 +-
 .../AbstractStringBasedModelInterpolator.java      |   2 +-
 .../interpolation/BuildTimestampValueSource.java   |   2 +-
 .../model/interpolation/MavenBuildTimestamp.java   |   3 +
 .../model/interpolation/ModelInterpolator.java     |   2 +-
 .../PathTranslatingPostProcessor.java              |   2 +-
 .../interpolation/ProblemDetectingValueSource.java |   2 +-
 .../StringSearchModelInterpolator.java             |  13 +-
 .../interpolation/UrlNormalizingPostProcessor.java |   2 +-
 .../apache/maven/model/io/DefaultModelReader.java  |   8 +-
 .../apache/maven/model/io/DefaultModelWriter.java  |  14 +-
 .../DefaultDependencyManagementInjector.java       |   4 +
 .../DefaultPluginManagementInjector.java           |   8 +-
 .../apache/maven/model/merge/MavenModelMerger.java |  43 +-
 .../normalization/DefaultModelNormalizer.java      |   3 +
 .../model/profile/DefaultProfileInjector.java      |   4 +
 .../model/resolution/WorkspaceModelResolver.java   |   3 +
 .../model/validation/DefaultModelValidator.java    | 115 ++-
 .../resources/org/apache/maven/model/pom-4.0.0.xml |   4 +-
 maven-model-builder/src/site/apt/index.apt         |   8 +
 maven-model-builder/src/site/site.xml              |   8 +-
 .../maven/model/building/FileModelSourceTest.java  |  75 ++
 .../DefaultInheritanceAssemblerTest.java           |  96 ++-
 .../activation/AbstractProfileActivatorTest.java   |   5 +-
 .../validation/DefaultModelValidatorTest.java      | 147 +++-
 ...lat-urls-child.xml => no-append-urls-child.xml} |   0
 ...urls-parent.xml => no-append-urls-expected.xml} |  30 +-
 ...t-urls-parent.xml => no-append-urls-parent.xml} |  13 +-
 ...at-urls-child.xml => no-append-urls2-child.xml} |   9 +
 ...s-expected.xml => no-append-urls2-expected.xml} |  20 +-
 ...{urls-parent.xml => no-append-urls2-parent.xml} |  18 +-
 ...at-urls-child.xml => no-append-urls3-child.xml} |   7 +
 ...rls-parent.xml => no-append-urls3-expected.xml} |  29 +-
 ...{urls-parent.xml => no-append-urls3-parent.xml} |  18 +-
 .../inheritance/plugin-configuration-expected.xml  |   2 +-
 ...ier.xml => bad-dependency-management-scope.xml} |  38 +-
 ...dependency-metaversions-latest-and-release.xml} |  13 +-
 .../raw-model/bad-ci-friendly-sha1plus.xml}        |  22 +-
 .../raw-model/bad-ci-friendly-sha1plus2.xml}       |  22 +-
 .../raw-model/bad-ci-friendly.xml}                 |  22 +-
 .../raw-model/bad-parent-version-latest.xml        |  36 +-
 .../raw-model/bad-parent-version-release.xml       |  36 +-
 .../raw-model/ok-ci-friendly-all-expressions.xml}  |  23 +-
 .../raw-model/ok-ci-friendly-changelist.xml}       |  22 +-
 .../raw-model/ok-ci-friendly-revision.xml}         |  22 +-
 .../raw-model/ok-ci-friendly-sha1.xml}             |  22 +-
 .../raw-model/self-referencing-classifier.xml      |  28 +-
 .../poms/validation/raw-model/self-referencing.xml |  37 +-
 maven-model/pom.xml                                |   8 +-
 .../org/apache/maven/model/merge/ModelMerger.java  |  85 ++-
 maven-model/src/main/mdo/maven.mdo                 | 826 ++++-----------------
 maven-model/src/site/site.xml                      |   8 +-
 maven-plugin-api/pom.xml                           |  12 +-
 .../java/org/apache/maven/plugin/AbstractMojo.java |   5 +-
 .../apache/maven/plugin/MojoNotFoundException.java |   3 +
 .../DuplicateMojoDescriptorException.java          |   3 +
 .../descriptor/DuplicateParameterException.java    |   3 +
 .../InvalidPluginDescriptorException.java          |   3 +
 .../plugin/descriptor/PluginDescriptorBuilder.java |   1 +
 maven-plugin-api/src/site/site.xml                 |   8 +-
 maven-repository-metadata/pom.xml                  |   2 +-
 maven-repository-metadata/src/site/site.xml        |   8 +-
 maven-resolver-provider/pom.xml                    |  25 +-
 .../internal/ArtifactDescriptorReaderDelegate.java |   6 +-
 .../internal/DefaultArtifactDescriptorReader.java  |  52 +-
 .../repository/internal/DefaultModelCache.java     |   2 +-
 .../repository/internal/DefaultModelResolver.java  |  24 +-
 .../internal/DefaultVersionRangeResolver.java      |  39 +-
 .../internal/DefaultVersionResolver.java           |  48 +-
 .../repository/internal/LocalSnapshotMetadata.java |   4 +-
 .../internal/LocalSnapshotMetadataGenerator.java   |   2 +-
 .../repository/internal/MavenResolverModule.java   |   3 +
 .../repository/internal/MavenWorkspaceReader.java  |   3 +
 .../repository/internal/RelocatedArtifact.java     |   6 +-
 .../internal/RemoteSnapshotMetadata.java           |   2 +-
 .../internal/RemoteSnapshotMetadataGenerator.java  |   2 +-
 .../internal/SnapshotMetadataGeneratorFactory.java |   7 +-
 .../repository/internal/VersionsMetadata.java      |   4 +-
 .../internal/VersionsMetadataGenerator.java        |   4 +-
 .../internal/VersionsMetadataGeneratorFactory.java |   7 +-
 maven-resolver-provider/src/site/site.xml          |   8 +-
 maven-settings-builder/pom.xml                     |   6 +-
 .../building/DefaultSettingsBuildingResult.java    |   2 +-
 .../building/DefaultSettingsProblemCollector.java  |   2 +-
 .../crypto/DefaultSettingsDecryptionResult.java    |   2 +-
 .../maven/settings/io/DefaultSettingsReader.java   |   8 +-
 .../maven/settings/io/DefaultSettingsWriter.java   |  14 +-
 maven-settings-builder/src/site/site.xml           |   8 +-
 maven-settings/pom.xml                             |   2 +-
 maven-settings/src/main/mdo/settings.mdo           |   6 +-
 maven-settings/src/site/apt/index.apt              |   2 +-
 maven-settings/src/site/site.xml                   |   8 +-
 maven-slf4j-provider/pom.xml                       |  22 +-
 .../java/org/slf4j/impl/MavenSimpleLogger.java     |  17 +-
 .../org/slf4j/impl/MavenSimpleLoggerFactory.java   |   3 +
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |  89 +++
 .../src/main/script/patch-slf4j-simple.groovy      |  53 --
 maven-slf4j-provider/src/site/site.xml             |   8 +-
 pom.xml                                            | 137 ++--
 src/site/resources/images/maven-deps.png           | Bin 69010 -> 104566 bytes
 src/site/site.xml                                  |  13 +-
 src/site/xdoc/index.xml                            |  58 +-
 src/site/xdoc/maven-deps.odg                       | Bin 18600 -> 19887 bytes
 387 files changed, 4891 insertions(+), 2503 deletions(-)
 create mode 100644 .github/pull_request_template.md
 create mode 100644 CONTRIBUTING.md
 create mode 100644 apache-maven/src/main/appended-resources/licenses/CDDL-1.0.txt
 create mode 100644 apache-maven/src/main/appended-resources/licenses/EPL-1.0.txt
 create mode 100644 apache-maven/src/main/appended-resources/licenses/MIT.txt
 rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java (93%)
 rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java (100%)
 rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java (100%)
 create mode 100644 maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
 copy maven-core/src/main/java/org/apache/maven/{plugin/PluginArtifactsCache.java => project/artifact/ProjectArtifactsCache.java} (63%)
 create mode 100644 maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java
 create mode 100644 maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java
 create mode 100644 maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java
 copy maven-core/src/test/{resources-project-builder/system-property-interpolation => projects/lifecycle-dependency-resolver/lib}/pom.xml (83%)
 copy maven-core/src/test/{resources-project-builder/plugin-exec-merging-wo-version => projects/lifecycle-dependency-resolver}/pom.xml (57%)
 copy maven-core/src/test/{resources-project-builder/plugin-inheritance-order/child => projects/lifecycle-dependency-resolver/war}/pom.xml (64%)
 rename maven-core/src/test/resources-project-builder/{baseurl-interpolation => baseuri-interpolation}/pom.xml (100%)
 create mode 100644 maven-core/src/test/resources/projects/basic-resolveDependencies.xml
 create mode 100644 maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
 create mode 100644 maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
 copy maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-child.xml => no-append-urls-child.xml} (100%)
 copy maven-model-builder/src/test/resources/poms/inheritance/{urls-parent.xml => no-append-urls-expected.xml} (65%)
 copy maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-parent.xml => no-append-urls-parent.xml} (74%)
 copy maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-child.xml => no-append-urls2-child.xml} (77%)
 copy maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-expected.xml => no-append-urls2-expected.xml} (69%)
 copy maven-model-builder/src/test/resources/poms/inheritance/{urls-parent.xml => no-append-urls2-parent.xml} (76%)
 copy maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-child.xml => no-append-urls3-child.xml} (81%)
 copy maven-model-builder/src/test/resources/poms/inheritance/{tricky-flat-artifactId-urls-parent.xml => no-append-urls3-expected.xml} (72%)
 copy maven-model-builder/src/test/resources/poms/inheritance/{urls-parent.xml => no-append-urls3-parent.xml} (76%)
 copy maven-model-builder/src/test/resources/poms/validation/{bad-import-scope-classifier.xml => bad-dependency-management-scope.xml} (53%)
 copy maven-model-builder/src/test/resources/poms/validation/{bad-import-scope-type.xml => deprecated-dependency-metaversions-latest-and-release.xml} (85%)
 copy maven-model-builder/src/test/resources/poms/{inheritance/empty-urls-child.xml => validation/raw-model/bad-ci-friendly-sha1plus.xml} (64%)
 copy maven-model-builder/src/test/resources/poms/{inheritance/empty-urls-child.xml => validation/raw-model/bad-ci-friendly-sha1plus2.xml} (64%)
 copy maven-model-builder/src/test/resources/poms/{inheritance/empty-urls-child.xml => validation/raw-model/bad-ci-friendly.xml} (65%)
 copy maven-embedder/src/examples/simple-project/pom.xml => maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml (58%)
 copy maven-embedder/src/examples/simple-project/pom.xml => maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml (58%)
 copy maven-model-builder/src/test/resources/poms/{inheritance/tricky-flat-directory-urls-child.xml => validation/raw-model/ok-ci-friendly-all-expressions.xml} (64%)
 copy maven-model-builder/src/test/resources/poms/{inheritance/empty-urls-child.xml => validation/raw-model/ok-ci-friendly-changelist.xml} (64%)
 copy maven-model-builder/src/test/resources/poms/{inheritance/empty-urls-child.xml => validation/raw-model/ok-ci-friendly-revision.xml} (65%)
 copy maven-model-builder/src/test/resources/poms/{inheritance/empty-urls-child.xml => validation/raw-model/ok-ci-friendly-sha1.xml} (65%)
 copy maven-embedder/src/examples/simple-project/pom.xml => maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml (63%)
 copy maven-embedder/src/examples/simple-project/pom.xml => maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml (58%)
 create mode 100644 maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
 delete mode 100644 maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy


[maven] 01/01: [MNG-6169] Lifecycle/binding plugin version updates

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MNG-6169_2/all-updated
in repository https://gitbox.apache.org/repos/asf/maven.git

commit c66bfef9661a2e29354e80f5f061e8b6adbdc8e7
Author: Christian Schulte <cs...@apache.org>
AuthorDate: Sat Feb 11 19:19:35 2017 +0100

    [MNG-6169] Lifecycle/binding plugin version updates
---
 .../main/resources/META-INF/plexus/components.xml  |  7 +-
 .../resources/META-INF/plexus/default-bindings.xml | 98 +++++++++++-----------
 2 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml
index 3f099cb..ff41c8a 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -77,8 +77,9 @@ under the License.
           <phase>post-clean</phase>
         </phases>
         <default-phases>
+          <!-- DO NOT upgrade to 3.0.0 or newer, SUREFIRE-722 fails repeatedly on FreeBSD -->
           <clean>
-            org.apache.maven.plugins:maven-clean-plugin:2.5:clean
+            org.apache.maven.plugins:maven-clean-plugin:2.6.1:clean
           </clean>
         </default-phases>
         <!-- END SNIPPET: clean -->
@@ -101,10 +102,10 @@ under the License.
         </phases>
         <default-phases>
           <site>
-            org.apache.maven.plugins:maven-site-plugin:3.3:site
+            org.apache.maven.plugins:maven-site-plugin:3.6:site
           </site>
           <site-deploy>
-            org.apache.maven.plugins:maven-site-plugin:3.3:deploy
+            org.apache.maven.plugins:maven-site-plugin:3.6:deploy
           </site-deploy>
         </default-phases>
         <!-- END SNIPPET: site -->
diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
index 4a303db..a4fed36 100644
--- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
@@ -41,10 +41,10 @@ Mappings to default lifecycle, specific for each packaging.
             <!-- START SNIPPET: pom-lifecycle -->
             <phases>
               <install>
-                org.apache.maven.plugins:maven-install-plugin:2.4:install
+                org.apache.maven.plugins:maven-install-plugin:2.5.2:install
               </install>
               <deploy>
-                org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+                org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
               </deploy>
             </phases>
             <!-- END SNIPPET: pom-lifecycle -->
@@ -67,28 +67,28 @@ Mappings to default lifecycle, specific for each packaging.
             <!-- START SNIPPET: jar-lifecycle -->
             <phases>
               <process-resources>
-                org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+                org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
               </process-resources>
               <compile>
-                org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+                org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile
               </compile>
               <process-test-resources>
-                org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+                org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources
               </process-test-resources>
               <test-compile>
-                org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+                org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
               </test-compile>
               <test>
-                org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
+                org.apache.maven.plugins:maven-surefire-plugin:2.20:test
               </test>
               <package>
-                org.apache.maven.plugins:maven-jar-plugin:2.4:jar
+                org.apache.maven.plugins:maven-jar-plugin:3.0.2:jar
               </package>
               <install>
-                org.apache.maven.plugins:maven-install-plugin:2.4:install
+                org.apache.maven.plugins:maven-install-plugin:2.5.2:install
               </install>
               <deploy>
-                org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+                org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
               </deploy>
             </phases>
             <!-- END SNIPPET: jar-lifecycle -->
@@ -111,28 +111,28 @@ Mappings to default lifecycle, specific for each packaging.
             <!-- START SNIPPET: ejb-lifecycle -->
             <phases>
               <process-resources>
-                org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+                org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
               </process-resources>
               <compile>
-                org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+                org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile
               </compile>
               <process-test-resources>
-                org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+                org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources
               </process-test-resources>
               <test-compile>
-                org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+                org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
               </test-compile>
               <test>
-                org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
+                org.apache.maven.plugins:maven-surefire-plugin:2.20:test
               </test>
               <package>
-                org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb
+                org.apache.maven.plugins:maven-ejb-plugin:2.5.1:ejb
               </package>
               <install>
-                org.apache.maven.plugins:maven-install-plugin:2.4:install
+                org.apache.maven.plugins:maven-install-plugin:2.5.2:install
               </install>
               <deploy>
-                org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+                org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
               </deploy>
             </phases>
             <!-- END SNIPPET: ejb-lifecycle -->
@@ -155,32 +155,32 @@ Mappings to default lifecycle, specific for each packaging.
             <!-- START SNIPPET: maven-plugin-lifecycle -->
             <phases>
               <process-resources>
-                org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+                org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
               </process-resources>
               <compile>
-                org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+                org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile
               </compile>
               <process-classes>
-                org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor
+                org.apache.maven.plugins:maven-plugin-plugin:3.3:descriptor
               </process-classes>
               <process-test-resources>
-                org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+                org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources
               </process-test-resources>
               <test-compile>
-                org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+                org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
               </test-compile>
               <test>
-                org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
+                org.apache.maven.plugins:maven-surefire-plugin:2.20:test
               </test>
               <package>
-                org.apache.maven.plugins:maven-jar-plugin:2.4:jar,
-                org.apache.maven.plugins:maven-plugin-plugin:3.2:addPluginArtifactMetadata
+                org.apache.maven.plugins:maven-jar-plugin:3.0.2:jar,
+                org.apache.maven.plugins:maven-plugin-plugin:3.3:addPluginArtifactMetadata
               </package>
               <install>
-                org.apache.maven.plugins:maven-install-plugin:2.4:install
+                org.apache.maven.plugins:maven-install-plugin:2.5.2:install
               </install>
               <deploy>
-                org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+                org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
               </deploy>
             </phases>
             <!-- END SNIPPET: maven-plugin-lifecycle -->
@@ -203,28 +203,28 @@ Mappings to default lifecycle, specific for each packaging.
             <!-- START SNIPPET: war-lifecycle -->
             <phases>
               <process-resources>
-                org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+                org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
               </process-resources>
               <compile>
-                org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+                org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile
               </compile>
               <process-test-resources>
-                org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+                org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources
               </process-test-resources>
               <test-compile>
-                org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+                org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
               </test-compile>
               <test>
-                org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
+                org.apache.maven.plugins:maven-surefire-plugin:2.20:test
               </test>
               <package>
-                org.apache.maven.plugins:maven-war-plugin:2.2:war
+                org.apache.maven.plugins:maven-war-plugin:3.0.0:war
               </package>
               <install>
-                org.apache.maven.plugins:maven-install-plugin:2.4:install
+                org.apache.maven.plugins:maven-install-plugin:2.5.2:install
               </install>
               <deploy>
-                org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+                org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
               </deploy>
             </phases>
             <!-- END SNIPPET: war-lifecycle -->
@@ -247,19 +247,19 @@ Mappings to default lifecycle, specific for each packaging.
             <!-- START SNIPPET: ear-lifecycle -->
             <phases>
               <generate-resources>
-                org.apache.maven.plugins:maven-ear-plugin:2.8:generate-application-xml
+                org.apache.maven.plugins:maven-ear-plugin:2.9.1:generate-application-xml
               </generate-resources>
               <process-resources>
-                org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+                org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
               </process-resources>
               <package>
-                org.apache.maven.plugins:maven-ear-plugin:2.8:ear
+                org.apache.maven.plugins:maven-ear-plugin:2.9.1:ear
               </package>
               <install>
-                org.apache.maven.plugins:maven-install-plugin:2.4:install
+                org.apache.maven.plugins:maven-install-plugin:2.5.2:install
               </install>
               <deploy>
-                org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+                org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
               </deploy>
             </phases>
             <!-- END SNIPPET: ear-lifecycle -->
@@ -282,28 +282,28 @@ Mappings to default lifecycle, specific for each packaging.
             <!-- START SNIPPET: rar-lifecycle -->
             <phases>
               <process-resources>
-                org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+                org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
               </process-resources>
               <compile>
-                org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+                org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile
               </compile>
               <process-test-resources>
-                org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+                org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources
               </process-test-resources>
               <test-compile>
-                org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+                org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
               </test-compile>
               <test>
-                org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
+                org.apache.maven.plugins:maven-surefire-plugin:2.20:test
               </test>
               <package>
-                org.apache.maven.plugins:maven-rar-plugin:2.2:rar
+                org.apache.maven.plugins:maven-rar-plugin:2.4:rar
               </package>
               <install>
-                org.apache.maven.plugins:maven-install-plugin:2.4:install
+                org.apache.maven.plugins:maven-install-plugin:2.5.2:install
               </install>
               <deploy>
-                org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+                org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
               </deploy>
             </phases>
             <!-- END SNIPPET: rar-lifecycle -->