From 8ef36629a3f48a2d6db3c2916121ff867d1dd44f Mon Sep 17 00:00:00 2001
From: Yufan Gong <yufang@twitter.com>
Date: Thu, 23 Apr 2020 23:56:11 +0000
Subject: [PATCH] Twitter-oss: Prepare OSS libraries for release 20.4.1

Problem

We want to release the next versions of our Twitter OSS libraries 20.4.1
 - util
 - scrooge
 - finagle
 - twitter-server
 - finatra

Solution

Prepare libraries for their next releases.

Differential Revision: https://phabricator.twitter.biz/D473181
---
 CHANGELOG.rst                                       | 3 +++
 README.md                                           | 2 +-
 build.sbt                                           | 2 +-
 doc/src/sphinx/code/client-server-anatomy/build.sbt | 2 +-
 doc/src/sphinx/code/protocols/build.sbt             | 2 +-
 doc/src/sphinx/code/quickstart/build.sbt            | 2 +-
 project/plugins.sbt                                 | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9297d0701cc..a43ac880582 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,6 +7,9 @@ Note that ``PHAB_ID=#`` and ``RB_ID=#`` correspond to associated messages in com
 Unreleased
 ----------
 
+20.4.1
+------
+
 New Features
 ~~~~~~~~~~~~
 
diff --git a/README.md b/README.md
index a84f3997d77..9513b5763d2 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 # Finagle
 
-[![Build status](https://travis-ci.org/twitter/finagle.svg?branch=develop)](https://travis-ci.org/twitter/finagle)
+[![Build status](https://travis-ci.org/twitter/finagle.svg?branch=master)](https://travis-ci.org/twitter/finagle)
 [![Codecov](https://codecov.io/gh/twitter/finagle/branch/develop/graph/badge.svg)](https://codecov.io/gh/twitter/finagle)
 [![Project status](https://img.shields.io/badge/status-active-brightgreen.svg)](#status)
 [![Gitter](https://badges.gitter.im/twitter/finagle.svg)](https://gitter.im/twitter/finagle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
diff --git a/build.sbt b/build.sbt
index 0ac0c0b80d0..35a72bdb67b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,7 +2,7 @@ import Tests._
 import scoverage.ScoverageKeys
 
 // All Twitter library releases are date versioned as YY.MM.patch
-val releaseVersion = "20.5.0-SNAPSHOT"
+val releaseVersion = "20.4.1"
 
 val libthriftVersion = "0.10.0"
 
diff --git a/doc/src/sphinx/code/client-server-anatomy/build.sbt b/doc/src/sphinx/code/client-server-anatomy/build.sbt
index df94cfd3c84..d0b3b42d876 100644
--- a/doc/src/sphinx/code/client-server-anatomy/build.sbt
+++ b/doc/src/sphinx/code/client-server-anatomy/build.sbt
@@ -5,5 +5,5 @@ version := "1.0"
 scalaVersion := "2.12.1"
 
 libraryDependencies ++= Seq(
-  "com.twitter" %% "finagle-core" % "20.4.0"
+  "com.twitter" %% "finagle-core" % "20.4.1"
 )
diff --git a/doc/src/sphinx/code/protocols/build.sbt b/doc/src/sphinx/code/protocols/build.sbt
index db2d285a50d..b14a8b5fd93 100644
--- a/doc/src/sphinx/code/protocols/build.sbt
+++ b/doc/src/sphinx/code/protocols/build.sbt
@@ -5,5 +5,5 @@ version := "1.0"
 scalaVersion := "2.12.1"
 
 libraryDependencies ++= Seq(
-  "com.twitter" %% "finagle-mysql" % "20.4.0"
+  "com.twitter" %% "finagle-mysql" % "20.4.1"
 )
diff --git a/doc/src/sphinx/code/quickstart/build.sbt b/doc/src/sphinx/code/quickstart/build.sbt
index 27ff6fb657f..de268516c2c 100644
--- a/doc/src/sphinx/code/quickstart/build.sbt
+++ b/doc/src/sphinx/code/quickstart/build.sbt
@@ -4,4 +4,4 @@ version := "1.0"
 
 scalaVersion := "2.12.1"
 
-libraryDependencies += "com.twitter" %% "finagle-http" % "20.4.0"
+libraryDependencies += "com.twitter" %% "finagle-http" % "20.4.1"
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 765cedd0b53..cb2824d0db6 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,7 +1,7 @@
 resolvers += Classpaths.sbtPluginReleases
 resolvers += Resolver.sonatypeRepo("snapshots")
 
-val releaseVersion = "20.5.0-SNAPSHOT"
+val releaseVersion = "20.4.1"
 
 addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % releaseVersion)