dehasi opened a new pull request #347:
URL: https://github.com/apache/maven/pull/347


   FileProfileActivator changes FileProfileActivator.exists 
   which lets flattened resolveCiFriendliesOnly depending 
   fail activating profile.
   
   #### Problem
   The root of the problem that 
[FileProfileActivator](https://github.com/apache/maven/blob/master/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java#L154)
   interpolates path value and `rawModel` is updated 
[here](https://github.com/apache/maven/blob/master/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java#L310)
   and becomes not raw anymore.
   
   It affects i.e. 
[flatten-maven-plugin](https://github.com/mojohaus/flatten-maven-plugin/pull/152)
   
   #### Solution
   `FileProfileActivator` has to have an absolute path to check
   if a file exists but shouldn't update `Profile`.
   
   On the other side 
[DefaultModelBuilder](https://github.com/apache/maven/blob/master/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java#L314)
   needs to have interpolated profiles to build an effective model. 
   To interpolate profiles, `DefaultModelBuilder` also needs absolute paths.
   
   The interpolation logic is needed in two places.
   That's why I extracted the common logic to 
`ProfileActivationFilePathInterpolator`.
   
   I use it in both places. In `FileProfileActivator` I only check if the file 
exists.
   In `DefaultModelBuilder` I interpolate profiles.
   
   I added `DefaultModelBuilderFactoryTest#test_pom_changes()`
   to check that `getRawModel()` is still raw and `getEffectiveModel()` is 
interpolated.
   
   Also, I added `FileProfileActivatorTest` to show that the activator doesn't 
update profiles anymore.
   
   #### Discussion
   Please, let me know if I can do something else to make this PR accepted.
   
   
   Following this checklist to help us incorporate your 
   contribution quickly and easily:
   
    - [x] Make sure there is a [JIRA 
issue](https://issues.apache.org/jira/browse/MNG) filed 
          for the change (usually before you start working on it).  Trivial 
changes like typos do not 
          require a JIRA issue.  Your pull request should address just this 
issue, without 
          pulling in other changes.
    - [x] Each commit in the pull request should have a meaningful subject line 
and body.
    - [x] Format the pull request title like `[MNG-XXX] - Fixes bug in 
ApproximateQuantiles`,
          where you replace `MNG-XXX` with the appropriate JIRA issue. Best 
practice
          is to use the JIRA issue title in the pull request title and in the 
first line of the 
          commit message.
    - [x] Write a pull request description that is detailed enough to 
understand what the pull request does, how, and why.
    - [x] Run `mvn clean verify` to make sure basic checks pass. A more 
thorough check will 
          be performed on your pull request automatically.
    - [ ] You have run the [Core IT][core-its] successfully.
   
   If your pull request is about ~20 lines of code you don't need to sign an
   [Individual Contributor License 
Agreement](https://www.apache.org/licenses/icla.pdf) if you are unsure
   please ask on the developers list.
   
   To make clear that you license your contribution under 
   the [Apache License Version 2.0, January 
2004](http://www.apache.org/licenses/LICENSE-2.0)
   you have to acknowledge this by using the following check-box.
   
    - [x] I hereby declare this contribution to be licenced under the [Apache 
License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
   
    - [ ] In any other case, please file an [Apache Individual Contributor 
License Agreement](https://www.apache.org/licenses/icla.pdf).
   
   [core-its]: https://maven.apache.org/core-its/core-it-suite/
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


Reply via email to