Fixes #145, #148 add codes to parse the <version> for the dependency in profile which is managed by <dependencyManagement> #155

yangnuoyu · 2020-05-27T01:55:41Z

Fixes #145, #148 @stephaniewang526 @saturnism @elharo

… the dependency in profile which is managed by <dependencyManagement>

src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java

stephaniewang526 · 2020-06-01T18:51:42Z

Could you add a test case that maps to our Java client library scenario?

Here's an example: https://github.com/googleapis/java-pubsub/blob/master/google-cloud-pubsub/pom.xml#L174 (ignore the added version in profile)

Configuration needs to be at minimum
<flattendependencymode>all<flattendependencymode> and <flattenmode>oss</flattenmode> (complete config)
Dependency version managed through BOM in the parent pom

src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-inactive/pom.xml

src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-oss/bom/pom.xml

…oss to profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-oss-bom

stephaniewang526 · 2020-06-03T15:24:23Z

LGTM

stephaniewang526 · 2020-06-03T15:24:33Z

@saturnism @olamy PTAL

src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java

saturnism · 2020-06-03T17:56:27Z

+1 to moving the logic away from effective pom. but it still misses the question of what if the dep management section is kept.

olamy · 2020-06-04T02:12:34Z

src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java

+                            strippedDependencies.add( flattenedDep );
+                        }
+                    }
+                    if (!strippedDependencies.isEmpty() || !isEmpty(profile.getRepositories())) {


src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java

olamy

except some nit picking changes look good even including good it test

elharo

I'm a little uncertain about what code styles and license rules apply here. @stephaniewang526 do you know?

src/it/projects/profile-with-deps-import/pom.xml

src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-active/parent/pom.xml

src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-active/pom.xml

...it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-inactive/parent/pom.xml

src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-oss-bom/verify.groovy

src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java

olamy · 2020-06-05T22:56:31Z

@elharo historically the maven codestyle is used. But it's more relax here as well so the build do not fail for that.

yangnuoyu added 4 commits May 26, 2020 18:16

Fixes mojohaus#145, mojohaus#148 add codes to parse the <version> for…

2e91c5e

… the dependency in profile which is managed by <dependencyManagement>

remove redundant code

0895964

add empty line at the end of files

5143739

remove profile-with-deps-inherit-parent-depMgmt-ci test

c9dc7d6

yangnuoyu marked this pull request as ready for review May 27, 2020 21:33

saturnism reviewed May 29, 2020

View reviewed changes

src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java Outdated Show resolved Hide resolved

saturnism reviewed May 29, 2020

View reviewed changes

src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java Outdated Show resolved Hide resolved

saturnism reviewed May 29, 2020

View reviewed changes

src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java Outdated Show resolved Hide resolved

yangnuoyu added 3 commits June 1, 2020 09:50

consolidate two blocks of code change into createCleanPom method

49131d6

restore import change

70596e0

restore import change

87e4191

stephaniewang526 reviewed Jun 1, 2020

View reviewed changes

src/it/projects/profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-inactive/pom.xml Outdated Show resolved Hide resolved

add test profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-oss

ce6cfa2

stephaniewang526 suggested changes Jun 1, 2020

View reviewed changes

change test profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-…

c2d71fe

…oss to profile-with-deps-inherit-parent-depMgmt-flatten-dep-all-oss-bom

saturnism reviewed Jun 3, 2020

View reviewed changes

src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java Outdated Show resolved Hide resolved

olamy reviewed Jun 4, 2020

View reviewed changes

src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java Outdated Show resolved Hide resolved

olamy requested changes Jun 4, 2020

View reviewed changes

code style fix

a130ecd

elharo reviewed Jun 4, 2020

View reviewed changes

stephaniewang526 reviewed Jun 4, 2020

View reviewed changes

src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java Show resolved Hide resolved

yangnuoyu added 3 commits June 4, 2020 10:55

fix indents and licenses declaration in verify.groovy

e350e34

set scope as compile and optional as false if not specified

4f348db

fix scope and optional - code style

1d6abd8

yangnuoyu requested a review from olamy June 5, 2020 06:14

olamy merged commit b99ef48 into mojohaus:master Jun 5, 2020

stephaniewang526 mentioned this pull request Jun 11, 2020

fix: include an explicit version for javax-annotations-api googleapis/java-spanner#261

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #145, #148 add codes to parse the <version> for the dependency in profile which is managed by <dependencyManagement> #155

Fixes #145, #148 add codes to parse the <version> for the dependency in profile which is managed by <dependencyManagement> #155

yangnuoyu commented May 27, 2020 •

edited

Loading

stephaniewang526 commented Jun 1, 2020 •

edited

Loading

stephaniewang526 commented Jun 3, 2020

stephaniewang526 commented Jun 3, 2020

saturnism commented Jun 3, 2020

olamy Jun 4, 2020

yangnuoyu Jun 4, 2020

olamy left a comment

elharo left a comment

olamy commented Jun 5, 2020

Fixes #145, #148 add codes to parse the <version> for the dependency in profile which is managed by <dependencyManagement> #155

Fixes #145, #148 add codes to parse the <version> for the dependency in profile which is managed by <dependencyManagement> #155

Conversation

yangnuoyu commented May 27, 2020 • edited Loading

stephaniewang526 commented Jun 1, 2020 • edited Loading

stephaniewang526 commented Jun 3, 2020

stephaniewang526 commented Jun 3, 2020

saturnism commented Jun 3, 2020

olamy Jun 4, 2020

Choose a reason for hiding this comment

yangnuoyu Jun 4, 2020

Choose a reason for hiding this comment

olamy left a comment

Choose a reason for hiding this comment

elharo left a comment

Choose a reason for hiding this comment

olamy commented Jun 5, 2020

yangnuoyu commented May 27, 2020 •

edited

Loading

stephaniewang526 commented Jun 1, 2020 •

edited

Loading