diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..66634a4cd --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,51 @@ +version: 2 +updates: +- package-ecosystem: gradle + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 + assignees: + - violetagg + target-branch: "3.4.x" + labels: + - type/dependency-upgrade + ignore: + # Don't update Reactor projects + - dependency-name: io.projectreactor:* + # JSR305 backport is fixed to last version with annotations (3.0.1) + - dependency-name: "com.google.code.findbugs:jsr305" + # Versions > 4 require JDK11+ + - dependency-name: org.mockito:mockito-core + versions: + - "[5.a, 6]" + # Versions > 6 require JDK17+ + - dependency-name: biz.aQute.bnd.builder + versions: + - "[7.a, 8]" + - dependency-name: org.slf4j:* + versions: + - "[2.a, 3]" + - dependency-name: ch.qos.logback:logback-classic + versions: + - "[1.3.a, 1.6]" + # artifactory: don't upgrade to v5 + - 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: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 + assignees: + - violetagg + target-branch: "3.4.x" + labels: + - type/dependency-upgrade + rebase-strategy: disabled diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 000000000..aae767408 --- /dev/null +++ b/.github/release.yml @@ -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: + - "*" diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 547bc227a..45491790e 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -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@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 with: distribution: 'temurin' java-version: 8 - - uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 # renovate: tag=v2 - name: gradle - with: - arguments: check javadoc \ No newline at end of file + - name: Setup Gradle + uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 + - name: gradle + run: ./gradlew check javadoc diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ff5eec0bb..05db24a10 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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@692973e3d937129bcbf40652eb9f2f61becf3332 - name: setup java - uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # 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@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # 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@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # 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@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # 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@692973e3d937129bcbf40652eb9f2f61becf3332 - 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@692973e3d937129bcbf40652eb9f2f61becf3332 - name: tag run: | git config --local user.name 'reactorbot' diff --git a/README.md b/README.md index 1446bdca2..85ede563c 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Snapshot and pre-release Maven artifacts are provided in the SpringSource snapsh To add this repo to your Gradle build, specify the URL like the following: ext { - reactorAddonsVersion = '3.4.10' + reactorAddonsVersion = '3.4.11' } repositories { diff --git a/gradle.properties b/gradle.properties index 4e239767c..17d810d49 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=3.4.10 \ No newline at end of file +version=3.4.12-SNAPSHOT \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bad609c01..9a45aab01 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,34 +1,34 @@ [versions] -reactorCore = "3.4.28" +reactorCore = "3.4.42-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.26.3" +hamcrest = "org.hamcrest:hamcrest-library:3.0" 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.25" 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" } \ No newline at end of file