[WIP] Openshift connector rebased #89
Conversation
sunix
commented
Jun 2, 2017
•
sunix
commented
- This was first a rebased of Start using own stacks #54 with
- structure fix after @davidfestal work
- fix stacks.json not included in assembly package
- Fix to make rh-che work with the latest upstream che openshift-connector rebased
Adds a stacks component to rh-che that overrides the upstream stacks.
Signed-off-by: Sun Seng David Tan <sutan@redhat.com>
…ll the needed dependencies Signed-off-by: Sun Seng David Tan <sutan@redhat.com>
…ream Signed-off-by: Sun Seng David Tan <sutan@redhat.com>
…stream Signed-off-by: Sun Seng David Tan <sutan@redhat.com>
Signed-off-by: Sun Seng David Tan <sutan@redhat.com>
Signed-off-by: Sun Seng David Tan <sutan@redhat.com>
…this to be merged) Signed-off-by: Sun Seng David Tan <sutan@redhat.com>
|
@sunix If I get it right this PR should not be merged now. We should probably wait for |
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-war-plugin</artifactId> |
There was a problem hiding this comment.
Did you test this with the Keycloak support enabled ?
According to the fact that:
- you removed the war plugin configuration (with war overlays),
- but the
pomstill inherits from themaven-war-pluginconfiguration defined in the parent, - and you removed the
copy-web-resourcesexecution of themaven-resources-plugin,
I wonder how the src/main/webapp/WEB-INF/keycloak.json file will be added to the generated war.
There was a problem hiding this comment.
About the war overlays, as far as I know, when you add another war as a the dependency of a war project, it will use that one to perform the overlay. So adding overlay configuration is not needed.
There was a problem hiding this comment.
about the copy-web-resources execution, I reincluded that. Thanks for reporting that.
There was a problem hiding this comment.
What about the question about Keycloak ? The inherited war configuration changes the warSourceDirectory to ${project.build.directory}/patched/src/main/webapp.
That's why the copy-web-resources execution of the maven-resources-plugin plugin was useful, for example to include WEB-INF/classes/codenvy/rh-che-machine-configuration.properties or WEB-INF/keycloak.json. As far as I can see in the build result they are not in the generated war.
There was a problem hiding this comment.
about the copy-web-resources execution, I reincluded that. Thanks for reporting that.
OK ! Sorry ! I didn't see your last message before answering :-)
| * Contributors: | ||
| * Codenvy, S.A. - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.che.wsagent.server; |
There was a problem hiding this comment.
There was a problem hiding this comment.
As there is no change at the moment, we don't add it. If we need in the future something like this, let's add it at this time.
And replacing the class is not a good way to do anyway.
At the moment this is adding one more class to maintain for nothing.
There was a problem hiding this comment.
And replacing the class is not a good way to do anyway.
At the moment this is adding one more class to maintain for nothing.
if you say so, and if @gorkem agrees, fine by me.
Signed-off-by: Sun Seng David Tan <sutan@redhat.com>
| @@ -172,6 +190,18 @@ | |||
| </execution> | |||
| </executions> | |||
| </plugin> | |||
| <plugin> | |||
There was a problem hiding this comment.
Why do you fully skip the dependency analysis ? We have a build options to skip it fully from the command line.
And else there is a more fine-grained way to skip some dependency that might be a problem (for false-positive cases for example).
See here for the way to remove dependency errors individually:
rh-che/builds/fabric8-che/assembly/pom.xml
Line 190 in 07556f7
There was a problem hiding this comment.
To me dependency analysis is not something we need in assembly projects, and it doesn't work well with overlay. It is useful in classic jar projects.
…m dashboard files Signed-off-by: Sun Seng David Tan <sutan@redhat.com>
…m upstream Signed-off-by: Sun Seng David Tan <sutan@redhat.com>
…aiting this to be merged) Signed-off-by: Sun Seng David Tan <sutan@redhat.com>
Signed-off-by: David Festal <dfestal@redhat.com>
|
replaced by #117 |
