HHH-12663 Include hibernate-osgi bundle only in hibernate-orm feature

build.gradle

@@ -21,7 +21,7 @@ buildscript {
 		classpath 'org.hibernate.build.gradle:hibernate-matrix-testing:2.0.0.Final'
 		classpath 'org.hibernate.build.gradle:version-injection-plugin:1.0.0'
 		classpath 'org.hibernate.build.gradle:gradle-xjc-plugin:1.0.2.Final'
-		classpath 'com.github.lburgazzoli:gradle-karaf-plugin:0.0.49'
+		classpath 'gradle.plugin.com.github.lburgazzoli:gradle-karaf-plugin:0.1.1'
 		classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.7'
 		classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
 		classpath 'de.thetaphi:forbiddenapis:2.5'

hibernate-osgi/hibernate-osgi.gradle

@@ -139,22 +139,24 @@ task generateVersionFile {
 karaf {
 	features {
         xsdVersion  = '1.2.0'
-		includeProject = true
         feature {
             name        = 'hibernate-orm'
             description = 'Combines all Hibernate core dependencies and required modules into a single feature'
+			includeProject = true
         }
 		// NOTE : would like to include spatial as well, but we need to wait for
 		//		it to not define dependency on postgresql driver
 		feature {
 			name = 'hibernate-envers'
 			description = 'Feature for easily adding Envers support to hibernate-orm'
+			includeProject = false
 			configurations 'hibernateEnvers'
 			feature 'hibernate-orm'
 		}
 		feature {
 			name = 'hibernate-infinispan'
 			description = 'Feature for easily adding Infinispan-based caching support to hibernate-orm'
+			includeProject = false
 			configurations 'hibernateInfinispan'
 			feature 'hibernate-orm'
 		}