Ok ... a short look at SourceTree showed me that you already merged everything. I checked out develop and could build without problems. So I guess I have to re-apply the changes to one of the externs you posted yesterday.
What would be good, was if some of you could compare the stuff that's generated by Ant and Maven if they are equal. Chris ________________________________________ Von: Christofer Dutz <[email protected]> Gesendet: Dienstag, 26. April 2016 09:17 An: [email protected] Betreff: AW: AW: AW: [FALCONJX] Merging Maven refactor in to develop branch Hi Alex, sure ... push and give me a short notice, that you did and I'll take over from there. Well I am a little worried, that they won't adjust the Maven build and continue working with Ant. Sounds like patch files would also be an option. I would have to implement a mojo (goal of a maven-plugin) for that, but that shouldn't be a big problem. It should be a lot easier to maintain, cause the replacements of the Ant sometimes were operating on things changed a few steps earlier, that's why I re-created new ones that should do the same, but a lot simpler. Also I'll think of a way to deal with multiple downloads, but I guess just two executions of the download goal should be enough. But I'll look into that as soon as you have pushed the stuff. But I definitely +1 for a diff/patch approach. Chris ________________________________________ Von: Alex Harui <[email protected]> Gesendet: Dienstag, 26. April 2016 00:40 An: [email protected] Betreff: Re: AW: AW: [FALCONJX] Merging Maven refactor in to develop branch On 4/25/16, 2:49 PM, "Christofer Dutz" <[email protected]> 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, folks needing to change the externs will modify the right files and the build will continue working. My only concern was about how the replace task now has a Maven version and an Ant version. I want to synch them up in a way that is easier for others to produce. I posted earlier about just going to patch files instead of regex. Or maybe we should make forks of these external code bases and apply the changes we want. Thoughts? -Alex
