Merge pull request #343 from xdev-software/develop

Release

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.4.1
+* Fixed random "recursive update during ServiceLoading" exception #342
+
 # 2.4.0
 * ``oidc-server-mock``
   * Improved extensibility by creating abstract base classes

advanced-demo/integration-tests/pom.xml

@@ -86,7 +86,7 @@
 			<dependency>
 				<groupId>software.xdev</groupId>
 				<artifactId>testcontainers-advanced-imagebuilder</artifactId>
-				<version>2.0.2</version>
+				<version>2.2.0</version>
 			</dependency>
 
 			<!-- Utility for proxies in tests -->

advanced-demo/integration-tests/tci-webapp/src/main/java/software/xdev/tci/demo/tci/webapp/containers/WebAppContainerBuilder.java

@@ -1,14 +1,19 @@
 package software.xdev.tci.demo.tci.webapp.containers;
 
+import java.io.IOException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import software.xdev.testcontainers.imagebuilder.AdvancedImageFromDockerFile;
 import software.xdev.testcontainers.imagebuilder.compat.DockerfileCOPYParentsEmulator;
+import software.xdev.testcontainers.imagebuilder.transfer.fcm.FileLinesContentModifier;
 
 
 @SuppressWarnings("PMD.MoreThanOneLogger")
@@ -60,7 +65,40 @@ public static synchronized String getBuiltImageName()
 				.withBaseDir(Paths.get("../../"))
 				// File is in root directory - we can't access it
 				.withBaseDirRelativeIgnoreFile(null)
