[hop] branch master updated (b960b58 -> 6d5f8b1)

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git.


    from b960b58  Merge pull request #1429 from nadment/HOP-3867
     new dc6f20a  HOP-3764 : Custom trustore ignored in REST Client transform
     new 1b7c3f9  HOP-3764 : fix RestTest
     new d4e80c3  HOP-3764 : add integration-test for rest client
     new a2ba29c  Merge branch 'master' of https://github.com/apache/incubator-hop into restClientTrustore
     new 280e554  HOP-3764 : add ASF license
     new 6d5f8b1  Merge pull request #1395 from uraychang/restClientTrustore

The 3833 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../integration-tests/integration-tests-http.yaml  |  12 +-
 docker/integration-tests/resource/http/.keystore   | Bin 0 -> 2243 bytes
 .../integration-tests/resource/http/index.html     |  13 ++
 docker/integration-tests/resource/http/server.xml  | 155 +++++++++++++++++++++
 ...st-client.hpl => 0006-rest-client-trustore.hpl} | 119 +++++++++-------
 integration-tests/http/files/.keystore             | Bin 0 -> 2243 bytes
 .../main-0006-rest-client-trustore.hwf}            |  17 ++-
 integration-tests/http/project-config.json         |   4 +
 .../apache/hop/pipeline/transforms/rest/Rest.java  |  78 +++++++++--
 .../hop/pipeline/transforms/rest/RestTest.java     |  10 +-
 10 files changed, 326 insertions(+), 82 deletions(-)
 create mode 100644 docker/integration-tests/resource/http/.keystore
 copy integration-tests/asf-header.txt => docker/integration-tests/resource/http/index.html (78%)
 create mode 100644 docker/integration-tests/resource/http/server.xml
 copy integration-tests/http/{0003-rest-client.hpl => 0006-rest-client-trustore.hpl} (64%)
 create mode 100644 integration-tests/http/files/.keystore
 copy integration-tests/{beam_directrunner/main-0001-generate-rows.hwf => http/main-0006-rest-client-trustore.hwf} (86%)