diff options
| author |   Patrick Brady <patrick.brady@att.com> | 2019-02-22 13:37:19 -0800 |
|---|---|---|
| committer | Patrick Brady <patrick.brady@att.com> | 2019-02-25 22:33:05 +0000 |
| commit | 13c0353d0f637ec88ca4cdbeb64c4de3917e6a2b (patch) | |
| tree | a9d1561322f2f66556aa7c8a6e3ddae592a23d08 /appc-adapters/appc-chef-adapter | |
| parent | 356dba9fb407b1df3fe89a4c8f082a09aa564d36 (diff) | |
Changes for new odl version
Changes required to update to latest opendaylight
version. Some powermock tests have been temporarily
removed due to an powermock incompatibility. They
will be fixed and re-added.
Change-Id: I418d44913fcd42423d2d9bd37b189f6301eaab81
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1370
Diffstat (limited to 'appc-adapters/appc-chef-adapter')
| -rw-r--r-- | appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/onap/appc/adapter/chef/ChefActivatorTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/onap/appc/adapter/chef/ChefActivatorTest.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/onap/appc/adapter/chef/ChefActivatorTest.java index b261a77e9..ec291c15f 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/onap/appc/adapter/chef/ChefActivatorTest.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/onap/appc/adapter/chef/ChefActivatorTest.java @@ -41,7 +41,7 @@ import org.osgi.framework.ServiceRegistration; public class ChefActivatorTest { @Mock - private ServiceRegistration<ChefAdapter> serviceRegistration; + private ServiceRegistration serviceRegistration; @Mock private BundleContext bundleContext; |