Some of your properties in your example do not need the prefix 'dataSource' if you are using a driver-class.
${database.driver}
${database.database.jdbc.url}
${database.user}
${database.password}
And port
and databaseName
can be included in the jdbcUrl
.