Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: reactor/reactor-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.6.5
Choose a base ref
...
head repository: reactor/reactor-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.6.6
Choose a head ref

Commits on Apr 9, 2024

  1. Copy the full SHA
    8b30803 View commit details

Commits on Apr 11, 2024

  1. Fix pendingTasks accounting if TimedRunnable disposed before scheduli…

    …ng (#3780)
    
    Cancelled or rejected tasks properly decrement the pendingTasks metric.
    
    The chosen approach splits existing TimedRunnable into two
    implementations and moves code from the TimedScheduler into the
    TimedRunnable to reduce duplication.
    
    Two implementations:
    
    * WorkerBackedTimedRunnable
    * SchedulerBackedTimedRunnable
    
    are present to differentiate between Scheduler or a Worker that
    schedules a task (since there is no shared interface between those). In
    contrast to the initial proposal from #3697 by @nathankooij there are no
    extra objects being created and the scheduling is delegated to
    TimedRunnable.
    
    Fixes #3697
    
    ---------
    
    Co-authored-by: Konstantin Kondratov <>
    kkondratov authored Apr 11, 2024
    Copy the full SHA
    43bf82d View commit details
  2. Merge #3780 into 3.6.6

    chemicL committed Apr 11, 2024
    Copy the full SHA
    fa244f3 View commit details
  3. Remove Flux#thenMany optimization breaking concat (#3783)

    The optimization incorrectly ignored only the last Publisher instead of
    all currently concatenated Publishers causing undesired values to be
    emitted.
    
    Fixes #3777
    chemicL authored Apr 11, 2024
    Copy the full SHA
    2a664dd View commit details
  4. Copy the full SHA
    d11ea71 View commit details
  5. Merge #3780 follow-up into 3.6.6

    chemicL committed Apr 11, 2024
    Copy the full SHA
    81e398c View commit details
  6. Merge #3783 into 3.5.17

    chemicL committed Apr 11, 2024
    Copy the full SHA
    99b4a52 View commit details
  7. Merge #3783 into 3.6.6

    chemicL committed Apr 11, 2024
    Copy the full SHA
    ea74987 View commit details
  8. Fix BoundedElasticThreadPerTaskSchedulerTest flakiness (#3779)

    BoundedElasticThreadPerTaskSchedulerTest test cases could randomly fail
    due to asynchronous nature of disposing a task wrapper and not
    coordinating that with assertions. Using
    Awaitility.await().untilAsserted to wrap the assertions resolves the
    issue.
    
    Fixes #3772
    chickenchickenlove authored Apr 11, 2024
    Copy the full SHA
    c9fdc64 View commit details
  9. Bump org.awaitility:awaitility from 4.2.0 to 4.2.1 (#3760)

    Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.2.1.
    - [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
    - [Commits](awaitility/awaitility@awaitility-4.2.0...awaitility-4.2.1)
    
    ---
    updated-dependencies:
    - dependency-name: org.awaitility:awaitility
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Apr 11, 2024
    Copy the full SHA
    cb09f46 View commit details
  10. Merge #3760 into 3.5.17

    chemicL committed Apr 11, 2024
    Copy the full SHA
    29d3a7e View commit details
  11. Merge #3760 into 3.6.6

    chemicL committed Apr 11, 2024
    Copy the full SHA
    51e7bcb View commit details
  12. Bump gradle/actions from 3.1.0 to 3.2.0 in /.github/workflows (#3781)

    Bumps [gradle/actions](https://github.com/gradle/actions) from 3.1.0 to 3.2.0.
    - [Release notes](https://github.com/gradle/actions/releases)
    - [Commits](gradle/actions@417ae3c...e24011a)
    
    ---
    updated-dependencies:
    - dependency-name: gradle/actions
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Apr 11, 2024
    Copy the full SHA
    d90e7f2 View commit details
  13. Merge #3781 into 3.5.17

    chemicL committed Apr 11, 2024
    Copy the full SHA
    94b53e3 View commit details
  14. Merge #3781 into 3.6.6

    chemicL committed Apr 11, 2024
    Copy the full SHA
    d16e68a View commit details
  15. Bump gradle/wrapper-validation-action from 2.1.1 to 2.1.2 in /.github…

    …/workflows (#3776)
    
    Bump gradle/wrapper-validation-action in /.github/workflows
    
    Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2.1.1 to 2.1.2.
    - [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
    - [Commits](gradle/wrapper-validation-action@699bb18...b231772)
    
    ---
    updated-dependencies:
    - dependency-name: gradle/wrapper-validation-action
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Apr 11, 2024
    Copy the full SHA
    873bc9a View commit details
  16. Merge #3776 into 3.5.17

    chemicL committed Apr 11, 2024
    Copy the full SHA
    da9e7b5 View commit details
  17. Merge #3776 into 3.6.6

    chemicL committed Apr 11, 2024
    Copy the full SHA
    03071db View commit details
  18. Bump byteBuddyVersion from 1.14.12 to 1.14.13 (#3778)

    Bumps `byteBuddyVersion` from 1.14.12 to 1.14.13.
    
    Updates `net.bytebuddy:byte-buddy` from 1.14.12 to 1.14.13
    - [Release notes](https://github.com/raphw/byte-buddy/releases)
    - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
    - [Commits](raphw/byte-buddy@byte-buddy-1.14.12...byte-buddy-1.14.13)
    
    Updates `net.bytebuddy:byte-buddy-agent` from 1.14.12 to 1.14.13
    - [Release notes](https://github.com/raphw/byte-buddy/releases)
    - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
    - [Commits](raphw/byte-buddy@byte-buddy-1.14.12...byte-buddy-1.14.13)
    
    ---
    updated-dependencies:
    - dependency-name: net.bytebuddy:byte-buddy
      dependency-type: direct:production
      update-type: version-update:semver-patch
    - dependency-name: net.bytebuddy:byte-buddy-agent
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Apr 11, 2024
    Copy the full SHA
    33eaffa View commit details
  19. Merge #3778 into 3.5.17

    chemicL committed Apr 11, 2024
    Copy the full SHA
    5d2432c View commit details
  20. Merge #3778 into 3.6.6

    chemicL committed Apr 11, 2024
    Copy the full SHA
    055c0e8 View commit details

Commits on May 6, 2024

  1. Improve auto context propagation in lifting and ConnectableFlux inter…

    …section (#3787)
    
    Combining ConnectableFlux or Fuseable operators and wrapping via Hooks could lead to ClassCastException or lack of ThreadLocal restoration. ConnectableFlux and Fuseable handling has been improved. Also, lifting now avoids unnecessary multiple-wrapping.
    
    Fixes #3762
    chemicL authored May 6, 2024
    Copy the full SHA
    c760a0a View commit details
  2. Bump io.projectreactor.tools:blockhound from 1.0.8.RELEASE to 1.0.9.R…

    …ELEASE (#3788)
    
    Bump io.projectreactor.tools:blockhound
    
    Bumps [io.projectreactor.tools:blockhound](https://github.com/reactor/BlockHound) from 1.0.8.RELEASE to 1.0.9.RELEASE.
    - [Release notes](https://github.com/reactor/BlockHound/releases)
    - [Commits](reactor/BlockHound@1.0.8.RELEASE...1.0.9.RELEASE)
    
    ---
    updated-dependencies:
    - dependency-name: io.projectreactor.tools:blockhound
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored May 6, 2024
    Copy the full SHA
    76a9517 View commit details
  3. Merge #3788 into 3.5.17

    chemicL committed May 6, 2024
    Copy the full SHA
    a6d9126 View commit details
  4. Merge #3788 into 3.6.6

    chemicL committed May 6, 2024
    Copy the full SHA
    bbda617 View commit details
  5. Bump byteBuddyVersion from 1.14.13 to 1.14.14 (#3795)

    Bumps `byteBuddyVersion` from 1.14.13 to 1.14.14.
    
    Updates `net.bytebuddy:byte-buddy` from 1.14.13 to 1.14.14
    - [Release notes](https://github.com/raphw/byte-buddy/releases)
    - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
    - [Commits](raphw/byte-buddy@byte-buddy-1.14.13...byte-buddy-1.14.14)
    
    Updates `net.bytebuddy:byte-buddy-agent` from 1.14.13 to 1.14.14
    - [Release notes](https://github.com/raphw/byte-buddy/releases)
    - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
    - [Commits](raphw/byte-buddy@byte-buddy-1.14.13...byte-buddy-1.14.14)
    
    ---
    updated-dependencies:
    - dependency-name: net.bytebuddy:byte-buddy
      dependency-type: direct:production
      update-type: version-update:semver-patch
    - dependency-name: net.bytebuddy:byte-buddy-agent
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored May 6, 2024
    Copy the full SHA
    70ad40b View commit details
  6. Merge #3795 into 3.5.17

    chemicL committed May 6, 2024
    Copy the full SHA
    681a5a0 View commit details
  7. Merge #3795 into 3.6.6

    chemicL committed May 6, 2024
    Copy the full SHA
    17edeb2 View commit details

Commits on May 7, 2024

  1. Bump actions/checkout from 4.1.1 to 4.1.4 in /.github/workflows (#3801)

    Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.4.
    - [Release notes](https://github.com/actions/checkout/releases)
    - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
    - [Commits](actions/checkout@b4ffde6...0ad4b8f)
    
    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored May 7, 2024
    Copy the full SHA
    a4c6e40 View commit details
  2. Merge #3801 into 3.5.17

    chemicL committed May 7, 2024
    Copy the full SHA
    5bd2a08 View commit details
  3. Merge #3801 into 3.6.6

    chemicL committed May 7, 2024
    Copy the full SHA
    fc47335 View commit details
  4. Bump gradle/actions from 3.2.0 to 3.3.2 in /.github/workflows (#3800)

    Bumps [gradle/actions](https://github.com/gradle/actions) from 3.2.0 to 3.3.2.
    - [Release notes](https://github.com/gradle/actions/releases)
    - [Commits](gradle/actions@e24011a...db19848)
    
    ---
    updated-dependencies:
    - dependency-name: gradle/actions
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored May 7, 2024
    Copy the full SHA
    2d720bf View commit details
  5. Merge #3800 into 3.5.17

    chemicL committed May 7, 2024
    Copy the full SHA
    88c26b0 View commit details
  6. Merge #3800 into 3.6.6

    chemicL committed May 7, 2024
    Copy the full SHA
    6832bad View commit details
  7. Migrate gradle/wrapper-validation-action 2.1.2 to gradle/actions/wrap…

    …per-validation 3.3.2
    
    Supersedes #3799
    chemicL committed May 7, 2024
    Copy the full SHA
    47436c0 View commit details
  8. Merge 47436c0 into 3.5.17

    chemicL committed May 7, 2024
    Copy the full SHA
    3435586 View commit details
  9. Merge 47436c0 into 3.6.6

    chemicL committed May 7, 2024
    Copy the full SHA
    bf22c93 View commit details

Commits on May 14, 2024

  1. Copy the full SHA
    734e779 View commit details
  2. Copy the full SHA
    ac572b7 View commit details
  3. Copy the full SHA
    8ab9a81 View commit details
  4. Copy the full SHA
    3bd2d1c View commit details
  5. Copy the full SHA
    69871e9 View commit details
Showing with 866 additions and 233 deletions.
  1. +5 −5 .github/workflows/ci.yml
  2. +2 −2 .github/workflows/full.yml
  3. +2 −2 .github/workflows/gradle-wrapper-validation.yml
  4. +7 −7 .github/workflows/publish.yml
  5. +2 −2 .github/workflows/snapshots.yml
  6. +5 −5 README.md
  7. +3 −3 gradle.properties
  8. +3 −3 gradle/dependencies.gradle
  9. +4 −4 gradle/libs.versions.toml
  10. +133 −45 reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/TimedScheduler.java
  11. +154 −0 reactor-core-micrometer/src/test/java/reactor/core/observability/micrometer/TimedSchedulerTest.java
  12. +8 −1 reactor-core/src/main/java/reactor/core/publisher/ConnectableFlux.java
  13. +42 −0 reactor-core/src/main/java/reactor/core/publisher/ConnectableFluxRestoringThreadLocals.java
  14. +3 −3 reactor-core/src/main/java/reactor/core/publisher/ConnectableLift.java
  15. +3 −3 reactor-core/src/main/java/reactor/core/publisher/ConnectableLiftFuseable.java
  16. +6 −3 reactor-core/src/main/java/reactor/core/publisher/ContextPropagation.java
  17. +6 −9 reactor-core/src/main/java/reactor/core/publisher/Flux.java
  18. +3 −2 reactor-core/src/main/java/reactor/core/publisher/FluxAutoConnect.java
  19. +3 −2 reactor-core/src/main/java/reactor/core/publisher/FluxAutoConnectFuseable.java
  20. +1 −23 reactor-core/src/main/java/reactor/core/publisher/FluxConcatArray.java
  21. +1 −43 reactor-core/src/main/java/reactor/core/publisher/FluxContextWriteRestoringThreadLocals.java
  22. +202 −0 reactor-core/src/main/java/reactor/core/publisher/FluxContextWriteRestoringThreadLocalsFuseable.java
  23. +3 −3 reactor-core/src/main/java/reactor/core/publisher/FluxLift.java
  24. +4 −4 reactor-core/src/main/java/reactor/core/publisher/FluxLiftFuseable.java
  25. +2 −2 reactor-core/src/main/java/reactor/core/publisher/FluxPublish.java
  26. +6 −2 reactor-core/src/main/java/reactor/core/publisher/FluxRefCount.java
  27. +4 −2 reactor-core/src/main/java/reactor/core/publisher/FluxRefCountGrace.java
  28. +2 −2 reactor-core/src/main/java/reactor/core/publisher/FluxReplay.java
  29. +3 −3 reactor-core/src/main/java/reactor/core/publisher/GroupedLift.java
  30. +3 −3 reactor-core/src/main/java/reactor/core/publisher/GroupedLiftFuseable.java
  31. +4 −2 reactor-core/src/main/java/reactor/core/publisher/InternalConnectableFluxOperator.java
  32. +3 −3 reactor-core/src/main/java/reactor/core/publisher/MonoLift.java
  33. +3 −2 reactor-core/src/main/java/reactor/core/publisher/MonoLiftFuseable.java
  34. +26 −4 reactor-core/src/main/java/reactor/core/publisher/Operators.java
  35. +3 −3 reactor-core/src/main/java/reactor/core/publisher/ParallelLift.java
  36. +3 −3 reactor-core/src/main/java/reactor/core/publisher/ParallelLiftFuseable.java
  37. +13 −3 reactor-core/src/test/java/reactor/core/publisher/FluxThenManyTest.java
  38. +4 −3 reactor-core/src/test/java/reactor/core/publisher/MonoThenManyTest.java
  39. +7 −7 reactor-core/src/test/java21/reactor/core/scheduler/BoundedElasticThreadPerTaskSchedulerTest.java
  40. +95 −13 reactor-core/src/withMicrometerTest/java/reactor/core/publisher/AutomaticContextPropagationTest.java
  41. +78 −0 reactor-core/src/withMicrometerTest/java/reactor/core/publisher/ThreadSwitchingConnectableFlux.java
  42. +2 −2 settings.gradle
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ jobs:
name: preliminary sanity checks
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4
with:
fetch-depth: 0 #needed by spotless
- name: Download JDK 9
@@ -32,12 +32,12 @@ jobs:
with:
distribution: 'temurin'
java-version: 8
- uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # tag=v3
- uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # tag=v3
name: spotless (license header)
if: always()
with:
arguments: spotlessCheck -PspotlessFrom=origin/${{ github.base_ref }}
- uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # tag=v3
- uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # tag=v3
name: api compatibility
if: always()
with:
@@ -74,7 +74,7 @@ jobs:
name: ${{ matrix.test-type.type }} tests
needs: preliminary
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4
- name: Download Java 9
if: contains('main 3.6.x', github.base_ref)
run: ${GITHUB_WORKSPACE}/.github/setup.sh
@@ -97,7 +97,7 @@ jobs:
with:
distribution: 'temurin'
java-version: 8
- uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # tag=v3
- uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # tag=v3
name: Run Gradle Tests
with:
arguments: ${{ matrix.test-type.arguments }}
4 changes: 2 additions & 2 deletions .github/workflows/full.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ jobs:
name: Test on ${{ matrix.branch }} - ${{ matrix.test-type.type }} tests
steps:
- name: Checkout Repository
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # tag=v4
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4
with:
ref: ${{ matrix.branch }}
- name: Download Java 9
@@ -48,6 +48,6 @@ jobs:
distribution: 'temurin'
java-version: 8
- name: Run Gradle Tests
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # tag=v3
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # tag=v3
with:
arguments: ${{ matrix.test-type.arguments }}
4 changes: 2 additions & 2 deletions .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
@@ -6,5 +6,5 @@ jobs:
name: "validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
- uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # tag=v1
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4
- uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # tag=v3
14 changes: 7 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ jobs:
versionType: ${{ steps.version.outputs.versionType }}
fullVersion: ${{ steps.version.outputs.fullVersion }}
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4
- name: Download JDK 9
if: contains('main 3.6.x', github.base_ref)
run: ${GITHUB_WORKSPACE}/.github/setup.sh
@@ -60,7 +60,7 @@ jobs:
run: ./gradlew qualifyVersionGha
- name: run checks
id: checks
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # tag=v3
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # tag=v3
with:
arguments: ${{ matrix.test-type.arguments }}
#deploy the snapshot artifacts to Artifactory
@@ -71,7 +71,7 @@ jobs:
if: needs.prepare.outputs.versionType == 'SNAPSHOT'
environment: snapshots
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4
- name: Download JDK 9
if: contains('main 3.6.x', github.base_ref)
run: ${GITHUB_WORKSPACE}/.github/setup.sh
@@ -109,7 +109,7 @@ jobs:
if: needs.prepare.outputs.versionType == 'MILESTONE'
environment: releases
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4
- name: Download JDK 9
if: contains('main 3.6.x', github.base_ref)
run: ${GITHUB_WORKSPACE}/.github/setup.sh
@@ -149,7 +149,7 @@ jobs:
if: needs.prepare.outputs.versionType == 'RELEASE'
environment: releases
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4
- name: Download JDK 9
if: contains('main 3.6.x', github.base_ref)
run: ${GITHUB_WORKSPACE}/.github/setup.sh
@@ -190,7 +190,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4
- name: tag
run: |
git config --local user.name 'reactorbot'
@@ -205,7 +205,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4
- name: tag
run: |
git config --local user.name 'reactorbot'
4 changes: 2 additions & 2 deletions .github/workflows/snapshots.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
name: Test on ${{ matrix.branch }} - ${{ matrix.test-type.type }} tests
steps:
- name: Checkout Repository
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # tag=v4
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4
with:
ref: ${{ matrix.branch }}
- name: Download Java 9
@@ -46,6 +46,6 @@ jobs:
distribution: 'temurin'
java-version: 8
- name: Run Gradle Tests
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # tag=v3
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # tag=v3
with:
arguments: ${{ matrix.test-type.arguments }}
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -31,15 +31,15 @@ repositories {
}
dependencies {
compile "io.projectreactor:reactor-core:3.6.5"
testCompile "io.projectreactor:reactor-test:3.6.5"
compile "io.projectreactor:reactor-core:3.6.6"
testCompile "io.projectreactor:reactor-test:3.6.6"
// Alternatively, use the following for latest snapshot artifacts in this line
// compile "io.projectreactor:reactor-core:3.6.6-SNAPSHOT"
// testCompile "io.projectreactor:reactor-test:3.6.6-SNAPSHOT"
// compile "io.projectreactor:reactor-core:3.6.7-SNAPSHOT"
// testCompile "io.projectreactor:reactor-test:3.6.7-SNAPSHOT"
// Optionally, use `reactor-tools` to help debugging reactor code
// implementation "io.projectreactor:reactor-tools:3.6.5"
// implementation "io.projectreactor:reactor-tools:3.6.6"
}
```

6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version=3.6.5
bomVersion=2023.0.5
metricsMicrometerVersion=1.1.5
version=3.6.6
bomVersion=2023.0.6
metricsMicrometerVersion=1.1.6

org.gradle.parallel=true
6 changes: 3 additions & 3 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@ ext {
// See also gradle/libs.versions.toml for manually maintained dependencies and Gradle plugins
archUnitVersion = "0.23.1"
assertjVersion = "3.25.3"
awaitilityVersion = "4.2.0"
blockhoundVersion = "1.0.8.RELEASE"
byteBuddyVersion = "1.14.12"
awaitilityVersion = "4.2.1"
blockhoundVersion = "1.0.9.RELEASE"
byteBuddyVersion = "1.14.14"
cglibVersion = "3.3.0"
javaObjectLayoutVersion = "0.17"
jmhVersion = "1.37"
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -7,16 +7,16 @@

[versions]
# Baselines, should be updated on every release
baseline-core-api = "3.6.4"
baselinePerfCore = "3.6.4"
baseline-core-api = "3.6.5"
baselinePerfCore = "3.6.5"
baselinePerfExtra = "3.5.1"

# Other shared versions
asciidoctor = "4.0.2"
#note that some micrometer artifacts like context-propagation has a different version directly set in libraries below
micrometer = "1.12.5"
micrometer = "1.12.6"
micrometerDocsGenerator = "1.0.2"
micrometerTracingTest="1.2.5"
micrometerTracingTest="1.2.6"
contextPropagation="1.1.1"
kotlin = "1.8.22"
reactiveStreams = "1.0.4"
Loading