Several build files have been upgraded to refer to JPA 2.2, but I see several other places are still referring to JPA 2.1.
hibernate-core OSGi headers are referring to 'javax.persistence;version="2.1.0"'
hibernate-envers OSGi headers have multiple references to 2.1
base-information.gradle defines jpaVersion
Might be useful to make sure they all depend on the same property?
To handle the case "2.1.0" vs "2.1" we might need multiple such properties but I'd recommend to define them close to each other so that when changing one it's unlikely to not notice the other.