Changes for OSGi package definition