From e27cdb48e1d9b63c2cedec8396466ce7fd98a6df Mon Sep 17 00:00:00 2001 From: Hamdi Allam Date: Tue, 22 Sep 2020 20:21:39 +0000 Subject: [PATCH] Twitter-oss: Prepare OSS libraries for release 20.9.0 Problem We want to release the next versions of our Twitter OSS libraries 20.9.0 - util - scrooge - finagle - twitter-server - finatra Solution Prepare libraries for their next releases. JIRA Issues: CSL-10167 Differential Revision: https://phabricator.twitter.biz/D553327 --- 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, 22 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5b469b582..846ec3d50 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,11 @@ Note that ``PHAB_ID=#`` and ``RB_ID=#`` correspond to associated messages in com Unreleased ---------- +20.9.0 +------ + +No Changes + 20.8.1 ------ 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 39b0bbdb7..9bee7a793 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 = "20.9.0-SNAPSHOT" +val releaseVersion = "20.9.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 82123295d..ac94cf568 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 - 20.9.0-SNAPSHOT + 20.9.0 com.twitter finagle-thrift_2.12 - 20.9.0-SNAPSHOT + 20.9.0 com.twitter util-core_2.12 - 20.9.0-SNAPSHOT + 20.9.0 com.twitter util-codec_2.12 - 20.9.0-SNAPSHOT + 20.9.0 com.twitter finagle-core_2.12 - 20.9.0-SNAPSHOT + 20.9.0 junit @@ -129,7 +129,7 @@ com.twitter scrooge-maven-plugin - 20.9.0-SNAPSHOT + 20.9.0 diff --git a/doc/src/sphinx/SBTPlugin.rst b/doc/src/sphinx/SBTPlugin.rst index 9afbcd6f0..cf4f380ad 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.8.1") + addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "20.9.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.8.1", - "com.twitter" %% "finagle-thrift" % "20.8.1", + "com.twitter" %% "scrooge-core" % "20.9.0", + "com.twitter" %% "finagle-thrift" % "20.9.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.8.1", - "com.twitter" %% "finagle-thrift" % "20.8.1", + "com.twitter" %% "scrooge-core" % "20.9.0", + "com.twitter" %% "finagle-thrift" % "20.9.0", scalaTest % Test ) diff --git a/doc/src/sphinx/index.rst b/doc/src/sphinx/index.rst index aad5c40d7..7f548a1ac 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.8.1 + 20.9.0 SBT users need this: :: - val scroogeCore = "com.twitter" %% "scrooge-core" % "20.8.1" + val scroogeCore = "com.twitter" %% "scrooge-core" % "20.9.0" Building Scrooge ---------------- diff --git a/scrooge-maven-plugin/pom.xml b/scrooge-maven-plugin/pom.xml index a21886c37..d58924627 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 - 20.9.0-SNAPSHOT + 20.9.0 3.0.4 @@ -297,7 +297,7 @@ com.twitter scrooge-generator_2.10 - 20.9.0-SNAPSHOT + 20.9.0