Move Java source code version to property file
Merge branch 'multi-project'

Conflicts:
	gradle/convention.gradle