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/BlockHound
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.10.RELEASE
Choose a base ref
...
head repository: reactor/BlockHound
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: refs/heads/master
Choose a head ref
Loading
2 changes: 2 additions & 0 deletions .github/dco.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
require:
members: false
12 changes: 11 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ updates:
interval: daily
open-pull-requests-limit: 10
assignees:
- simonbasle
- violetagg
labels:
- type/dependency-upgrade
ignore:
@@ -32,3 +32,13 @@ updates:
versions:
- 1.10.20
rebase-strategy: disabled
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
assignees:
- violetagg
labels:
- type/dependency-upgrade
rebase-strategy: disabled
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@ on: pull_request

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
with:
java-version: '13'
distribution: 'adopt'
4 changes: 2 additions & 2 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@ on:

jobs:
update_release_draft:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: release-drafter/release-drafter@v5
- uses: release-drafter/release-drafter@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@ on:

jobs:
publishRelease:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
environment: release
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
with:
java-version: '8'
distribution: 'temurin'
14 changes: 7 additions & 7 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
@@ -7,31 +7,31 @@ on:

jobs:
checkSnapshot:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
with:
java-version: '13' # Modern JVM is needed for Java 10+ specific tests
distribution: 'adopt'
- name: Run tests and javadoc
run: ./gradlew check javadoc
publishSnapshot:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: checkSnapshot
environment: snapshot
env: #change this after a release
BLOCKHOUND_VERSION: 1.0.10.BUILD-SNAPSHOT
BLOCKHOUND_VERSION: 1.0.12.BUILD-SNAPSHOT
steps:
- name: check version
if: ${{ !endsWith(env.BLOCKHOUND_VERSION, '.BUILD-SNAPSHOT') }}
run: |
echo "::error ::$BLOCKHOUND_VERSION is not following the x.y.z.BUILD-SNAPSHOT format"
exit 1
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
with:
java-version: '8'
distribution: 'temurin'
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# BlockHound

[![Travis CI](https://travis-ci.org/reactor/BlockHound.svg?branch=master)](https://travis-ci.org/reactor/BlockHound)
[![](https://img.shields.io/badge/dynamic/xml.svg?label=Release&color=green&query=%2F%2Fmetadata%2Fversioning%2Flatest&url=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Fio%2Fprojectreactor%2Ftools%2Fblockhound%2Fmaven-metadata.xml)](https://repo1.maven.org/maven2/io/projectreactor/tools/blockhound/)
[![](https://img.shields.io/badge/dynamic/xml.svg?label=Milestone&color=blue&query=%2F%2Fmetadata%2Fversioning%2Flatest&url=https%3A%2F%2Frepo.spring.io%2Fmilestone%2Fio%2Fprojectreactor%2Ftools%2Fblockhound%2Fmaven-metadata.xml)](https://repo.spring.io/milestone/io/projectreactor/tools/blockhound/)
[![](https://img.shields.io/badge/dynamic/xml.svg?label=Snapshot&color=orange&query=%2F%2Fmetadata%2Fversioning%2Flatest&url=https%3A%2F%2Frepo.spring.io%2Fsnapshot%2Fio%2Fprojectreactor%2Ftools%2Fblockhound%2Fmaven-metadata.xml)](https://repo.spring.io/snapshot/io/projectreactor/tools/blockhound/)
10 changes: 5 additions & 5 deletions agent/build.gradle
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ plugins {
id "maven-publish"
id "signing"
id "org.unbroken-dome.test-sets" version "4.0.0"
id 'me.champeau.gradle.japicmp' version '0.4.4' apply false
id 'me.champeau.gradle.japicmp' version '0.4.6' apply false
id 'de.undercouch.download' version '5.6.0' apply false
}

@@ -32,7 +32,7 @@ shadowJar {
attributes('Premain-Class': 'reactor.blockhound.BlockHound')
}

exclude 'META-INF/versions/9/module-info.class'
exclude 'META-INF/versions/**'
exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE'
exclude 'META-INF/licenses/'
@@ -62,13 +62,13 @@ dependencies {
compileOnly 'com.google.auto.service:auto-service-annotations:1.1.1'
annotationProcessor 'com.google.auto.service:auto-service:1.1.1'

implementation 'net.bytebuddy:byte-buddy:1.15.4'
implementation 'net.bytebuddy:byte-buddy-agent:1.15.4'
implementation 'net.bytebuddy:byte-buddy:1.17.1'
implementation 'net.bytebuddy:byte-buddy-agent:1.17.1'

compileOnly 'io.projectreactor:reactor-core:3.2.5.RELEASE'
compileOnly 'io.reactivex.rxjava2:rxjava:2.2.18'

jarFileTestImplementation 'org.assertj:assertj-core:3.26.3'
jarFileTestImplementation 'org.assertj:assertj-core:3.27.3'
jarFileTestImplementation 'junit:junit:4.13.2'
}

2 changes: 1 addition & 1 deletion example/build.gradle
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ dependencies {
testImplementation 'io.reactivex.rxjava2:rxjava:2.2.18'

testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.26.3'
testImplementation 'org.assertj:assertj-core:3.27.3'

reactor_3_3_x 'io.projectreactor:reactor-core:3.2.5.RELEASE'
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.gradle.caching=true
compatibleVersion=1.0.9.RELEASE
compatibleVersion=1.0.11.RELEASE
6 changes: 3 additions & 3 deletions junit-platform/build.gradle
Original file line number Diff line number Diff line change
@@ -29,11 +29,11 @@ dependencies {

compileOnly 'org.junit.platform:junit-platform-launcher:1.0.0'

testImplementation 'org.assertj:assertj-core:3.26.3'
testImplementation 'org.assertj:assertj-core:3.27.3'
testImplementation 'io.projectreactor:reactor-core:3.2.5.RELEASE'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.12.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.12.0'


// FIXME remove once https://github.com/gradle/gradle/issues/8806 is fixed