From 8870afb074db31e779e6f093981716574c5c4e24 Mon Sep 17 00:00:00 2001 From: Gail Badner Date: Wed, 9 Mar 2011 03:44:03 -0800 Subject: [PATCH 1/2] HHH-5994 : Changed MergeTest.mergeManaged to be FailureExpected --- .../java/org/hibernate/test/nonflushedchanges/MergeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java index a0afbf3243..8d9f3fdd45 100755 --- a/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java @@ -575,7 +575,7 @@ public class MergeTest extends AbstractOperationTestCase { cleanup(); } - public void testMergeManaged() throws Exception { + public void testMergeManagedFailureExpected() throws Exception { SimpleJtaTransactionManagerImpl.getInstance().begin(); Session s = openSession(); From d3b5c687ee5a34b3e8fe1cf6b4bb2d218b32f118 Mon Sep 17 00:00:00 2001 From: Gail Badner Date: Wed, 9 Mar 2011 03:50:31 -0800 Subject: [PATCH 2/2] HHH-5890 : License comment refers to non-exiting page --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 19919050f8..5c3a4d3eab 100644 --- a/build.gradle +++ b/build.gradle @@ -217,7 +217,7 @@ subprojects { subProject -> license { name 'GNU Lesser General Public License' url 'http://www.gnu.org/licenses/lgpl-2.1.html' - comments 'See discussion at http://hibernate.org/356.html for more details.' + comments 'See discussion at http://hibernate.org/license for more details.' distribution 'repo' } }