Got rid of dead Karaf and Jersey dependencies that were causing problems
when upgrading to Spring 3.1.
Merge branch 'master' of https://github.com/OpenNMS/opennms
Merge branch 'master' into features/spring-3.1
OPENNMS-NMS1-COMPILE-46 fix for missing ops4j pax vaadin dependency
duh, there was already one there :)
Merge remote-tracking branch 'origin/master' into features/spring-3.1
various fixes for sonar issues
fix for OPENNMS-NMS-RPM-68, yet ANOTHER vaadin repository issue
Merge remote-tracking branch 'origin/master' into features/spring-3.1
ignore "resources"
OPENNMS-NMS1-COMPILE-46 fix for missing ops4j pax vaadin dependency
duh, there was already one there :)
fix for OPENNMS-NMS-RPM-68, yet ANOTHER vaadin repository issue
NMS-6076 use data tmp directory for the JVM
SPC-711 fix; Update OSGiUpdateManager to pass VertexRefs
NPE checks
Fix NPE in org.opennms.netmgt.capsd.snmp.SnmpStoreTest.testStoreResultWithValueThenEndOfMibView -- apparently sometimes we are called will a null value
Merge branch 'master' of github.com:OpenNMS/opennms
Code cleanup and some NPE prevention.
Revert "NPE checks"

This reverts commit c328f2bad22075d46a5dcaae9878d250a8839f5a.