reactor · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,41 +1,27 @@
 version: 2
 updates:
-  - package-ecosystem: "gradle"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    labels:
-      "type/enhancement"
-    reviewers:
-      - "reactor/core-team"
-    target-branch: "3.4.x"
-    allow:
-      - dependency-name: "org.reactivestreams:*"
-      - dependency-name: "net.bytebuddy:*"
   - package-ecosystem: "gradle"
     directory: "/"
     schedule:
       interval: "daily"
     labels:
       - "type/dependency-upgrade"
+      - "status/need-triage"
     reviewers:
       - "reactor/core-team"
-    # updates in oldest maintenance branch, we'll forward-merge up to main
+    # updates in the oldest maintenance branch, we'll forward-merge up to main
     target-branch: "3.4.x"
     ignore:
-      # Updated by the enhancement type grouping
-      - dependency-name: "org.reactivestreams:*"
-      - dependency-name: "net.bytebuddy:*"
       # JSR166 backport is fixed
       - dependency-name: "io.projectreactor:jsr166"
       # JSR305 backport is fixed to last version with annotations (3.0.1)
       - dependency-name: "com.google.code.findbugs:jsr305"
-      # don't update Micrometer
+      # Micrometer is updated manually
       - dependency-name: "io.micrometer:*"
-      # Kotlin: stay on 1.5
+      # Kotlin: stay on 1.8 to allow support for 1.3 target
       - dependency-name: "org.jetbrains.kotlin*"
         versions:
-        - ">= 1.6.a"
+        - ">= 1.9.a"
       # SLF4J: don't upgrade to v2
       - dependency-name: "org.slf4j:slf4j-api"
         versions:
@@ -60,6 +46,10 @@ updates:
       - dependency-name: "biz.aQute.bnd.builder:biz.aQute.bnd.builder.gradle.plugin"
         versions:
           - ">= 7.0.a"
+      # artifactory: don't upgrade to v5 (collides with Kotlin plugin) - Remove once 3.4 is out of support
+      - dependency-name: "com.jfrog.artifactory:com.jfrog.artifactory.gradle.plugin"
+        versions:
+          - ">= 5.0.a"
   - package-ecosystem: "github-actions"
     directory: ".github/workflows"
     schedule:

diff --git a/.github/release.yml b/.github/release.yml
@@ -3,6 +3,7 @@ changelog:
     labels:
       - ignore-changelog
       - type/test
+      - type/test/flaky
       - type/chores
       - type/dependency-upgrade
   categories:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,33 +11,33 @@ jobs:
         with:
           fetch-depth: 0 #needed by spotless
       - name: Download JDK 9
-        if: ${{ github.base_ref == 'main' }}
+        if: contains('main 3.6.x', github.base_ref)
         run: ${GITHUB_WORKSPACE}/.github/setup.sh
         shell: bash
       - name: Setup JDK 9
-        if: ${{ github.base_ref == 'main' }}
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
+        if: contains('main 3.6.x', github.base_ref)
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
         with:
           distribution: 'jdkfile'
           java-version: 9.0.4
           jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
       - name: Setup JDK 21
-        if: ${{ github.base_ref == 'main' }}
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
+        if: contains('main 3.6.x', github.base_ref)
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
         with:
           distribution: 'temurin'
           java-version: 21
       - name: Setup JDK 8
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
         with:
           distribution: 'temurin'
           java-version: 8
-      - uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # tag=v2
+      - uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # tag=v3
         name: spotless (license header)
         if: always()
         with:
           arguments: spotlessCheck -PspotlessFrom=origin/${{ github.base_ref }}
-      - uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # tag=v2
+      - uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # tag=v3
         name: api compatibility
         if: always()
         with:
@@ -57,132 +57,47 @@ jobs:
           echo -e "   \033[38;5;0;48;5;255m ./gradlew japicmp \033[0m"
           echo ""
           exit -1
-  core-fast:
-    name: core fast tests
+  run-tests:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        test-type:
+          - type: core
+            arguments: ":reactor-core:test --no-daemon"
+          - type: core-java21
+            arguments: ":reactor-core:java21Test --no-daemon"
+          - type: core-java9
+            arguments: ":reactor-core:java9Test --no-daemon"
+          - type: other
+            arguments: "check -x :reactor-core:test -x :reactor-core:java21Test -x :reactor-core:java9Test -x spotlessCheck -Pjcstress.mode=sanity --no-daemon"
+    name: ${{ matrix.test-type.type }} tests
     needs: preliminary
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
-    - name: Download JDK 9
-      if: ${{ github.base_ref == 'main' }}
+    - name: Download Java 9
+      if: contains('main 3.6.x', github.base_ref)
       run: ${GITHUB_WORKSPACE}/.github/setup.sh
       shell: bash
-    - name: Setup JDK 9
-      if: ${{ github.base_ref == 'main' }}
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
+    - name: Setup Java 9
+      if: contains('main 3.6.x', github.base_ref)
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
       with:
         distribution: 'jdkfile'
         java-version: 9.0.4
         jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
