Change in ovirt-engine-sdk-java[master]: Support both httpclient versions in built jar

[omachace at redhat.com]

Ondra Machacek has submitted this change and it was merged.

Change subject: Support both httpclient versions in built jar
......................................................................


Support both httpclient versions in built jar

User using jar file provided by maven central, shouldn't
depend on any of httpclient versions. He could use whichever
he wants. This patch changes build proccess so both versions
of httpclient are supported and so user can use both of them.

In addition it fixes issue in connection timeout in httpclient v4.2

Change-Id: I2930fb0c93b004fcca5ceca5d80055cc832c24ec
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1360814
Signed-off-by: Ondra Machacek <omachace at redhat.com>
---
M sdk/pom.xml
M sdk/src/main/java/org/ovirt/engine/sdk4/ConnectionBuilder.java
M sdk/src/main/java/org/ovirt/engine/sdk4/internal/ConnectionBuilder42.java
3 files changed, 7 insertions(+), 14 deletions(-)

Approvals:
  Ondra Machacek: Verified; Looks good to me, approved
  Juan Hernandez: Looks good to me, but someone else must approve
  Jenkins CI: Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/61560
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2930fb0c93b004fcca5ceca5d80055cc832c24ec
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine-sdk-java
Gerrit-Branch: master
Gerrit-Owner: Ondra Machacek <omachace at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Ondra Machacek <omachace at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>