Update to structured concurrency being out of incubation (over half a year late 🙈)…

… and also Maven plugin versions.

Author: nipafx

README.md

@@ -59,7 +59,7 @@ To try this out, run the client and the server in different shells.
 	* arguments: see [`Echo.java`.](experiments/src/main/java/dev/nipafx/lab/loom/echo/server/Echo.java)
 * client
     * name: `EchoClient`
-    * arguments: see [`Send.java`.](experiments/src/main/java/dev/nipafx/lab/loom/echo/client/Send.java), 
+    * arguments: see [`Send.java`.](experiments/src/main/java/dev/nipafx/lab/loom/echo/client/Send.java),
 * package: [`dev.nipafx.lab.loom.echo`](experiments/src/main/java/dev/nipafx/lab/loom/echo)
 
 **Note**:

experiments/pom.xml

@@ -14,12 +14,6 @@
 		<relativePath>..</relativePath>
 	</parent>
 
-	<properties>
-		<maven.compiler.release>21</maven.compiler.release>
-		<maven.compiler.source>21</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
-	</properties>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -36,4 +30,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>

experiments/src/main/java/dev/nipafx/lab/loom/crawl/crawler/PageTreeFactory.java

@@ -3,7 +3,6 @@
 import dev.nipafx.lab.loom.crawl.page.ErrorPage;
 import dev.nipafx.lab.loom.crawl.page.GitHubPage;
 import dev.nipafx.lab.loom.crawl.page.Page;
-import jdk.incubator.concurrent.StructuredTaskScope;
 
 import java.io.IOException;
 import java.net.URI;
@@ -19,6 +18,8 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.concurrent.StructuredTaskScope;
+import java.util.concurrent.StructuredTaskScope.Subtask;
 
 import static java.util.Objects.requireNonNull;
 
@@ -56,15 +57,15 @@ private Collection<Page> resolveLinks(Set<URI> links, int depth) throws Interrup
 			return Collections.emptySet();
 
 		try (var scope = new StructuredTaskScope.ShutdownOnFailure()) {
-			List<Future<Page>> futurePages = new ArrayList<>();
+			List<Subtask<Page>> futurePages = new ArrayList<>();
 			for (URI link : links)
 				futurePages.add(scope.fork(() -> createPage(link, depth)));
 
 			scope.join();
 			scope.throwIfFailed();
 
 			return futurePages.stream()
-					.map(Future::resultNow)
+					.map(Subtask::get)
 					.toList();
 		} catch (ExecutionException ex) {
 			// this should not happen as `ErrorPage` instances should have been created for all errors

experiments/src/main/java/dev/nipafx/lab/loom/disk/VirtualThreadsAnalyzer.java

@@ -8,10 +8,10 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.concurrent.StructuredTaskScope;
+import java.util.concurrent.StructuredTaskScope.Subtask;
 import java.util.concurrent.atomic.LongAdder;
 
-import jdk.incubator.concurrent.StructuredTaskScope;
-
 import static java.util.function.Predicate.not;
 
 /**
@@ -25,7 +25,7 @@ class VirtualThreadsAnalyzer implements Analyzer {
 	public FolderStats analyzeFolder(Path folder) throws UncheckedIOException, InterruptedException {
 		try (var scope = new StructuredTaskScope.ShutdownOnFailure();
 				var content = Files.list(folder)) {
-			List<Future<Stats>> childrenTasks = content
+			List<Subtask<Stats>> childrenTasks = content
 					.filter(not(Files::isSymbolicLink))
 					.<Callable<Stats>>map(path -> Files.isDirectory(path)
 							? () -> analyzeFolder(path)
@@ -38,7 +38,7 @@ public FolderStats analyzeFolder(Path folder) throws UncheckedIOException, Inter
 			scope.throwIfFailed();
 
 			var children = childrenTasks.stream()
-					.map(Future::resultNow)
+					.map(Subtask::get)
 					.toList();
 			return FolderStats.createWithChildren(folder, children);
 		} catch (ExecutionException ex) {

experiments/src/main/java/module-info.java

@@ -1,8 +1,5 @@
 module loom.experiments {
-	// for virtual thread / structured concurrency APIs
-	requires jdk.incubator.concurrent;
-
-	// unrelated
+	// unrelated to virtual threads / structured concurrency
 	requires java.net.http;
 	requires java.desktop;
-}
+}

frameworks/quarkus/pom.xml

@@ -11,7 +11,7 @@
 
 	<properties>
 		<maven.compiler.release>21</maven.compiler.release>
-		<compiler-plugin.version>3.11.0</compiler-plugin.version>
+		<compiler-plugin.version>3.12.1</compiler-plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>

frameworks/spring_boot/pom.xml

@@ -17,8 +17,6 @@
 	<properties>
 		<java.version>21</java.version>
 		<maven.compiler.release>21</maven.compiler.release>
-		<maven.compiler.source>21</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
 	</properties>
 
 	<dependencies>
@@ -37,11 +35,11 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.2</version>
 			</plugin>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.12.1</version>
 			</plugin>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>

pom.xml

@@ -17,8 +17,6 @@
 
 	<properties>
 		<maven.compiler.release>21</maven.compiler.release>
-		<maven.compiler.source>21</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -27,18 +25,17 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.12.1</version>
 				<configuration>
-					<fork>true</fork>
 					<enablePreview>true</enablePreview>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.2.2</version>
+				<version>3.3.0</version>
 			</plugin>
 		</plugins>
 	</build>
 
-</project>
+</project>