search

sous-chefs / maven

Development repository for the maven cookbook
https://supermarket.chef.io/cookbooks/maven
Apache License 2.0
36 stars 153 forks source link

[COOK-3470] Improvements in /etc/mavenrc template #24

Closed gildegoma closed 11 years ago

gildegoma commented 11 years ago

Related to http://tickets.opscode.com/browse/COOK-3470

Notes about noisy git commit history

I initially started in mind to extend work from @jlandahl (see PR #21 / COOK-3352) and that's why this feature branch currently started from commit 97afb5b (from #21). I also wanted to address similar issues as @jblatt-verticloud did in PR #9. Thank you everyone for your pushed stuff, I hope you'll like my solution... After giving some whirl to the code, it resulted with something quite more simpler (in my opinion), but that should meet most use cases. What do you think?

If this patch is accepted, let me know if you prefer I drop no more relevant commits and rebase into a single commit.

dbachelder commented 11 years ago

+1

sethvargo commented 11 years ago

@gildegoma this cannot be merged cleanly. Could you please rebase?

svanharmelen commented 11 years ago

My PR #26 was not merged as in my case a wrapper cookbook was probably a better solution. But the solution provided here should also be flexible enough for me.

So +1 for this PR!

gildegoma commented 11 years ago

@sethvargo rebased into single commit 83d1cec.

BTW, I added e40f1d2 as an attempt to fix [COOK-3529]/#26. Beside template overriding, I would argue that such way is still easy to maintain and quite friendly for cookbook integration. Just let me know if you prefer that I remove this second commit...

sethvargo commented 11 years ago

@gildegoma please remove that commit. We decided that this pattern was not the best way to proceed.

gildegoma commented 11 years ago

@sethvargo feature branch rebased again, this time without the extra commit.