From 91dcbe98bbece2dc73c9dcde7ca1a7b6a48ee91c Mon Sep 17 00:00:00 2001 From: Moses Nakamura Date: Wed, 13 Jan 2021 21:45:46 +0000 Subject: [PATCH] Twitter-oss: Prepare OSS libraries for release 21.1.0 Problem We want to release the next versions of our Twitter OSS libraries 21.1.0 - util - scrooge - finagle - twitter-server - finatra Solution Prepare libraries for their next releases. Differential Revision: https://phabricator.twitter.biz/D602794 --- CHANGELOG.rst | 5 ++++- README.md | 2 +- build.sbt | 2 +- demos/scrooge-maven-demo/pom.xml | 12 ++++++------ doc/src/sphinx/SBTPlugin.rst | 10 +++++----- doc/src/sphinx/index.rst | 4 ++-- scrooge-maven-plugin/pom.xml | 4 ++-- 7 files changed, 21 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 04ee7dfcf..f99259e47 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 ---------- +21.1.0 +------ + * scrooge: Scrooge uses better size estimate for Map/Set containers in read() to improve performance in Java. ``PHAB_ID=D599495`` @@ -27,7 +30,7 @@ Unreleased * scrooge-generator: Scrooge preallocates containers to the correct size on the deepCopy operation to improve performance in Java. ``PHAB_ID=D590776`` -20.10.0 + 20.10.0 ------- No Changes diff --git a/README.md b/README.md index f1b307415..343a6ca9f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Scrooge -[![Build status](https://travis-ci.com/twitter/scrooge.svg?branch=develop)](https://travis-ci.com/twitter/scrooge) +[![Build status](https://travis-ci.com/twitter/scrooge.svg?branch=release)](https://travis-ci.com/twitter/scrooge) [![Codecov](https://codecov.io/gh/twitter/scrooge/branch/develop/graph/badge.svg)](https://codecov.io/gh/twitter/scrooge) [![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 e55600bff..0eed43f00 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ import scoverage.ScoverageKeys // 'git checkout develop; sbt publishLocal' to publish SNAPSHOT versions of these projects. // All Twitter library releases are date versioned as YY.MM.patch -val releaseVersion = "21.1.0-SNAPSHOT" +val releaseVersion = "21.1.0" lazy val versions = new { val slf4j = "1.7.30" diff --git a/demos/scrooge-maven-demo/pom.xml b/demos/scrooge-maven-demo/pom.xml index 85fdf9a96..184445d46 100644 --- a/demos/scrooge-maven-demo/pom.xml +++ b/demos/scrooge-maven-demo/pom.xml @@ -24,28 +24,28 @@ com.twitter scrooge-core_2.12 - 21.1.0-SNAPSHOT + 21.1.0 com.twitter finagle-thrift_2.12 - 21.1.0-SNAPSHOT + 21.1.0 com.twitter util-core_2.12 - 21.1.0-SNAPSHOT + 21.1.0 com.twitter util-codec_2.12 - 21.1.0-SNAPSHOT + 21.1.0 com.twitter finagle-core_2.12 - 21.1.0-SNAPSHOT + 21.1.0 junit @@ -129,7 +129,7 @@ com.twitter scrooge-maven-plugin - 21.1.0-SNAPSHOT + 21.1.0 diff --git a/doc/src/sphinx/SBTPlugin.rst b/doc/src/sphinx/SBTPlugin.rst index d276a3f43..ca5982c16 100644 --- a/doc/src/sphinx/SBTPlugin.rst +++ b/doc/src/sphinx/SBTPlugin.rst @@ -15,7 +15,7 @@ To use the scrooge-sbt-plugin, add the following lines to your :: - addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "20.12.0") + addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "21.1.0") Incorporating this line makes the Scrooge plugin available for use by SBT. Thrift files added to your project can now have code generated for them. By @@ -43,8 +43,8 @@ An example using a `build.sbt` file. name := "Scrooge Demo", libraryDependencies ++= Seq( "org.apache.thrift" % "libthrift" % "0.10.0", - "com.twitter" %% "scrooge-core" % "20.12.0", - "com.twitter" %% "finagle-thrift" % "20.12.0", + "com.twitter" %% "scrooge-core" % "21.1.0", + "com.twitter" %% "finagle-thrift" % "21.1.0", scalaTest % Test ) ) @@ -103,7 +103,7 @@ have Scrooge generate Java code. scroogeLanguages in Compile := Seq("java"), libraryDependencies ++= Seq( "org.apache.thrift" % "libthrift" % "0.10.0", - "com.twitter" %% "scrooge-core" % "20.12.0", - "com.twitter" %% "finagle-thrift" % "20.12.0", + "com.twitter" %% "scrooge-core" % "21.1.0", + "com.twitter" %% "finagle-thrift" % "21.1.0", scalaTest % Test ) diff --git a/doc/src/sphinx/index.rst b/doc/src/sphinx/index.rst index ede3ea192..0e36fce8a 100644 --- a/doc/src/sphinx/index.rst +++ b/doc/src/sphinx/index.rst @@ -45,14 +45,14 @@ Maven users need to add the following to the pom.xml file: com.twitter scrooge-core_2.12 - 20.12.0 + 21.1.0 SBT users need this: :: - val scroogeCore = "com.twitter" %% "scrooge-core" % "20.12.0" + val scroogeCore = "com.twitter" %% "scrooge-core" % "21.1.0" Building Scrooge ---------------- diff --git a/scrooge-maven-plugin/pom.xml b/scrooge-maven-plugin/pom.xml index 41d121ce3..26e86f33b 100644 --- a/scrooge-maven-plugin/pom.xml +++ b/scrooge-maven-plugin/pom.xml @@ -5,7 +5,7 @@ scrooge-maven-plugin maven-plugin scrooge-maven-plugin - 21.1.0-SNAPSHOT + 21.1.0 3.0.4 @@ -297,7 +297,7 @@ com.twitter scrooge-generator_2.10 - 21.1.0-SNAPSHOT + 21.1.0