Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat(SHRINKWRAP-524): Upgrade to Maven 3.6.3 #140

Merged
merged 5 commits into from Dec 18, 2019
Merged

feat(SHRINKWRAP-524): Upgrade to Maven 3.6.3 #140

merged 5 commits into from Dec 18, 2019

Conversation

famod
Copy link
Contributor

@famod famod commented Dec 16, 2019

Based on #137 by @apupier + yet another upgrade from 3.6.1 to latest 3.6.3.

Please note that this is also based on #139 to strive for green builds! I will gladly rebase this on master, once #139 is merged.

@famod famod mentioned this pull request Dec 16, 2019
Closed
apupier and others added 5 commits December 18, 2019 10:21
@apupier @famod
feat(SHRINKWRAP-524) - Support Maven 3.6
94b6038 
- update version from 3.5.2 to 3.6.1
- change org.eclipse.aether.internal.impl.DefaultDependencyCollector to
org.eclipse.aether.internal.impl.collect.DefaultDependencyCollector
- add com.google.guava:guava as dependencies as it is no more provided
by Maven. Using latest version requires to update also Predicate usage.

Signed-off-by: Aurélien Pupier <apupier@redhat.com>
@apupier @famod
feat(SHRINKWRAP-524) - remove Google Guava usage
e2629bc 
which was used a single time and adding 2.6Mb

Signed-off-by: Aurélien Pupier <apupier@redhat.com>
@apupier @famod
feat(SHRINKWRAP-524) Specify Maven 3.6.1 in Maven wrapper properties
a5da27f 
Signed-off-by: Aurélien Pupier <apupier@redhat.com>
@apupier @famod
SHRINKWRAP-524 - update maven version in bom dependency
e44be13 
Signed-off-by: Aurélien Pupier <apupier@redhat.com>
@famod
chore(SHRINKRES-524): upgrade to Maven 3.6.3
bcb9776
@famod
Copy link
Contributor Author

famod commented Dec 18, 2019

Rebased on master which now already contains #139.

@bartoszmajsak bartoszmajsak merged commit 89d0b02 into shrinkwrap:master Dec 18, 2019
@bartoszmajsak
Copy link
Contributor

Thanks!

@bartoszmajsak
Copy link
Contributor

@famod no need to rebase, you can simply just update the branch from here next time. Thanks for your contribution.

@famod famod deleted the SHRINKWRAP-524-Maven3.6.3 branch December 18, 2019 10:14
@famod
Copy link
Contributor Author

famod commented Dec 18, 2019

@bartoszmajsak

no need to rebase, you can simply just update the branch from here next time.

Sorry if I'm being stupid, but what do you mean with "update the branch from here"?
Is there a GitHub feature for that?

The thing is: I don't like to "pollute" my PRs with merge commits (which then might end up in master). That's why I like to rebase instead.

@bartoszmajsak
Copy link
Contributor

bartoszmajsak commented Dec 18, 2019 •
edited

@famod there' should be a button saying "update branch" -
image

It would be weird to not have it available for the author of the PR, but maybe that is the case.

As for merge commits - that doesn't really matter if you ask me, as at the end PR is squashed and lands as one commit in master :) But I totally applaud your desire to have a clean history. Not sure if that's still the case, but I recall rebase/force push was messing up the existing PR review if comments were done on the wiped commits.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bartoszmajsak bartoszmajsak bartoszmajsak approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@famod @bartoszmajsak @apupier