added code for association for oracle no sql
modified POM
Merge remote-tracking branch 'upstream/trunk' into trunk