Skip to content

Upgrade cxf and httpcomponents#48

Merged
neykov merged 5 commits intomasterfrom
upgrade-cxf-aled
Mar 6, 2017
Merged

Upgrade cxf and httpcomponents#48
neykov merged 5 commits intomasterfrom
upgrade-cxf-aled

Conversation

@aledsage
Copy link
Copy Markdown
Member

This builds on, and thus replaces #44

@neykov neykov force-pushed the upgrade-cxf-aled branch from 16fcc4d to f1de495 Compare March 6, 2017 15:59
@neykov
Copy link
Copy Markdown
Contributor

neykov commented Mar 6, 2017

Resolved merge conflicts. Merging - live tests pass.

@neykov neykov merged commit 72c0899 into master Mar 6, 2017
@neykov neykov deleted the upgrade-cxf-aled branch March 6, 2017 15:59
asfgit pushed a commit to apache/brooklyn-server that referenced this pull request Mar 7, 2017
[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.~~
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants