[OPENJDK-3666] merge jboss.container.java.s2i.{core,bash} modules #607
Conversation
be1017e to
d5a13f0
Compare
|
the two test failures are fixed in #609 |
Signed-off-by: Jonathan Dowland <[email protected]>
s2i-core-hooks only defined one function, s2i_core_env_init_hook This was only called by s2i_core_env_init in s2i-core (it overrides an empty definition of the same function name in s2i-core) Fold the content of the function into s2i_core_env_init and remove the s2i-core-hooks file Remove includes of it from s2i/assemble and run (which didn't call the function anyway) Signed-off-by: Jonathan Dowland <[email protected]>
The function maven_s2i_deploy_artifacts checked for the existence of maven_s2i_deploy_artifacts_override, and if it exists, calls it and returns. The implementation of maven_s2i_deploy_artifacts_override simply deleted itself and called maven_s2i_deploy_artifacts again. Signed-off-by: Jonathan Dowland <[email protected]>
1f8d86c to
6c644a1
Compare
|
@jfdenise can I request you TAL this and assess it from the perspective of impact on wildfly? TIA! |
|
|
||
| # include dependencies | ||
| source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh" | ||
| source "${JBOSS_CONTAINER_S2I_CORE_MODULE}/s2i-core" |
There was a problem hiding this comment.
There is an implicit dependency on the jboss.container.java.s2i module.
We can't depend on jboss.container.java.s2i module that implements the s2i logic, WildFly has its own different s2i logic.
We need the core to be clean from java.s2i specifics.
|
Hi @jfdenise , thank you for taking the time to look at this.
If my understanding is correct I should not merge them. I would like to perhaps move/rename them to make it clearer that one is generic and one is java (us) specific. |
|
@jmtd , I fully agree with your proposal to rename to make it clearer. Thank-you! |
https://issues.redhat.com/browse/OPENJDK-3666