Merge remote-tracking branch 'origin/release/1.0.0-incubating' into d…

…evelop
mmartell · Oct 14, 2016 · 40c1917 · 40c1917
2 parents a7b9ac1 + a0de4c9
commit 40c1917
Show file tree

Hide file tree

Showing 711 changed files with 69,036 additions and 3,687 deletions.
diff --git a/extensions/geode-modules-assembly/build.gradle b/extensions/geode-modules-assembly/build.gradle
@@ -154,15 +154,6 @@ task distTomcat(type: Zip, dependsOn: ':extensions/geode-modules:assemble') {
   }
 }
 
-task distHibernate(type: Zip, dependsOn: ':extensions/geode-modules-hibernate:assemble') {
-  archiveName = "Apache_Geode_Modules-${version}-Hibernate.zip"
-
-  into('lib') {
-    from getJarArtifact(':extensions/geode-modules')
-    from getJarArtifact(':extensions/geode-modules-hibernate')
-  }
-}
-
 task distAppServer(type: Zip, dependsOn: ':extensions/geode-modules-session:assemble') {
   archiveName = "Apache_Geode_Modules-${version}-AppServer.zip"
 
@@ -204,11 +195,10 @@ task distTcServer30(type: Zip, dependsOn: [':extensions/geode-modules:assemble',
 dependencies {
   moduleDistOutputs distTcServer.outputs.files
   moduleDistOutputs distTcServer30.outputs.files
-  moduleDistOutputs distHibernate.outputs.files
   moduleDistOutputs distAppServer.outputs.files
   moduleDistOutputs distTomcat.outputs.files
 }
 
-task dist(type: Task, dependsOn: ['distTcServer', 'distTcServer30', 'distTomcat', 'distHibernate', 'distAppServer'])
+task dist(type: Task, dependsOn: ['distTcServer', 'distTcServer30', 'distTomcat', 'distAppServer'])
 
 build.dependsOn dist
diff --git a/extensions/geode-modules-hibernate/build.gradle b/extensions/geode-modules-hibernate/build.gradle
diff --git a/...ns/geode-modules-hibernate/src/main/java/org/apache/geode/modules/hibernate/EnumType.java b/...ns/geode-modules-hibernate/src/main/java/org/apache/geode/modules/hibernate/EnumType.java
diff --git a/...eode-modules-hibernate/src/main/java/org/apache/geode/modules/hibernate/GemFireCache.java b/...eode-modules-hibernate/src/main/java/org/apache/geode/modules/hibernate/GemFireCache.java