Merge pull request #542 from xdev-software/develop

Release

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 3.1.0
+* `EntityManagerController`
+  * Now always checks if the EntityManager is already closed
+    * This was changed because the Jakarta EE does not specify how an already closed EntityManager should behave
+      * for example Hibernate doesn't care when you call call close multiple times as it checks for that while EclipseLink does not and crashes
+  * Removed `closeEntityManagerOnCleanupWithoutCheck`
+* Updated dependencies
+
 # 3.0.3
 * `EntityManagerController`
   * Make it possible to configure `closeEntityManagerOnCleanupWithoutCheck`
@@ -186,7 +194,7 @@
         * [``docker container commit``](https://docs.docker.com/reference/cli/docker/container/commit/)
             * Only snapshots storage - no in-memory data, processes, etc.
             * Volumes are not snapshoted due to [limitations](https://github.com/moby/moby/issues/43190) in Docker
-        * Other implementation like [CRIU](https://criu.org) may be available in the future once Docker adds support for them
+        * Other implementation like CRIU may be available in the future once Docker adds support for them
 
 # 1.1.3
 * Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)

advanced-demo/entities-metamodel/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.tci.demo</groupId>
 		<artifactId>advanced-demo</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>entities-metamodel</artifactId>
 

advanced-demo/entities/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.tci.demo</groupId>
 		<artifactId>advanced-demo</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>entities</artifactId>
 

advanced-demo/integration-tests/persistence-it/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.tci.demo.it</groupId>
 		<artifactId>integration-tests</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>persistence-it</artifactId>
 

advanced-demo/integration-tests/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/BaseTest.java

@@ -31,7 +31,7 @@
 
 
 @ExtendWith(BaseTest.LogExtension.class)
-abstract class BaseTest
+public abstract class BaseTest
 {
 	private static final Logger LOG = LoggerFactory.getLogger(BaseTest.class);
 

advanced-demo/integration-tests/pom.xml

@@ -7,12 +7,12 @@
 	<parent>
 		<groupId>software.xdev.tci.demo</groupId>
 		<artifactId>advanced-demo</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>software.xdev.tci.demo.it</groupId>
 	<artifactId>integration-tests</artifactId>
-	<version>3.0.4-SNAPSHOT</version>
+	<version>3.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
@@ -28,13 +28,13 @@
 			<dependency>
 				<groupId>software.xdev.tci.demo.it</groupId>
 				<artifactId>tci-db</artifactId>
-				<version>3.0.4-SNAPSHOT</version>
+				<version>3.1.0-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
 				<groupId>software.xdev.tci.demo.it</groupId>
 				<artifactId>tci-webapp</artifactId>
-				<version>3.0.4-SNAPSHOT</version>
+				<version>3.1.0-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
@@ -93,7 +93,7 @@
 			<dependency>
 				<groupId>software.xdev</groupId>
 				<artifactId>testcontainers-advanced-imagebuilder</artifactId>
-				<version>2.4.0</version>
+				<version>2.4.1</version>
 			</dependency>
 
 			<!-- Utility for proxies in tests -->

advanced-demo/integration-tests/tci-db/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.tci.demo.it</groupId>
 		<artifactId>integration-tests</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tci-db</artifactId>
 

advanced-demo/integration-tests/tci-webapp/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.tci.demo.it</groupId>
 		<artifactId>integration-tests</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tci-webapp</artifactId>
 

advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/factory/WebAppTCIFactory.java

@@ -6,6 +6,7 @@
 import software.xdev.tci.demo.tci.webapp.WebAppTCI;
 import software.xdev.tci.demo.tci.webapp.containers.WebAppContainer;
 import software.xdev.tci.demo.tci.webapp.containers.WebAppContainerBuilder;
+import software.xdev.tci.envperf.EnvironmentPerformance;
 import software.xdev.tci.factory.prestart.PreStartableTCIFactory;
 import software.xdev.tci.misc.ContainerMemory;
 
@@ -16,14 +17,15 @@ public class WebAppTCIFactory extends PreStartableTCIFactory<WebAppContainer, We
 
 	protected static String appImageName;
 
+	@SuppressWarnings("checkstyle:MagicNumber")
 	public WebAppTCIFactory(final Consumer<WebAppContainer> additionalContainerBuilder)
 	{
 		super(
 			WebAppTCI::new,
 			() -> {
 				final WebAppContainer container = new WebAppContainer(getAppImageName(), true)
 					.withDefaultWaitStrategy(
-						Duration.ofMinutes(1),
+						Duration.ofSeconds(40L + 20L * EnvironmentPerformance.cpuSlownessFactor()),
 						WebAppTCI.ACTUATOR_USERNAME,
 						WebAppTCI.ACTUATOR_PASSWORD)
 					.withCreateContainerCmdModifier(cmd -> cmd.getHostConfig().withMemory(ContainerMemory.M1G))

advanced-demo/integration-tests/webapp-it/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.tci.demo.it</groupId>
 		<artifactId>integration-tests</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>webapp-it</artifactId>