fix jaxb version filtering
fix osgi version
Merge remote-tracking branch 'origin/1.12'