[maven] branch MNG-6957 created (now b9607f0)

[rf...@apache.org]

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

rfscholte pushed a change to branch MNG-6957
in repository https://gitbox.apache.org/repos/asf/maven.git.


      at b9607f0  fix merge

This branch includes the following new commits:

     new 2469718  Merge branch 'master' of https://gitbox.apache.org/repos/asf/maven
     new acaaf88  MNG-6957: extract inherit
     new 0a1cb05  MNG-6957: remove model from inherit method
     new 121bd9e  Simplify code
     new a5e7ee6  Get modules from fileModel, respect profiles (which can also contain modules)
     new 208de10  Add activeExternalProfiles
     new f03490b  No need to check getActiveExternalProfiles, can't contain modules
     new 2ed1627  Moving up setters of result
     new cbf6c29  No need to keep activeProfiles in ModelData
     new a77383a  result.setRawModel( modelId, rawModel ) can also be moved
     new 98afc31  lineage can just a Models
     new 598060d  Replace ModelSource with Source
     new e4cd759  Make clear where rawModel and model should be used
     new 30f4f3a  Use rawModel to read get parent
     new 5a2b9b5  pick up tmpModel from result
     new 24109e0  extract profiles from result
     new 3c5f811  verify superpom by id
     new 0a04f51  check currentData by id
     new a324124  ModelData.rawModel is never used
     new d486b4e  pick up inherited model from lineage
     new cb39b97  Don't update ModelData
     new 3265c13  No need to change GAV for ModelData
     new e7d2801  checkPluginVersions must use lineage
     new fa8de9c  Split collecting raw models from inheritence
     new 72c59d6  Set effectiveModel instance early
     new a655fe9  start reading poms witout parent
     new 7b244ae  move effectivemodel to phase 2
     new a9e603c  get activeExternalProfiles from result
     new 5ac87c4  in case of root, pick up effectivepom from result
     new a044f10  some code is only required for non root
     new ac44aa9  poolbuilder can use effectivemodel
     new 6b6df5d  move fileModel to result
     new 0c61fdf  properly assign effective model
     new 87e735f  Read modules from fileModel
     new 36ccdb7  During 2 phase builds use the fileModel
     new 87abbb9  Move setEffectiveModel
     new b00bd46  initProject after phase two
     new a32a6f7  prepare rawModels for phase two builds
     new d914299  pick up effective pom later
     new 81e93bd  use fileModel for originalModel
     new 5520ac3  use pomFile as key of projectIndex
     new 628f50a  pick up pom from fileModel
     new 8b87e55  Move rawModels to phase 2 No need for pre-init project anymore
     new c4e216d  modelSource is never null
     new 95b60a0  Always look in cache for model
     new 3802003  Use modelSource to set pomFile
     new ec90603  use modelSource's inputStream to read model
     new eeb49bc  select severity based on modelSource instance
     new 136d396  early check for fatal errors
     new 48db31d  extract readRawModel
     new aaa7067  Always use request.getModelSource() as cacheKey
     new 20170b0  always cache fileModel
     new 7191f91  Split readRawModel from readModel
     new e173320  put fileModel in cache when available
     new 2a51bf1  Use the same model
     new 213bc84  improve moment of cloning
     new 3d1270a  Don't set pom on model
     new 93b5a01  ProjectBuilder should use rawModel because of its profile activations
     new b503507  directly set preferred source
     new 49ee2ae  No need to set the project file again
     new 2f53b5b  improve naming of variables
     new 7f79fdc  rawModels should be based on rawModel
     new 2a46f8c  rawModel most be activated, not the fileModel
     new 3e08457  switch methods
     new 4c69a1f  Move readRawModel to phase 2
     new a96a27a  Use pomFile so context is used
     new a669e08  verify version after groupId+artifactId
     new 3e6d30e  effective model should not be cached as raw model
     new d699e71  rename method
     new 1ccd145  cache raw pom for inheritance
     new cc239b8  Move buildconsumer to phase 2
     new 68ad1a5  Use stream for collecting profile ids
     new 2b41e8d  Combine methods to reduce cache
     new 2c7a891  move readRawModel, is only used once
     new dce61af  always return new result
     new daaf2f0  Don't auto cast
     new 587df50  start moving call readFileModel
     new 33c2dc0  use rawModel for artifactId
     new e1f9853  move readFileModel for parents
     new 6bc43be  clean up code
     new 2376951  use result of readRawModel
     new 847de5e  TransformerContext must use ModelCache
     new 2e55731  Happy flow build consumer restored
     new 53bb4ed  No need to cache temp raw model during phase 1
     new 6e36900  No need to reset getModelIds anymore
     new f254871  Provide option key for transformerContext
     new 7b4908d  inline code
     new 94a74e1  rename to readEffectiveModel, so we have all readXModel available
     new ebb85d2  Remove pomFile parameter
     new 22038bc  prepare reading unknown dependency from build/consumer pom
     new 3224175  Fix early dependency reactor read for build/consumer
     new 8bdd48a  Fix buildconsumer for unknown parent
     new 3153d92  This can stay ModelBuildingRequest
     new 091eaf1  Remove redundant parameter of readFileModel
     new d2e9e29  remove redundant parameter from readRawModel
     new 9e2a32c  Introduce DefaultTransformerContext, initialized during build, immutable during consume.
     new 8d071ed  Pass ModelBuildingRequest
     new 20f7067  Refactor code
     new eb406ff  Update documentation
     new 7f39d05  Add javadoc
     new b44c333  Improve parentFilter, change requirement getRawModel by Path
     new 9638628  Extract interface, only DefaultModelBuilder should be aware of implementation of TransformerContextBuilder
     new faffc45  improve documentation, make tags name similar
     new f3e8d97  improve documentation
     new b9607f0  fix merge

The 105 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.