Merge remote-tracking branch 'origin/master' into experimental

burningwave · Oct 28, 2023 · 47dd4c8 · 47dd4c8
2 parents 224dacc + a8565ab
commit 47dd4c8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@
 [![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/org.burningwave/core/12)](https://maven-badges.herokuapp.com/maven-central/org.burningwave/core/)
 [![GitHub](https://img.shields.io/github/license/burningwave/core)](https://github.com/burningwave/core/blob/master/LICENSE)
 
-[![Platforms](https://img.shields.io/badge/platforms-Windows%2C%20Mac%20OS%2C%20Linux-orange)](https://github.com/burningwave/core/actions/runs/6576718084)
+[![Platforms](https://img.shields.io/badge/platforms-Windows%2C%20Mac%20OS%2C%20Linux-orange)](https://github.com/burningwave/core/actions/runs/6677966387)
 
-[![Supported JVM](https://img.shields.io/badge/supported%20JVM-8%2C%209+%20(21)-blueviolet)](https://github.com/burningwave/core/actions/runs/6576718084)
+[![Supported JVM](https://img.shields.io/badge/supported%20JVM-8%2C%209+%20(21)-blueviolet)](https://github.com/burningwave/core/actions/runs/6677966387)
 
 [![Coveralls github branch](https://img.shields.io/coveralls/github/burningwave/core/master)](https://coveralls.io/github/burningwave/core?branch=master)
 [![GitHub open issues](https://img.shields.io/github/issues/burningwave/core)](https://github.com/burningwave/core/issues)
@@ -49,7 +49,7 @@ To include Burningwave Core library in your projects simply use with **Apache Ma
 <dependency>
     <groupId>org.burningwave</groupId>
     <artifactId>core</artifactId>
-    <version>12.64.0</version>
+    <version>12.64.1</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
 	<groupId>org.burningwave</groupId>
 	<artifactId>core</artifactId>
-	<version>12.64.1-SNAPSHOT</version>
+	<version>12.64.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Burningwave Core</name>
@@ -96,19 +96,19 @@
 		<junit-jupiter.version>5.10.0</junit-jupiter.version>
 		<junit.version>1.10.0</junit.version>
 		<burningwave-jvm-driver.version>8.15.0</burningwave-jvm-driver.version>
-		<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
+		<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
 		<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
-		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+		<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
 		<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-		<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+		<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
 		<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
 		<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
 		<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
 		<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
 		<maven-scm-provider-gitexe.version>1.9.5</maven-scm-provider-gitexe.version>
-		<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-		<nexus-staging-maven-plugin.version>1.6.12</nexus-staging-maven-plugin.version>
+		<maven-surefire-plugin.version>3.2.1</maven-surefire-plugin.version>
+		<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
 		<slf4j.version>2.0.9</slf4j.version>
 	</properties>
 

diff --git a/src/main/java/org/burningwave/core/classes/JavaMemoryCompiler.java b/src/main/java/org/burningwave/core/classes/JavaMemoryCompiler.java
@@ -76,7 +76,7 @@ public static abstract class Key {
 			);
 			defaultValues.put(
 				Key.BLACK_LISTED_CLASS_PATHS,
-				"//${paths.main-class-paths}/..//children:.*?surefirebooter\\d{0,}\\.jar"  + IterableObjectHelper.getDefaultValuesSeparator()
+				"//${paths.main-class-paths}/..//children:.*?surefirebooter[^\\/\\\\]{0,}\\.jar"  + IterableObjectHelper.getDefaultValuesSeparator()
 			);
 
 			DEFAULT_VALUES = Collections.unmodifiableMap(defaultValues);

diff --git a/src/main/java/org/burningwave/core/iterable/IterableObjectHelperImpl.java b/src/main/java/org/burningwave/core/iterable/IterableObjectHelperImpl.java
@@ -231,9 +231,9 @@ public <T> Collection<T> merge(
 		).orElseGet(() ->
 			defaultCollectionSupplier.get()
 		);
-		Collection<T> additionalClassPaths = additionalCollectionSupplier.get();
-		if (additionalClassPaths != null) {
-			mergedCollection.addAll(additionalClassPaths);
+		Collection<T> additionalCollection = additionalCollectionSupplier.get();
+		if (additionalCollection != null) {
+			mergedCollection.addAll(additionalCollection);
 		}
 		return mergedCollection;
 	}