...
The remaining lines are the files that need to be merged. It may look like a lot, but even within the impl and webapp projects, we've only customized a small portion of the files, so many of these lines will require no action. If you wanted, you could also do a listing of all of the files in the coeus-impl-custom and coeus-webapp-custom projects and do some text processing to generate a list of the files that appear in both places, but I typically just reference the git diff as I walk through the custom projects, ignoring any lines for files that don't exist.
...
- The git diff listing will indicate whether each file has been added, modified, deleted, or renamed. Most changes are straightforward modifications, but pay attention to any additions, removals, or renames – these may indicate that Kuali has refactored some code, which could impact our custom code even if the specific files we changed haven't been touched.
- The master pom.xml file under kc-custom is different from the others, in that it largely is a copy of the base pom.xml (located at kc/pom.xml). However, we make some changes to the project name and update a few references to use our custom projects rather than the base ones. All of the other dependencies and such will need to be updated, however, so the best way to update this file is the following:
- Use a diff tool to compare the "old base" pom.xml with the "old custom" pom.xml. This should highlight the handful of customizations we've made.
- Copy the "new base" pom.xml into the "new" kc-custom project, then manually update the file to include the Tufts changes.
- Data dictionary files
- edu.tufts custom classes