From 3152bb0ffb0fc21303badd6578562874dfbe5628 Mon Sep 17 00:00:00 2001
From: Martin Simka <msimka@redhat.com>
Date: Thu, 28 Jan 2016 14:48:05 +0100
Subject: [PATCH] [HHH-10290] ignore environment property
 hibernate.jdbc.batch_versioned_data in BatchVersionedDataConfigTest

---
 .../hibernate/test/cfg/BatchVersionedDataConfigTest.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/BatchVersionedDataConfigTest.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/BatchVersionedDataConfigTest.java
index b16759537c..74ba1cb118 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/cfg/BatchVersionedDataConfigTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/cfg/BatchVersionedDataConfigTest.java
@@ -54,6 +54,12 @@ public class BatchVersionedDataConfigTest extends BaseUnitTestCase {
 	@Before
 	public void setUp() {
 		cfg = new Configuration();
+
+		// HHH-10290 ignore environment property hibernate.jdbc.batch_versioned_data
+		if (cfg.getProperties().getProperty(AvailableSettings.BATCH_VERSIONED_DATA) != null) {
+			cfg.getProperties().remove(AvailableSettings.BATCH_VERSIONED_DATA);
+			cfg.getStandardServiceRegistryBuilder().getSettings().remove(AvailableSettings.BATCH_VERSIONED_DATA);
+		}
 	}
 
 	@After