Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range 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-addons
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6de4132302d5ca273386a138d9c20769620df6ce
Choose a base ref
..
head repository: reactor/reactor-addons
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 40376c5d64f5bf5f1c9e93bbcc5747821a333045
Choose a head ref
Showing with 55 additions and 25 deletions.
  1. +5 −1 .github/dependabot.yml
  2. +26 −0 .github/release.yml
  3. +3 −3 .github/workflows/pr-checks.yml
  4. +10 −10 .github/workflows/publish.yml
  5. +11 −11 gradle/libs.versions.toml
6 changes: 5 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -33,6 +33,10 @@ updates:
- dependency-name: "com.jfrog.artifactory"
versions:
- ">= 5.0.a"
# TestNG: 7.6+ doesn't support JDK8 anymore
- dependency-name: "org.testng:testng"
versions:
- ">= 7.6.a"
rebase-strategy: disabled
- package-ecosystem: github-actions
directory: "/"
@@ -41,7 +45,7 @@ updates:
open-pull-requests-limit: 10
assignees:
- violetagg
target-branch: "0.2.x"
target-branch: "3.4.x"
labels:
- type/dependency-upgrade
rebase-strategy: disabled
26 changes: 26 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
changelog:
exclude:
labels:
- ignore-changelog
- type/chore
- type/dependency-upgrade
categories:
- title: ":warning: Update considerations and deprecations"
labels:
- "warn/api-change"
- "warn/behavior-change"
- "warn/blocker"
- "warn/deprecation"
- "warn/regression"
- title: ":sparkles: New features and improvements"
labels:
- "type/enhancement"
- title: ":lady_beetle: Bug fixes"
labels:
- "type/bug"
- title: ":book: Documentation"
labels:
- "type/documentation"
- title: ":question: Other Changes"
labels:
- "*"
6 changes: 3 additions & 3 deletions .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@ jobs:
name: checks
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # renovate: tag=v2
with:
distribution: 'temurin'
java-version: 8
- uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 # renovate: tag=v2
- uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # renovate: tag=v2
name: gradle
with:
arguments: check javadoc
20 changes: 10 additions & 10 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@ jobs:
versionType: ${{ steps.version.outputs.versionType }}
fullVersion: ${{ steps.version.outputs.fullVersion }}
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: setup java
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
with:
distribution: 'temurin'
java-version: 8
@@ -42,8 +42,8 @@ jobs:
if: needs.prepare.outputs.versionType == 'SNAPSHOT'
environment: snapshots
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
with:
distribution: 'temurin'
java-version: 8
@@ -62,8 +62,8 @@ jobs:
if: needs.prepare.outputs.versionType == 'MILESTONE'
environment: releases
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
with:
distribution: 'temurin'
java-version: 8
@@ -84,8 +84,8 @@ jobs:
if: needs.prepare.outputs.versionType == 'RELEASE'
environment: releases
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # tag=v3
with:
distribution: 'temurin'
java-version: 8
@@ -107,7 +107,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: tag
run: |
git config --local user.name 'reactorbot'
@@ -122,7 +122,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: tag
run: |
git config --local user.name 'reactorbot'
22 changes: 11 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -2,33 +2,33 @@
reactorCore = "3.4.29-SNAPSHOT"
# Other shared versions
kotlin = "1.5.32"
reactiveStreams = "1.0.3"
reactiveStreams = "1.0.4"
swt = "4.5.2"

[libraries]
reactorCore = { module = "io.projectreactor:reactor-core", version.ref = "reactorCore" }
reactorTest = { module = "io.projectreactor:reactor-test", version.ref = "reactorCore" }
akkaActor = "com.typesafe.akka:akka-actor_2.11:2.4.10"
assertj = "org.assertj:assertj-core:3.22.0"
hamcrest = "org.hamcrest:hamcrest-library:1.3"
assertj = "org.assertj:assertj-core:3.25.3"
hamcrest = "org.hamcrest:hamcrest-library:2.2"
jsr305 = "com.google.code.findbugs:jsr305:3.0.1"
junit4 = "junit:junit:4.12"
junit4 = "junit:junit:4.13.2"
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
logback = "ch.qos.logback:logback-classic:1.2.10"
mockito = "org.mockito:mockito-core:4.3.1"
logback = "ch.qos.logback:logback-classic:1.2.13"
mockito = "org.mockito:mockito-core:4.11.0"
quickTheories = "org.quicktheories:quicktheories:0.26"
reactiveStreams-tck = { module = "org.reactivestreams:reactive-streams-tck", version.ref = "reactiveStreams" }
rxJava2 = "io.reactivex.rxjava2:rxjava:2.2.8"
rxJava3 = "io.reactivex.rxjava3:rxjava:3.1.5"
rxJava2 = "io.reactivex.rxjava2:rxjava:2.2.21"
rxJava3 = "io.reactivex.rxjava3:rxjava:3.1.8"
slf4j = "org.slf4j:slf4j-api:1.7.36"
swt-windows = { module = "org.eclipse.swt:org.eclipse.swt.win32.win32.x86", version.ref = "swt" }
swt-windows64 = { module = "org.eclipse.swt:org.eclipse.swt.win32.win32.x86_64", version.ref = "swt" }
swt-linux = { module = "org.eclipse.swt:org.eclipse.swt.gtk.linux.x86", version.ref = "swt" }
swt-linux64 = { module = "org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64", version.ref = "swt" }
swt-mac = { module = "org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64", version.ref = "swt" }
testNg = "org.testng:testng:7.5"
testNg = "org.testng:testng:7.5.1"

[plugins]
artifactory = { id = "com.jfrog.artifactory", version = "4.27.1" }
bnd = { id = "biz.aQute.bnd.builder", version = "6.1.0" }
artifactory = { id = "com.jfrog.artifactory", version = "4.31.0" }
bnd = { id = "biz.aQute.bnd.builder", version = "6.4.0" }
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }