Develop -> Master -> Main

.drone.yml

@@ -17,7 +17,7 @@ clone:
 
 steps:
   - name: compile
-    image: scireum/sirius-build-jdk23
+    image: scireum/sirius-build-jdk24
     commands:
       - mvn clean compile
     volumes: *scireum_volumes
@@ -28,7 +28,7 @@ steps:
         - push
 
   - name: cron_unit_tests
-    image: scireum/sirius-build-jdk23
+    image: scireum/sirius-build-jdk24
     commands:
       - mvn clean test
     volumes: *scireum_volumes
@@ -48,7 +48,7 @@ steps:
         - cron
 
   - name: test
-    image: scireum/sirius-build-jdk23
+    image: scireum/sirius-build-jdk24
     commands:
       - mvn clean test -Dtest.excluded.groups=nightly
     volumes: *scireum_volumes
@@ -57,7 +57,7 @@ steps:
         - pull_request
 
   - name: deploy
-    image: scireum/sirius-build-jdk23
+    image: scireum/sirius-build-jdk24
     commands:
       - sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml
       - mvn clean deploy -DskipTests
@@ -77,7 +77,7 @@ steps:
         - tag
 
   - name: sonar
-    image: scireum/sirius-build-jdk23
+    image: scireum/sirius-build-jdk24
     commands:
       - sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml
       - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test org.jacoco:jacoco-maven-plugin:report sonar:sonar -Dsonar.projectKey=${DRONE_REPO_NAME}

.github/workflows/nightly-test.yml

@@ -0,0 +1,37 @@
+name: Nightly Tests
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    container:
+      image: scireum/sirius-build-jdk24
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v4
+
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.m2/repository
+            /root/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Test project including nightly tests
+        run: mvn clean test
+
+  notify:
+    if: failure()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Slack notification
+        run: |
+          curl -X POST -H 'Content-type: application/json' --data '{
+            "channel": "scireum-dev",
+            "text": "Nightly Tests failed for **${{ github.event.repository.name }}**: [Details](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})"
+          }' ${{ secrets.MEMOIO_SCIREUM_DEV }}

.github/workflows/pull-request.yml

@@ -0,0 +1,25 @@
+name: Execute Tests on Pull Request
+on:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    container:
+      image: scireum/sirius-build-jdk24
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v4
+
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.m2/repository
+            /root/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Compile and test project without nightly tests
+        run: mvn clean compile test -Dtest.excluded.groups=nightly

.github/workflows/push-master.yml

@@ -0,0 +1,26 @@
+name: Compile on push to master branch
+on:
+  push:
+    branches:
+      - master
+jobs:
+  compile:
+    runs-on: ubuntu-latest
+    container:
+      image: scireum/sirius-build-jdk24
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v4
+
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.m2/repository
+            /root/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Compile project
+        run: mvn clean compile

.github/workflows/release-on-tag.yml

@@ -0,0 +1,20 @@
+name: Automatic Release on dev-Tag
+
+on:
+  push:
+    tags:
+      - "dev-*.*.*"
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Release
+        uses: softprops/action-gh-release@v2.2.2
+        with:
+          prerelease: true
+          generate_release_notes: true

.github/workflows/sonarqube.yml

@@ -0,0 +1,28 @@
+name: SonarQube Analysis
+on:
+  workflow_dispatch:
+
+jobs:
+  sonarqube:
+    runs-on: ubuntu-latest
+    container:
+      image: scireum/sirius-build-jdk24
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v4
+
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.m2/repository
+            /root/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Replace version in pom.xml
+        run: sed -i 's/DEVELOPMENT-SNAPSHOT/sonar-test/g' pom.xml
+
+      - name: Analyze project with SonarQube
+        run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test org.jacoco:jacoco-maven-plugin:report sonar:sonar -Dsonar.projectKey=scireum_sirius-kernel_81e9dc44-1749-4a49-a1f6-686fdb86bad3 -Dsonar.token=${{ secrets.SONAR_TOKEN }} -Dsonar.host.url=${{ secrets.SONAR_HOST_URL }} -Dsonar.organization=scireum

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.scireum</groupId>
         <artifactId>sirius-parent</artifactId>
-        <version>14.0.1</version>
+        <version>14.2.0</version>
     </parent>
     <artifactId>sirius-kernel</artifactId>
     <name>SIRIUS kernel</name>
@@ -26,31 +26,31 @@
         <dependency>
             <groupId>com.typesafe</groupId>
             <artifactId>config</artifactId>
