This will be a big merge. This issue provides a place to track plans and idea for the merge as well as track issues that we need to be careful/aware of during the merge.
[ ] Reorganize examples and edit the OrcSites/OrcScala build.xml files to prevent OrcSites dependent examples from appearing in the zip for OrcScala. This will effect all GUI OrcO applications.
[ ] Check for OrcO references and update them to say Orc.
[x] Clean up or remove combined package generation to not mark it as a preview.
[x] Update version information (to 3.0.0 or similar) since that's what we will be working towards at that point. ODO is currently marked as 2.9.0-M1 so that it is less than 3.0.0 by any metric and clearly not a final release.
This will be a big merge. This issue provides a place to track plans and idea for the merge as well as track issues that we need to be careful/aware of during the merge.