Skip to content
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

Merged
merged 5 commits into from
Mar 7, 2017
Merged

[WIP] CXF upgrade #547

merged 5 commits into from
Mar 7, 2017

Conversation

aledsage
Copy link
Contributor

@aledsage aledsage commented Jan 31, 2017

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.

@neykov
Copy link
Member

neykov commented Jan 31, 2017

Need to keep felix in sync with Karaf's version - missed that in my PR.
Felix version in Karaf 4.0.8 is 5.6.1.

@aledsage
Copy link
Contributor Author

I just tested this with cxf 3.1.10 (released today - thanks for pointing me at that @neykov). It seems to work well:

  • Successfully deployed a windows VM in aws, with it executing simple winrm commands
  • Confirmed the bundles aren't be refreshed (due to wiring) as new bundles are added

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.

@aledsage aledsage mentioned this pull request Jan 31, 2017
@aledsage aledsage force-pushed the cxf-upgrade branch 2 times, most recently from c81edb4 to ef12428 Compare February 1, 2017 09:47
@aledsage
Copy link
Contributor Author

aledsage commented Feb 1, 2017

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 -->
Copy link
Contributor

@ahgittin ahgittin Feb 13, 2017

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.)

Copy link
Member

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.

ahgittin added a commit to ahgittin/brooklyn-server that referenced this pull request Feb 27, 2017
This reverts commit 1108d8f.

Does not belong in this PR.  Included in apache#547 .
@neykov
Copy link
Member

neykov commented Mar 7, 2017

Winrm4j 5.0 released. Will merge this shortly. @aledsage could you remove the WIP tag.

@geomacy
Copy link
Contributor

geomacy commented Mar 7, 2017

👍 LGTM; see comments on #570

@neykov
Copy link
Member

neykov commented Mar 7, 2017

Tested successfully (together with #570) by deploying a blueprint and running the following tests:

  • WinRmMachineLocationLiveTest
  • JcloudsWinrmingLiveTest (AWS only)
  • WindowsYamlLiveTest
  • MongoDBWinEc2LiveTest
  • VanillaWindowsProcessWinrmExitStatusLiveTest
  • VanillaWindowsProcessWinrmStreamsLiveTest
  • Windows7zipBlueprintLiveTest

@asfgit asfgit merged commit 07e1bc8 into apache:master Mar 7, 2017
asfgit pushed a commit 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.~~
@aledsage aledsage deleted the cxf-upgrade branch March 20, 2017 14:46
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.

5 participants