fixing the problem which doesn't generate OSGI-INF inside the jar
fixing dependency and moving to root pom
fixing build issue
fixing maven build warnings
fixing build warnings
fixing build warnings
revert some build warning fixes.
fix stub generate issue in a clean repo.
fixing REGISTRY-2155
resolving conflict
Applying fix for REGISTRY-2116
REGISTRY-2102 Undeployment mechanism fails to remove CAR artifacts from
Registry.
Merge pull request #6 from cnapagoda/master

Resolve conflicts