Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump versions (backport #11050) #11076

Merged
merged 8 commits into from Dec 29, 2021
Merged

Bump versions (backport #11050) #11076

merged 8 commits into from Dec 29, 2021

Commits on Dec 28, 2021

  1. spring-beans, spring-context, ... 5.3.13 (was 5.3.12) 

    (cherry picked from commit e7c1abd)

# Conflicts:
#	project/Dependencies.scala
    @scala-steward
    scala-steward authored and mergify-bot committed Dec 28, 2021
    Copy the full SHA
    d82176d View commit details
    Browse the repository at this point in the history

  2. Update dependencies 

    (cherry picked from commit 5a4aeb0)

# Conflicts:
#	documentation/manual/working/commonGuide/build/code/dependencies.sbt
#	documentation/manual/working/javaGuide/main/sql/code/jpa.sbt
#	project/Dependencies.scala
    @mkurz
    mkurz authored and mergify-bot committed Dec 28, 2021
    Copy the full SHA
    a1e87bc View commit details
    Browse the repository at this point in the history

  3. Bump scala/sbt 

    (cherry picked from commit ac50a6e)

# Conflicts:
#	.travis.yml
#	documentation/build.sbt
#	documentation/manual/hacking/Translations.md
#	documentation/manual/releases/release29/migration29/Migration29.md
#	documentation/project/build.properties
#	project/build.properties
    @mkurz
    mkurz authored and mergify-bot committed Dec 28, 2021
    Copy the full SHA
    077740a View commit details
    Browse the repository at this point in the history

  4. Logback 1.2.9 removed Groovy configuration support (logback.groovy) 

    (cherry picked from commit 3304f59)
    @mkurz
    mkurz authored and mergify-bot committed Dec 28, 2021
    Copy the full SHA
    b42c8b3 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2021

  1. Fix conflicts

    @mkurz
    mkurz committed Dec 29, 2021
    Copy the full SHA
    7fcd0fc View commit details
    Browse the repository at this point in the history

  2. Downgrade mockito

    @mkurz
    mkurz committed Dec 29, 2021
    Copy the full SHA
    fcef82f View commit details
    Browse the repository at this point in the history

  3. Netty deprecated EpollChannelOption#TCP_FASTOPEN in favor of ChannelO… 

    …ption#TCP_FASTOPEN
    @mkurz
    mkurz committed Dec 29, 2021
    Copy the full SHA
    c4c48f0 View commit details
    Browse the repository at this point in the history

  4. TCP_FASTOPEN is prefixed with class io.netty.channel.ChannelOption

    @mkurz
    mkurz committed Dec 29, 2021
    Copy the full SHA
    ff714a8 View commit details
    Browse the repository at this point in the history