-
Notifications
You must be signed in to change notification settings - Fork 93
Issue #91 : Apply properties from active profiles #141
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
Projet properties should be a merge of all active profiles : activated explicitly with -P, with property activation or by default
…us#151) Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.1 to 2.9.10.4. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
… maven version (mojohaus#154) * fix mojohaus#140 by separating no-overwritten test into two basing on maven version * parse maven version by ./mvnw -v * remove redundent code Co-authored-by: yangnuoyu <yangnuoyu@penguin>
… the dependency in profile which is managed by <dependencyManagement> (mojohaus#155) * Fixes mojohaus#145, mojohaus#148 add codes to parse the <version> for the dependency in profile which is managed by <dependencyManagement> * remove redundant code * add empty line at the end of files * remove profile-with-deps-inherit-parent-depMgmt-ci test * consolidate two blocks of code change into createCleanPom method * restore import change * restore import change * add test profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-oss * change test profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-oss to profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-oss-bom * code style fix * fix indents and licenses declaration in verify.groovy * set scope as compile and optional as false if not specified * fix scope and optional - code style Co-authored-by: yangnuoyu <yangnuoyu@penguin>
Signed-off-by: olivier lamy <[email protected]>
Signed-off-by: olivier lamy <[email protected]>
* fix paring version problem in no-overwrite tests * fix no-overwriten tests when running in windows * fix bug resulting from line seperator difference in Windows * remove redundant code * fix the version position problem Co-authored-by: yangnuoyu <yangnuoyu@penguin>
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.4 to 2.9.10.5. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] <[email protected]>
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.1 to 2.9.10.5. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] <[email protected]>
enable Dependabot v2
Bumps [actions/cache](https://github.com/actions/cache) from v1 to v2. - [Release notes](https://github.com/actions/cache/releases) - [Commits](actions/cache@v1...b820478) Signed-off-by: dependabot[bot] <[email protected]>
Bumps [assertj-core](https://github.com/joel-costigliola/assertj-core) from 2.0.0 to 3.16.1. - [Release notes](https://github.com/joel-costigliola/assertj-core/releases) - [Commits](assertj/assertj@assertj-core-2.0.0...assertj-core-3.16.1) Signed-off-by: dependabot[bot] <[email protected]>
Bumps [mrm-maven-plugin](https://github.com/mojohaus/mrm) from 1.0.0 to 1.2.0. - [Release notes](https://github.com/mojohaus/mrm/releases) - [Commits](mojohaus/mrm@mrm-1.0.0...mrm-1.2.0) Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: olivier lamy <[email protected]>
…dehaus.mojo-mrm-maven-plugin-1.2.0
…ns/actions/cache-v2
…sertj-assertj-core-3.16.1
…/projects/bom-pomElements/bom/com.fasterxml.jackson.core-jackson-databind-2.9.10.5
…/projects/bom-flattenMode/bom/com.fasterxml.jackson.core-jackson-databind-2.9.10.5
… its transitive dependencies and set them as optional (mojohaus#164) * fixes mojohaus#160: when the direct dependency is optional, flattened its transitive dependencies and set them as optional * remove optional dependency subtree * return false in visitor when node is not included
Bumps [plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.2.1 to 3.3.0. - [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases) - [Commits](codehaus-plexus/plexus-utils@plexus-utils-3.2.1...plexus-utils-3.3.0) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ubtrees (mojohaus#172) * Remove first level transitive, provided scope dependencies and their subtrees * Removed accidentally included 'optional' test. * Fixed weird spacing modifications from before * Fixed weird spacing issues with PR * Fixing spacing issue Co-authored-by: Saleh Mostafa <[email protected]>
|
Is this issue going to be merged soon? |
It has conflicts so cannot be merged before those are resolved. |
Projet properties should be a merge of all active profiles : activated explicitly with -P, with property activation or by default
https://github.com/lafoletc/flatten-maven-plugin into active-profiles-properties # Conflicts: # src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java
|
conficts resolved |
|
Maybe conflicts were resolve with merge, not rebase. I'll try to rebase this if fork allows it at some point. |
|
issue was fixed by so we retest it again |
|
This pull request is stale because it has been waiting for feedback for 60 days. Remove the stale label or comment on this PR, or it will be automatically closed in 30 days. |
Projet properties should be a merge of all active profiles : activated
explicitly with -P, with property activation or by default