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

burningwave · Jun 7, 2022 · 3ec1405 · 3ec1405
2 parents dbe6b40 + 79bff54
commit 3ec1405
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 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/2192201505)
+[![Platforms](https://img.shields.io/badge/platforms-Windows%2C%20Mac%20OS%2C%20Linux-orange)](https://github.com/burningwave/core/actions/runs/2454169667)
 
-[![Supported JVM](https://img.shields.io/badge/supported%20JVM-8%2C%209+%20(18)-blueviolet)](https://github.com/burningwave/core/actions/runs/2192201505)
+[![Supported JVM](https://img.shields.io/badge/supported%20JVM-8%2C%209+%20(18)-blueviolet)](https://github.com/burningwave/core/actions/runs/2454169667)
 
 [![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)
@@ -48,7 +48,7 @@ To include Burningwave Core library in your projects simply use with **Apache Ma
 <dependency>
     <groupId>org.burningwave</groupId>
     <artifactId>core</artifactId>
-    <version>12.48.0</version>
+    <version>12.49.0</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
 	<groupId>org.burningwave</groupId>
 	<artifactId>core</artifactId>
-	<version>12.48.1-SNAPSHOT</version>
+	<version>12.49.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Burningwave Core</name>
@@ -95,8 +95,7 @@
 		<jakarta.validation.version>2.0.2</jakarta.validation.version>
 		<junit-jupiter.version>5.8.2</junit-jupiter.version>
 		<junit.version>1.8.2</junit.version>
-		<burningwave-jvm-driver.version>7.0.0</burningwave-jvm-driver.version>
-		<jvm-driver.version>8.9.6</jvm-driver.version>
+		<burningwave-jvm-driver.version>8.0.0</burningwave-jvm-driver.version>
 		<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
 		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
 		<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
@@ -137,18 +136,6 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>io.github.toolfactory</groupId>
-			<artifactId>jvm-driver</artifactId>
-			<version>${jvm-driver.version}</version>
-			<exclusions>
-		        <exclusion>
-		            <groupId>io.github.toolfactory</groupId>
-		            <artifactId>narcissus</artifactId>
-		        </exclusion>
-		    </exclusions>
-		</dependency>
-
 		<dependency>
 			<groupId>org.burningwave</groupId>
 			<artifactId>jvm-driver</artifactId>
@@ -299,7 +286,7 @@
 							<Bundle-Description>${project.description}</Bundle-Description>
 							<Bundle-Version>${project.version}</Bundle-Version>
 							<Require-Capability>osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.8))"</Require-Capability>
-							<Import-Package>javax.tools,io.github.toolfactory.jvm;version="8.9.4",org.burningwave.jvm;version="7.0.0";resolution:=optional,io.github.toolfactory.jvm.util,org.slf4j;version="1.7.0";resolution:=optional</Import-Package>
+							<Import-Package>javax.tools,io.github.toolfactory.jvm;version="9.0.0",org.burningwave.jvm;version="8.0.0";resolution:=optional,io.github.toolfactory.jvm.util,org.slf4j;version="1.7.0";resolution:=optional</Import-Package>
 							<Export-Package>org.burningwave.core;uses:="org.burningwave.core.classes,org.burningwave.core.concurrent,org.burningwave.core.function,org.burningwave.core.io,org.burningwave.core.iterable";version="12.45.3",org.burningwave.core.assembler;uses:="io.github.toolfactory.jvm,org.burningwave.core,org.burningwave.core.classes,org.burningwave.core.concurrent,org.burningwave.core.io,org.burningwave.core.iterable,org.burningwave.core.jvm";version="12.45.3",org.burningwave.core.classes;uses:="io.github.toolfactory.jvm.util,org.burningwave.core,org.burningwave.core.concurrent,org.burningwave.core.function,org.burningwave.core.io,org.burningwave.core.iterable";version="12.45.3",org.burningwave.core.concurrent;uses:="org.burningwave.core,org.burningwave.core.function";version="12.45.3",org.burningwave.core.function;version="12.45.3",org.burningwave.core.io;uses:="org.burningwave.core,org.burningwave.core.classes";version="12.45.3",org.burningwave.core.iterable;uses:="org.burningwave.core,org.burningwave.core.concurrent,org.burningwave.core.function";version="12.45.3",org.burningwave.core.jvm;uses:="org.burningwave.core,org.burningwave.core.io,org.burningwave.core.iterable";version="12.45.3"</Export-Package>
 							<Multi-Release>true</Multi-Release>
 						</manifestEntries>

diff --git a/src/main/java/org/burningwave/core/concurrent/Thread.java b/src/main/java/org/burningwave/core/concurrent/Thread.java
@@ -28,6 +28,7 @@
  */
 package org.burningwave.core.concurrent;
 
+import static org.burningwave.core.assembler.StaticComponentContainer.Driver;
 import static org.burningwave.core.assembler.StaticComponentContainer.IterableObjectHelper;
 import static org.burningwave.core.assembler.StaticComponentContainer.ManagedLoggerRepository;
 import static org.burningwave.core.assembler.StaticComponentContainer.Methods;
@@ -180,7 +181,7 @@ void shutDown(boolean waitForFinish) {
 
 	public void kill() {
 		terminate(thread ->
-			Methods.invokeDirect(thread, "stop0", new ThreadDeath()),
+			Driver.stop(thread),
 			"stop"
 		);
 	}