Thanks for the response @Marco Belladelli .

I removed the mappedBy and added @JoinColumn on parent as you suggested. I reran the 3 tests (starts with hhh16111 in pull request). The version was updated when adding a child entity. However, the test hhh16111_updateQuestionText_noconcurrent_update in pull request fails. (I didn’t submit a new pull request since the change is a trivial mapping change, when running with update it was working in version 5)

In this scenario, we update the child entity and save it through the parent. The version does not get updated.