-            <version>1.4.3</version>
+            <version>1.4.5</version>
         </dependency>
 
         <!-- Useful helper classes by Google -->
         <!-- Changelog: https://github.com/google/guava/releases -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.4.0-jre</version>
+            <version>33.5.0-jre</version>
         </dependency>
 
         <!-- JSR305 annotations like @Nonnull etc. -->
         <!-- Changelog: https://github.com/spotbugs/spotbugs/releases -->
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.9.1</version>
+            <version>4.9.7</version>
         </dependency>
 
         <!-- Required logging bridge to make slf4j log to our logging system -->
         <!-- Changelog: https://www.slf4j.org/news.html -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>2.0.16</version>
+            <version>2.0.17</version>
         </dependency>
 
         <!-- Used to auto-start Docker environments. Excluding dependencies not required for docker-compose. -->
@@ -70,14 +70,15 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- Required, as the version provided by docker-compose-rule-core has security issues -->
+
+        <!-- START:
+             Required, as the version provided by docker-compose-rule-core has security issues -->
         <!-- Changelog: https://github.com/apache/commons-io/blob/master/RELEASE-NOTES.txt -->
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.18.0</version>
+            <version>2.20.0</version>
         </dependency>
-        <!-- Required, as the version provided by docker-compose-rule-core has security issues -->
         <!-- Changelog: https://github.com/FasterXML/jackson/wiki/Jackson-Releases -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -87,5 +88,13 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
+        <!-- Changelog: https://commons.apache.org/proper/commons-lang/changes.html -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.19.0</version>
+        </dependency>
+        <!-- Required, as the version provided by docker-compose-rule-core has security issues
+             END: -->
     </dependencies>
 </project>

src/main/java/sirius/kernel/async/ParallelTaskExecutor.java

@@ -14,8 +14,10 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
 
 /**
  * Executes tasks in parallel in the current node using virtual threads with a limit on concurrency.
@@ -34,6 +36,7 @@ public class ParallelTaskExecutor {
     private final Semaphore semaphore;
     private final AtomicInteger taskCount;
     private final CallContext currentContext;
+    private Supplier<Boolean> isActiveSupplier;
 
     /**
      * Creates a new parallel task executor.
@@ -46,9 +49,24 @@ public ParallelTaskExecutor(int maxConcurrentTasks) {
         this.taskQueue = new LinkedBlockingQueue<>();
         this.semaphore = new Semaphore(maxConcurrentTasks);
         this.taskCount = new AtomicInteger(0);
+        this.isActiveSupplier = () -> TaskContext.get().isActive();
         startProcessing();
     }
 
+    /**
+     * Permits to override the active checker which is used to determine when to stop processing tasks.
+     * <p>
+     * By default, the executor checks whether the current {@link TaskContext} is still active which is enough
+     * is most cases, but more complex scenarios might require a custom check.
+     *
+     * @param isActiveSupplier the supplier which determines whether the executor is still active
+     * @return the executor itself for fluent method calls
+     */
+    public ParallelTaskExecutor withIsActiveSupplier(Supplier<Boolean> isActiveSupplier) {
+        this.isActiveSupplier = isActiveSupplier;
+        return this;
+    }
+
     /**
      * Submits a task to be executed in parallel.
      *
@@ -68,31 +86,41 @@ public boolean submitTask(Runnable task) {
         });
     }
 
+    /**
+     * Determines whether the executor is still active.
+     *
+     * @return {@code true} if the executor is still active, {@code false} otherwise
+     */
+    public boolean isActive() {
+        return Boolean.TRUE.equals(isActiveSupplier.get());
+    }
+
     /**
      * Waits for all tasks to complete and shuts down the executor.
      */
     public void shutdownWhenDone() {
-        while (TaskContext.get().isActive()) {
+        while (isActive()) {
             if (taskQueue.isEmpty() && taskCount.get() == 0) {
-                executor.close();
                 break;
             }
             Wait.millis(500);
         }
+        executor.close();
     }
 
     private void startProcessing() {
         Thread.startVirtualThread(() -> {
-            while (TaskContext.get().isActive()) {
+            while (isActive()) {
                 try {
                     Runnable task = taskQueue.take();
                     semaphore.acquire();
                     executor.submit(task);
-                } catch (InterruptedException exception) {
+                } catch (InterruptedException | RejectedExecutionException _) {
                     Thread.currentThread().interrupt();
                     break;
                 }
             }
         });
+        taskQueue.clear();
     }
 }