From 9883d7b11a313c3c8407524ac8cf2746474ca857 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Mon, 23 Mar 2015 15:27:02 -0500
Subject: [PATCH] HHH-9680 - hibernate-osgi module has gone cra-cra again

---
 hibernate-osgi/hibernate-osgi.gradle | 6 +++++-
 settings.gradle                      | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hibernate-osgi/hibernate-osgi.gradle b/hibernate-osgi/hibernate-osgi.gradle
index 9a9322df7e..dc805b1d81 100644
--- a/hibernate-osgi/hibernate-osgi.gradle
+++ b/hibernate-osgi/hibernate-osgi.gradle
@@ -9,6 +9,10 @@ configurations {
 	}
 }
 
+test {
+	enabled = false
+}
+
 sourceSets {
 	testClientBundle
 }
@@ -121,7 +125,7 @@ task felixProperties << {
 		}
 	}
 	
-	propertiesFile = file("$buildDir/osgi-lib/felix-framework.properties")
+	File propertiesFile = file("$buildDir/osgi-lib/felix-framework.properties")
 	
 	// append jars wrapped using BND
 	FileTree tree = fileTree(dir: "$buildDir/osgi-lib/bnd")
diff --git a/settings.gradle b/settings.gradle
index f40e96ba3e..f219151240 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,8 +3,7 @@ include 'hibernate-testing'
 include 'hibernate-entitymanager'
 include 'hibernate-envers'
 
-// Temporarily disabled : HHH-9680
-//include 'hibernate-osgi'
+include 'hibernate-osgi'
 
 include 'hibernate-c3p0'
 include 'hibernate-proxool'