[isis] branch spring6 updated: ISIS-3275: deps: convergence fixes

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/spring6 by this push:
     new b016572340 ISIS-3275: deps: convergence fixes
b016572340 is described below

commit b0165723406cf61caa747cd3ede97f5c0e54d2c8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Nov 29 17:48:53 2022 +0100

    ISIS-3275: deps: convergence fixes
    
    - remove hibernate-core from spring-boot-jpa-starter (artifact
    coordinates changed)
---
 persistence/jpa/eclipselink/pom.xml | 2 +-
 regressiontests/pom.xml             | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/persistence/jpa/eclipselink/pom.xml b/persistence/jpa/eclipselink/pom.xml
index 41e6907e87..11e51e7408 100644
--- a/persistence/jpa/eclipselink/pom.xml
+++ b/persistence/jpa/eclipselink/pom.xml
@@ -110,7 +110,7 @@
 				</exclusion>
 				<exclusion>
 					<!-- using eclipse-link instead -->
-					<groupId>org.hibernate</groupId>
+					<groupId>org.hibernate.orm</groupId>
 					<artifactId>hibernate-core</artifactId>
 				</exclusion>
 				<exclusion>
diff --git a/regressiontests/pom.xml b/regressiontests/pom.xml
index b5b5371bba..52e0fd38fd 100644
--- a/regressiontests/pom.xml
+++ b/regressiontests/pom.xml
@@ -34,6 +34,8 @@
 	<properties>
 		<skip.regressionTests>false</skip.regressionTests>
 		<skipTests>${skip.regressionTests}</skipTests>
+		<!-- override surefire defaults from bom, as this is not a Java module yet -->
+		<surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine>
 	</properties>
 
 	<build>