-
Notifications
You must be signed in to change notification settings - Fork 52
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[WIP] CXF upgrade #547
[WIP] CXF upgrade #547
Conversation
Need to keep felix in sync with Karaf's version - missed that in my PR. |
I just tested this with cxf 3.1.10 (released today - thanks for pointing me at that @neykov). It seems to work well:
I'll update the PRs tomorrow. @googlielmo I suggest that @neykov's PRs are merged first (including the updated felix version number at https://github.com/apache/brooklyn-server/blob/master/pom.xml#L134), then I'll rebase these. |
c81edb4
to
ef12428
Compare
I've changed this to upgrade to cxf 3.1.10 (released yesterday!), and to point at winrm4j 0.5.0 which should be released soon, I hope! |
<cxf.version>3.1.10</cxf.version> | ||
<httpcomponents.httpclient.version>4.5.2</httpcomponents.httpclient.version> | ||
<httpcomponents.httpcore.version>4.4.4</httpcomponents.httpcore.version> | ||
<httpclient.version>4.4.1</httpclient.version> <!-- kept for compatibility in 0.11.0-SNAPSHOT, remove after --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this be 4.5.2
for good measure? (we don't have any way to mark it is deprecated do we?)
(that would mean that apache/brooklyn-library#73 doesn't have to be merged for this to work, it's just a tidy-up following this.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bumped to 4.5.2
in #570. It could break some projects due to the version mismatch between core and client, but that's better than having a different version from Brooklyn's.
This reverts commit 1108d8f. Does not belong in this PR. Included in apache#547 .
Winrm4j 5.0 released. Will merge this shortly. @aledsage could you remove the WIP tag. |
👍 LGTM; see comments on #570 |
Tested successfully (together with #570) by deploying a blueprint and running the following tests:
|
[WIP] CXF upgrade This upgrade CXF to 3.1.9. It also bumps httpcomponents to 4.4.4 (thus replacing #362) ~~It cherry-picks @neykov's #334 (for karaf 4.0.8 upgrade).~~ It requires a new release of winrm4j (which must include cloudsoft/winrm4j#48). This PR will fail to build until that dependency is available. For now, it says ~~0.5.0-ea1~~ 0.5.0 which I built for myself locally. For this to work fully, it also requires apache/brooklyn-library#73 to be merged. ~~It will require a change in brooklyn-dist as well (Svet's apache/brooklyn-dist#48). I've been testing with apache/brooklyn-dist#82, which builds on that.~~
This upgrade CXF to 3.1.9.
It also bumps httpcomponents to 4.4.4 (thus replacing #362)
It cherry-picks @neykov's #334 (for karaf 4.0.8 upgrade).It requires a new release of winrm4j (which must include cloudsoft/winrm4j#48). This PR will fail to build until that dependency is available. For now, it says
0.5.0-ea10.5.0 which I built for myself locally.For this to work fully, it also requires apache/brooklyn-library#73 to be merged.
It will require a change in brooklyn-dist as well (Svet's apache/brooklyn-dist#48). I've been testing with apache/brooklyn-dist#82, which builds on that.