Re: AW: AW: AW: [FALCONJX] Merging Maven refactor in to develop branch

2016-04-26 Thread Alex Harui
On 4/26/16, 12:49 AM, "Christofer Dutz" wrote: >Ok ... a short look at SourceTree showed me that you already merged >everything. Do you have commits@ filtered to a folder or something? I just assumed everyone would see the merge because they'd get 63 emails in their inbox. I guess I will have

AW: AW: AW: [FALCONJX] Merging Maven refactor in to develop branch

2016-04-26 Thread Christofer Dutz
: Re: AW: AW: [FALCONJX] Merging Maven refactor in to develop branch This was my doing - I'll look at your suggestions today. ‹peter On 4/26/16, 11:02 AM, "Christofer Dutz" wrote: >You did make things a little over-complicated with your regexps :-) > >1. Replace "@

Re: AW: AW: [FALCONJX] Merging Maven refactor in to develop branch

2016-04-26 Thread Peter Ent
the target directory, as the plugin takes them and >injects the external lib paths and lib paths with the ones provided by >maven. I changed them back to the maven paths, so don't be confused, just >copy them to target and run them from there. > >Chris > >___

AW: AW: [FALCONJX] Merging Maven refactor in to develop branch

2016-04-26 Thread Christofer Dutz
to target and run them from there. Chris ____ Von: Alex Harui Gesendet: Montag, 25. April 2016 23:05 An: dev@flex.apache.org Betreff: Re: AW: [FALCONJX] Merging Maven refactor in to develop branch On 4/25/16, 10:38 AM, "Christofer Dutz" wrote:

AW: AW: AW: [FALCONJX] Merging Maven refactor in to develop branch

2016-04-26 Thread Christofer Dutz
x27;s generated by Ant and Maven if they are equal. Chris Von: Christofer Dutz Gesendet: Dienstag, 26. April 2016 09:17 An: dev@flex.apache.org Betreff: AW: AW: AW: [FALCONJX] Merging Maven refactor in to develop branch Hi Alex, sure ... push and give me a

AW: AW: AW: [FALCONJX] Merging Maven refactor in to develop branch

2016-04-26 Thread Christofer Dutz
Von: Alex Harui Gesendet: Dienstag, 26. April 2016 00:40 An: dev@flex.apache.org Betreff: Re: AW: AW: [FALCONJX] Merging Maven refactor in to develop branch On 4/25/16, 2:49 PM, "Christofer Dutz" wrote: >Hi Alex, > >I'll have a look at this tomorrow. Are you ok if I push the

Re: AW: AW: [FALCONJX] Merging Maven refactor in to develop branch

2016-04-25 Thread Alex Harui
On 4/25/16, 2:49 PM, "Christofer Dutz" wrote: >Hi Alex, > >I'll have a look at this tomorrow. Are you ok if I push the merge and potentially break the Maven build? > >But I really hope that we can keep things stable for at least a few days >from now on. I think once the merge is pushed, fol

AW: AW: [FALCONJX] Merging Maven refactor in to develop branch

2016-04-25 Thread Christofer Dutz
rging Maven refactor in to develop branch On 4/25/16, 10:38 AM, "Christofer Dutz" wrote: >No problem at all ... for me it will make things a lot easier as I no >longer have to merge things manually ... looking forward to this :-) I was going to push the merge, but I think the

Re: AW: [FALCONJX] Merging Maven refactor in to develop branch

2016-04-25 Thread Alex Harui
On 4/25/16, 10:38 AM, "Christofer Dutz" wrote: >No problem at all ... for me it will make things a lot easier as I no >longer have to merge things manually ... looking forward to this :-) I was going to push the merge, but I think the Maven build will need fixing, and I'm not sure what is the be

AW: [FALCONJX] Merging Maven refactor in to develop branch

2016-04-25 Thread Christofer Dutz
Maven refactor in to develop branch OK, I think it is time to merge the Maven branch in to develop. This will be a bit disruptive as lots of files changed folders. Also I haven't fixed up the Eclipse projects. I think I will fix up the Eclipse projects after the merge. I will start the mer

[FALCONJX] Merging Maven refactor in to develop branch

2016-04-25 Thread Alex Harui
OK, I think it is time to merge the Maven branch in to develop. This will be a bit disruptive as lots of files changed folders. Also I haven't fixed up the Eclipse projects. I think I will fix up the Eclipse projects after the merge. I will start the merge in a couple of hours, so this is your