Skip to content

Commit

Permalink
merged PR reactor#2257 from 1.0.x branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
pderop committed Jun 8, 2022
2 parents 55d7e64 + 6530f76 commit 3be34aa
Show file tree
Hide file tree
Showing 44 changed files with 2,159 additions and 483 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,14 @@ updates:
versions:
- ">= 10.0.a"
rebase-strategy: disabled
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
assignees:
- violetagg
target-branch: "1.0.x"
labels:
- type/dependency-upgrade
rebase-strategy: disabled
6 changes: 3 additions & 3 deletions .github/workflows/check_netty_snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
transport: native

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up JDK 1.8
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '8'
- name: Build with Gradle
run: ./gradlew clean check --no-daemon -PforceTransport=${{ matrix.transport }} -PforceNettyVersion='4.1.77.Final-SNAPSHOT'
run: ./gradlew clean check --no-daemon -PforceTransport=${{ matrix.transport }} -PforceNettyVersion='4.1.78.Final-SNAPSHOT'
8 changes: 4 additions & 4 deletions .github/workflows/check_transport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
name: preliminary sanity checks
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0 #needed by spotless
- uses: actions/setup-java@v2
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
Expand Down Expand Up @@ -47,10 +47,10 @@ jobs:
- os: windows-2019
transport: native
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '8'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,4 +67,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
20 changes: 10 additions & 10 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
versionType: ${{ steps.version.outputs.versionType }}
fullVersion: ${{ steps.version.outputs.fullVersion }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: setup java
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '8'
Expand All @@ -41,8 +41,8 @@ jobs:
if: needs.prepare.outputs.versionType == 'SNAPSHOT'
environment: snapshots
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '8'
Expand All @@ -61,8 +61,8 @@ jobs:
if: needs.prepare.outputs.versionType == 'MILESTONE'
environment: releases
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '8'
Expand All @@ -83,8 +83,8 @@ jobs:
if: needs.prepare.outputs.versionType == 'RELEASE'
environment: releases
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '8'
Expand All @@ -106,7 +106,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: tag
run: |
git config --local user.name 'reactorbot'
Expand All @@ -121,7 +121,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: tag
run: |
git config --local user.name 'reactorbot'
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ With `Gradle` from [repo.spring.io](https://repo.spring.io) or `Maven Central` r
}
dependencies {
//compile "io.projectreactor.netty:reactor-netty-core:1.0.19-SNAPSHOT"
compile "io.projectreactor.netty:reactor-netty-core:1.0.18"
//compile "io.projectreactor.netty:reactor-netty-http:1.0.19-SNAPSHOT"
compile "io.projectreactor.netty:reactor-netty-http:1.0.18"
//compile "io.projectreactor.netty:reactor-netty-core:1.0.20-SNAPSHOT"
compile "io.projectreactor.netty:reactor-netty-core:1.0.19"
//compile "io.projectreactor.netty:reactor-netty-http:1.0.20-SNAPSHOT"
compile "io.projectreactor.netty:reactor-netty-http:1.0.19"
}
```

Expand Down
32 changes: 16 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ buildscript {
maven { url "https://repo.spring.io/plugins-release" }
}
dependencies {
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.28.2' //applied in individual submodules
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.28.3' //applied in individual submodules
}
}

plugins {
id "com.diffplug.spotless" version "6.5.1"
id "com.diffplug.spotless" version "6.7.0"
id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false
id 'org.asciidoctor.jvm.pdf' version '3.3.2' apply false
id 'com.google.osdetector' version '1.7.0'
id 'org.gradle.test-retry' version '1.3.2'
id 'org.gradle.test-retry' version '1.4.0'
id 'io.spring.nohttp' version '0.0.10'
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
//we now need version of Artifactory gradle plugin deployed on Maven Central, see above
id 'me.champeau.gradle.japicmp' version '0.4.0' apply false
id 'de.undercouch.download' version '5.0.5' apply false
id 'de.undercouch.download' version '5.1.0' apply false
id 'io.spring.javadoc' version '0.0.1' apply false
id 'io.spring.javadoc-aggregate' version '0.0.1' apply false
id 'biz.aQute.bnd.builder' version '6.2.0' apply false
id 'biz.aQute.bnd.builder' version '6.3.1' apply false
}

description = 'Reactive Streams Netty driver'
Expand Down Expand Up @@ -86,7 +86,7 @@ ext {
//Metrics
micrometerVersion = '1.5.0' //optional baseline: technically could work with 1.2.x, should work with any 1.3.x

braveVersion = '5.13.8'
braveVersion = '5.13.9'

jsr305Version = '3.0.2'

Expand All @@ -95,28 +95,28 @@ ext {
logbackVersion = '1.2.11'

// Netty
nettyDefaultVersion = '4.1.76.Final'
nettyDefaultVersion = '4.1.77.Final'
if (!project.hasProperty("forceNettyVersion")) {
nettyVersion = nettyDefaultVersion
}
else {
nettyVersion = forceNettyVersion
println "Netty version defined from command line: ${forceNettyVersion}"
}
nettyIoUringVersion = '0.0.13.Final'
nettyQuicVersion = '0.0.26.Final'
nettyIoUringVersion = '0.0.14.Final'
nettyQuicVersion = '0.0.27.Final'

// Testing
jacksonDatabindVersion = '2.13.2.2'
jacksonDatabindVersion = '2.13.3'
testAddonVersion = reactorCoreVersion
assertJVersion = '3.22.0'
assertJVersion = '3.23.1'
awaitilityVersion = '4.2.0'
hoverflyJavaVersion = '0.14.1'
tomcatVersion = '9.0.62'
boringSslVersion = '2.0.51.Final'
hoverflyJavaVersion = '0.14.2'
tomcatVersion = '9.0.63'
boringSslVersion = '2.0.52.Final'
junitVersion = '5.8.2'
junitPlatformLauncherVersion = '1.8.2'
mockitoVersion = '4.5.1'
mockitoVersion = '4.6.1'
blockHoundVersion = '1.0.6.RELEASE'
bouncycastleVersion = '1.70'

Expand All @@ -128,7 +128,7 @@ ext {
println "JDK Javadoc link for this build is ${jdkJavadoc}"
javadocLinks = [jdkJavadoc,
"https://fasterxml.github.io/jackson-databind/javadoc/2.5/",
"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
"https://www.reactive-streams.org/reactive-streams-1.0.4-javadoc/",
"https://projectreactor.io/docs/core/release/api/",
"https://netty.io/4.1/api/",
"https://projectreactor.io/docs/netty/release/api/",] as String[]
Expand Down
2 changes: 1 addition & 1 deletion codequality/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<property name="max" value="4"/>
</module>
<module name="NestedIfDepth">
<property name="max" value="4"/>
<property name="max" value="5"/>
</module>
<module name="NestedTryDepth">
<property name="max" value="4"/>
Expand Down
1 change: 1 addition & 0 deletions docs/asciidoc/faq.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ Issues related to TCP keep-alive configuration on various load balancers were re
** limit for buffering data in memory
** multipart exceeds the max file size limit
** bad request
** max keep alive requests (the connection is closed when the requests reach the configured maximum number)

Consider checking <<Timeout Configuration>>. The section describes various timeout configuration options that are available for Reactor Netty clients.
Configuring a proper timeout may improve or solve issues in the communication process.
3 changes: 2 additions & 1 deletion docs/asciidoc/http-client.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ You can configure the `HTTP` client to enable auto-redirect support.

Reactor Netty provides two different strategies for auto-redirect support:

* `followRedirect(boolean)`: Specifies whether HTTP auto-redirect support is enabled for statuses `301|302|307|308`.
* `followRedirect(boolean)`: Specifies whether HTTP auto-redirect support is enabled for statuses `301|302|303|307|308`.
When it is `303` status code, `GET` method is used for the redirect.
* `followRedirect(BiPredicate<HttpClientRequest, HttpClientResponse>)`: Enables auto-redirect support if the supplied
predicate matches.

Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
reactorPoolVersion=0.2.9-SNAPSHOT
version=1.0.19-SNAPSHOT
reactorNettyQuicVersion=0.0.8-SNAPSHOT
reactorCoreVersion=3.4.18-SNAPSHOT
version=1.0.20-SNAPSHOT
reactorNettyQuicVersion=0.0.9-SNAPSHOT
reactorCoreVersion=3.4.19-SNAPSHOT
reactorAddonsVersion=3.4.9-SNAPSHOT
compatibleVersion=1.0.18
bomVersion=2020.0.18
compatibleVersion=1.0.19
bomVersion=2020.0.19
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public interface NettyPipeline {
String CompressionHandler = LEFT + "compressionHandler";
String ConnectMetricsHandler = LEFT + "connectMetricsHandler";
String H2CUpgradeHandler = LEFT + "h2cUpgradeHandler";
String H2Flush = LEFT + "h2Flush";
String H2MultiplexHandler = LEFT + "h2MultiplexHandler";
String H2OrHttp11Codec = LEFT + "h2OrHttp11Codec";
String H2ToHttp11Codec = LEFT + "h2ToHttp11Codec";
Expand Down
Loading

0 comments on commit 3be34aa

Please sign in to comment.