Merge branch 'master' into 'master'

Bump dependency versions and fix build failure

See merge request entgra/carbon-device-mgt-plugins!160
revert-dabc3590
Saad Sahibjan 5 years ago
commit 47eca255d9

@ -46,6 +46,11 @@ public class DeviceInformationManagerServiceMock implements DeviceInformationMan
} }
@Override public void addDeviceLocations(Device device, List<DeviceLocation> list)
throws DeviceDetailsMgtException {
}
@Override @Override
public DeviceLocation getDeviceLocation(DeviceIdentifier deviceIdentifier) throws DeviceDetailsMgtException { public DeviceLocation getDeviceLocation(DeviceIdentifier deviceIdentifier) throws DeviceDetailsMgtException {
return null; return null;

@ -1154,7 +1154,7 @@
<properties> <properties>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.devicemgt.version>4.1.10-SNAPSHOT</carbon.devicemgt.version> <carbon.devicemgt.version>4.1.10</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[4.0.0, 5.0.0)</carbon.devicemgt.version.range> <carbon.devicemgt.version.range>[4.0.0, 5.0.0)</carbon.devicemgt.version.range>
<!-- Carbon Device Management Plugins --> <!-- Carbon Device Management Plugins -->

Loading…
Cancel
Save