Merge "Removed deprecated Matcher imports"

author Steve Smokowski <ss835w@att.com>

Fri, 25 Jan 2019 13:53:23 +0000 (13:53 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Fri, 25 Jan 2019 13:53:23 +0000 (13:53 +0000)
author Steve Smokowski <ss835w@att.com>
Fri, 25 Jan 2019 13:53:23 +0000 (13:53 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Fri, 25 Jan 2019 13:53:23 +0000 (13:53 +0000)
diff --cc bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java
Simple merge
diff --cc bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAINetworkResourcesTest.java
Simple merge
author	Steve Smokowski <ss835w@att.com>
	Fri, 25 Jan 2019 13:53:23 +0000 (13:53 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Fri, 25 Jan 2019 13:53:23 +0000 (13:53 +0000)
		1	2
bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java	patch \|	diff1 \|	diff2 \|	blob \| history
bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAINetworkResourcesTest.java	patch \|	diff1 \|	diff2 \|	blob \| history