-				.withDockerFileLinesModifier(new DockerfileCOPYParentsEmulator());
+				.withDockerFileLinesModifier(new DockerfileCOPYParentsEmulator())
+				.withTransferArchiveTARCompressorCustomizer(c -> c
+					// Rewrite parent pom to exclude integration tests
+					// This way changes in test pom's cause no redownload of dependencies
+					.withContentModifier(new FileLinesContentModifier()
+					{
+						@Override
+						public boolean shouldApply(
+							final Path sourcePath,
+							final String targetPath,
+							final TarArchiveEntry tarArchiveEntry)
+						{
+							return "pom.xml".equals(targetPath);
+						}
+						
+						@Override
+						public List<String> modify(
+							final List<String> lines,
+							final Path sourcePath,
+							final String targetPath,
+							final TarArchiveEntry tarArchiveEntry) throws IOException
+						{
+							return lines.stream()
+								// Remove integration tests module
+								.filter(s -> !s.contains("<module>integration-tests"))
+								.toList();
+						}
+						
+						@Override
+						public boolean isIdentical(final List<String> original, final List<String> created)
+						{
+							return original.size() == created.size();
+						}
+					}));
 
 		try
 		{

advanced-demo/pom.xml

@@ -21,7 +21,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<org.springframework.boot.version>3.5.3</org.springframework.boot.version>
+		<org.springframework.boot.version>3.5.4</org.springframework.boot.version>
 	</properties>
 
 	<modules>
@@ -236,12 +236,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.15.0</version>
+								<version>7.16.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.15.0</version>
+								<version>7.16.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

base-demo/src/test/java/software/xdev/tci/factory/prestart/PreStartDemoTest.java

@@ -9,7 +9,7 @@
 import software.xdev.tci.dummyinfra.factory.DummyTCIFactory;
 import software.xdev.tci.factory.prestart.config.PreStartConfig;
 import software.xdev.tci.factory.registry.TCIFactoryRegistry;
-import software.xdev.tci.serviceloading.TCIServiceLoader;
+import software.xdev.tci.serviceloading.TCIServiceLoaderHolder;
 
 
 class PreStartDemoTest
@@ -23,7 +23,8 @@ class PreStartDemoTest
 	static void beforeAll()
 	{
 		// Force enable PreStarting
-		TCIServiceLoader.instance().forceOverwrite(PreStartConfig.class, new PreStartConfig()
+		TCIServiceLoaderHolder.instance().forceOverwrite(
+			PreStartConfig.class, new PreStartConfig()
 		{
 			@Override
 			public boolean enabled()

base/pom.xml

@@ -250,7 +250,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>flatten-maven-plugin</artifactId>
-						<version>1.7.1</version>
+						<version>1.7.2</version>
 						<configuration>
 							<flattenMode>ossrh</flattenMode>
 						</configuration>
@@ -355,12 +355,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.15.0</version>
+								<version>7.16.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.15.0</version>
+								<version>7.16.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

base/src/main/java/software/xdev/tci/envperf/EnvironmentPerformance.java

@@ -16,7 +16,7 @@
 package software.xdev.tci.envperf;
 
 import software.xdev.tci.envperf.impl.TCIEnvironmentPerformance;
-import software.xdev.tci.serviceloading.TCIServiceLoader;
+import software.xdev.tci.serviceloading.TCIServiceLoaderHolder;
 
 
 /**
@@ -34,7 +34,7 @@ public static int cpuSlownessFactor()
 
 	public static TCIEnvironmentPerformance impl()
 	{
-		return TCIServiceLoader.instance().service(TCIEnvironmentPerformance.class);
+		return TCIServiceLoaderHolder.instance().service(TCIEnvironmentPerformance.class);
 	}
 
 	private EnvironmentPerformance()

base/src/main/java/software/xdev/tci/factory/prestart/config/PreStartConfig.java

@@ -15,7 +15,7 @@
  */
 package software.xdev.tci.factory.prestart.config;
 
-import software.xdev.tci.serviceloading.TCIServiceLoader;
+import software.xdev.tci.serviceloading.TCIServiceLoaderHolder;
 
 
 public interface PreStartConfig
@@ -91,6 +91,6 @@ default boolean detectEndingTests()
 
 	static PreStartConfig instance()
 	{
-		return TCIServiceLoader.instance().service(PreStartConfig.class);
+		return TCIServiceLoaderHolder.instance().service(PreStartConfig.class);
 	}
 }

base/src/main/java/software/xdev/tci/factory/prestart/coordinator/GlobalPreStartCoordinator.java

@@ -16,7 +16,7 @@
 package software.xdev.tci.factory.prestart.coordinator;
 
 import software.xdev.tci.factory.prestart.PreStartableTCIFactory;
-import software.xdev.tci.serviceloading.TCIServiceLoader;
+import software.xdev.tci.serviceloading.TCIServiceLoaderHolder;
 
 
 public interface GlobalPreStartCoordinator extends AutoCloseable
@@ -30,11 +30,11 @@ public interface GlobalPreStartCoordinator extends AutoCloseable
 
 	static GlobalPreStartCoordinator instance()
 	{
-		return TCIServiceLoader.instance().service(GlobalPreStartCoordinator.class);
+		return TCIServiceLoaderHolder.instance().service(GlobalPreStartCoordinator.class);
 	}
 
 	static boolean isPresent()
 	{
-		return TCIServiceLoader.instance().isLoaded(GlobalPreStartCoordinator.class);
+		return TCIServiceLoaderHolder.instance().isLoaded(GlobalPreStartCoordinator.class);
 	}
 }

base/src/main/java/software/xdev/tci/factory/prestart/loadbalancing/LoadMonitor.java

@@ -17,7 +17,7 @@
 
 import java.util.OptionalDouble;
 
-import software.xdev.tci.serviceloading.TCIServiceLoader;
+import software.xdev.tci.serviceloading.TCIServiceLoaderHolder;
 
 
 /**
@@ -35,6 +35,6 @@ public interface LoadMonitor
 
 	static LoadMonitor instance()
 	{
-		return TCIServiceLoader.instance().service(LoadMonitor.class);
+		return TCIServiceLoaderHolder.instance().service(LoadMonitor.class);
 	}
 }