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.

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

Fix clean ant script #19

Merged
merged 1 commit into from
Aug 16, 2012
Merged

Fix clean ant script #19

merged 1 commit into from
Aug 16, 2012

Conversation

hazendaz
Copy link
Member

Fixed clean ant script
Fixed 3 bugs that showed up from most resent build. Not sure what
happened.

Daniel,
I guess you got rid of 1.5-ivy version...anyway fixed the ant piece for clean build. The taskdef for emma just needed to be wrapped. I couldn't run this for a few reasons. Three files had issues. Two of them appeared to not have the original changes and another had some issue with a merge. Not sure if that was cause I did something exactly when you were or what occurred. Maybe it occurred when getting rid of 1.5-ivy branch? Anyway, 4 files here. If you need me to rebase against 1.5 and try again I can do so. I also couldn't run the git commands in the ant script so I was unable to run a full build. However, that is probably mute since this fix corrects deleting everything without error.

I do have additional things after this all gets sync'd. I ran both findbugs / pmd against the project. This pointed out a number of items such as boolean getters needed to be is* instead. Would that be a breaking change to fix those? Majority of other issues were all in unit tests. PMD made lots of suggestions to change test cases and led me to figure out all test cases are really version 3 junit so in the next set, I have them all converted fully to junit 4. Everything is working there but I'm sure it will take me a bit to rebase and get everything in working order.

Thanks,

Jeremy

Fixed clean ant script
Fixed 3 bugs that showed up from most resent build.  Not sure what
happened.
@dblock
Copy link
Collaborator

dblock commented Aug 16, 2012

The 1.5-ivy branch was deleted after I merged it to 1.5. So if you did a git pull upstream 1.5 you would get all the changes, including half of these fixes that I made on 1.5 already. You can destroy your 1.5-ivy branch as well and make sure to merge 1.5 from upstream for further development.

@dblock
Copy link
Collaborator

dblock commented Aug 16, 2012

Thanks for the emma clean fix, works, merging.

@dblock dblock merged commit 9824233 into Waffle:1.5 Aug 16, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants