Merge in keystore_password in target server.env if present

[scottkurz]

Signed-off-by: Scott Kurz [email protected]

Fixes #1096

Note the change is a no-op if you have either a server.env in configDir or a serverEnvFile parm configured.

Manual test checklist

• env mvn prop - basic (generated keystore_password gets merged)
• env mvn prop including keystore_password (takes precedence over one generated on server create)
• env mvn prop + server.env in configDir (generated keystore_password lost, env from mvn props)
• env mvn prop + -DserverEnvFile (generated keystore_password lost, env from mvn props)
• env mvn prop - basic with target/liberty/wlp/usr/servers/defaultServer/server.env already in place from previous execution WITHOUT keystore_password (just the env props are written to server.env..no error)

[cherylking]

Overall it looks good. I just wonder if we need some consensus that this change is appropriate (YK, Eric, etc.). Also, if we make this change here, then we need to update Gradle the same way.

[scottkurz]

Thx for the review @cherylking .. will wait to get more opinions: @yeekangc @ericglau if this change seems OK.

[ericglau]

Just one minor comment. Overall it looks fine to me.

[scottkurz]

Also, if we make this change here, then we need to update Gradle the same way.

@cherylking I think it'd be OK to fix this in Maven, merge, open a ci.gradle issue but fix later. I don't think anyone would soon complain about this as an inconsistency across Maven vs. Gradle. I know .. there's always the risk that it just sits there and doesn't get done. But what do you think?

[cherylking]

The changes look good. Please open a ci.gradle issue to implement this same functionality. Also, can you open a ci.maven issue to add tests for this? I see you did manual tests, but we should have a couple integration tests for this.

[scottkurz]

Gradle issue: OpenLiberty/ci.gradle#587
ITs: #1098