-    - name: Setup JDK 21
-      if: ${{ github.base_ref == 'main' }}
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
+    - name: Setup Java 21
+      if: contains('main 3.6.x', github.base_ref)
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
       with:
         distribution: 'temurin'
         java-version: 21
-    - name: Setup JDK 8
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
+    - name: Setup Java 8
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
       with:
         distribution: 'temurin'
         java-version: 8
-    - uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # tag=v2
-      name: gradle
+    - uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # tag=v3
+      name: Run Gradle Tests
       with:
-        arguments: :reactor-core:test --no-daemon -Pjunit-tags=!slow
-  java-21-core-fast:
-    if: ${{ github.base_ref == 'main' }}
-    name: Java 21 core fast tests
-    runs-on: ubuntu-latest
-    needs: preliminary
-    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
-      - name: Download JDK 9
-        if: ${{ github.base_ref == 'main' }}
-        run: ${GITHUB_WORKSPACE}/.github/setup.sh
-        shell: bash
-      - name: Setup JDK 9
-        if: ${{ github.base_ref == 'main' }}
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
-        with:
-          distribution: 'jdkfile'
-          java-version: 9.0.4
-          jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
-      - name: Setup JDK 21
-        if: ${{ github.base_ref == 'main' }}
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
-        with:
-          distribution: 'temurin'
-          java-version: 21
-      - name: Setup JDK 8
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
-        with:
-          distribution: 'temurin'
-          java-version: 8
-      - uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # tag=v2
-        name: gradle
-        with:
-          arguments: :reactor-core:java21Test --no-daemon -Pjunit-tags=!slow
-  core-slow:
-    name: core slower tests
-    runs-on: ubuntu-latest
-    needs: preliminary
-    steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
-    - name: Download JDK 9
-      if: ${{ github.base_ref == 'main' }}
-      run: ${GITHUB_WORKSPACE}/.github/setup.sh
-      shell: bash
-    - name: Setup JDK 9
-      if: ${{ github.base_ref == 'main' }}
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
-      with:
-        distribution: 'jdkfile'
-        java-version: 9.0.4
-        jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
-    - name: Setup JDK 21
-      if: ${{ github.base_ref == 'main' }}
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
-      with:
-        distribution: 'temurin'
-        java-version: 21
-    - name: Setup JDK 8
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
-      with:
-        distribution: 'temurin'
-        java-version: 8
-    - uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # tag=v2
-      name: gradle
-      with:
-        arguments: :reactor-core:test --no-daemon -Pjunit-tags=slow
-  other:
-    name: other tests
-    runs-on: ubuntu-latest
-    needs: preliminary
-    steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
-    - name: Download JDK 9
-      if: ${{ github.base_ref == 'main' }}
-      run: ${GITHUB_WORKSPACE}/.github/setup.sh
-      shell: bash
-    - name: Setup JDK 9
-      if: ${{ github.base_ref == 'main' }}
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
-      with:
-        distribution: 'jdkfile'
-        java-version: 9.0.4
-        jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
-    - name: Setup JDK 21
-      if: ${{ github.base_ref == 'main' }}
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
-      with:
-        distribution: 'temurin'
-        java-version: 21
-    - name: Setup JDK 8
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # tag=v3
-      with:
-        distribution: 'temurin'
-        java-version: 8
-    - uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # tag=v2
-      name: other tests
-      with:
-        arguments: check -x :reactor-core:test -x :reactor-core:java9Test -x :reactor-core:java21Test -x spotlessCheck --no-daemon -Pjcstress.mode=sanity
+        arguments: ${{ matrix.test-type.arguments }}
diff --git a/.github/workflows/full.yml b/.github/workflows/full.yml
@@ -0,0 +1,53 @@
+name: Full Check
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 14 * * 0"
+permissions: read-all
+jobs:
+  run-tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: [ 3.5.x, 3.6.x, main ]
+        test-type:
+          - type: core
+            arguments: ":reactor-core:test --no-daemon"
+          - type: other # includes java21Test and java9Test for 3.6+
+            arguments: "check -x :reactor-core:test -x spotlessCheck -x :reactor-core:jcstress --no-daemon"
+          - type: jcstress
+            arguments: ":reactor-core:jcstress -Pjcstress.mode=quick --no-daemon"
+    name: Test on ${{ matrix.branch }} - ${{ matrix.test-type.type }} tests
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # tag=v4
+        with:
+          ref: ${{ matrix.branch }}
+      - name: Download Java 9
+        if: contains('main 3.6.x', matrix.branch)
+        run: ${GITHUB_WORKSPACE}/.github/setup.sh
+        shell: bash
+      - name: Setup Java 9
+        if: contains('main 3.6.x', matrix.branch)
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
+        with:
+          distribution: 'jdkfile'
+          java-version: 9.0.4
+          jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
+      - name: Setup Java 21
+        if: contains('main 3.6.x', matrix.branch)
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
+        with:
+          distribution: 'temurin'
+          java-version: 21
+      - name: Setup Java 8
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Run Gradle Tests
+        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # tag=v3
+        with:
+          arguments: ${{ matrix.test-type.arguments }}