From 9517d6662dcd879ec4265e52e57ca88a3861c4ee Mon Sep 17 00:00:00 2001 From: Kyle Bahr Date: Wed, 12 Jan 2022 23:01:18 +0000 Subject: [PATCH] Twitter-oss: Prepare OSS libraries for release 22.1.0 Problem We want to release the next versions of our Twitter OSS libraries 22.1.0 - util - scrooge - finagle - twitter-server - finatra Solution Prepare libraries for their next releases. JIRA Issues: CSL-11595 Differential Revision: https://phabricator.twitter.biz/D812047 --- 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 fe71d068..73371072 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 ---------- +22.1.0 +------ + +No Changes + 21.12.0 ------- diff --git a/README.md b/README.md index 2cbff24a..8baf4986 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Scrooge -[![Build Status](https://github.com/twitter/scrooge/workflows/continuous%20integration/badge.svg?branch=develop)](https://github.com/twitter/scrooge/actions?query=workflow%3A%22continuous+integration%22+branch%3Adevelop) +[![Build Status](https://github.com/twitter/scrooge/workflows/continuous%20integration/badge.svg?branch=release)](https://github.com/twitter/scrooge/actions?query=workflow%3A%22continuous+integration%22+branch%3Arelease) [![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 201e00b3..9470a864 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ Global / excludeLintKeys += scalacOptions // '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 = "22.1.0-SNAPSHOT" +val releaseVersion = "22.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 77b6620f..a1ed16a6 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 - 22.1.0-SNAPSHOT + 22.1.0 com.twitter finagle-thrift_2.12 - 22.1.0-SNAPSHOT + 22.1.0 com.twitter util-core_2.12 - 22.1.0-SNAPSHOT + 22.1.0 com.twitter util-codec_2.12 - 22.1.0-SNAPSHOT + 22.1.0 com.twitter finagle-core_2.12 - 22.1.0-SNAPSHOT + 22.1.0 junit @@ -129,7 +129,7 @@ com.twitter scrooge-maven-plugin - 22.1.0-SNAPSHOT + 22.1.0 diff --git a/doc/src/sphinx/SBTPlugin.rst b/doc/src/sphinx/SBTPlugin.rst index 05b65034..d744a9ac 100644 --- a/doc/src/sphinx/SBTPlugin.rst +++ b/doc/src/sphinx/SBTPlugin.rst @@ -13,7 +13,7 @@ To use the scrooge-sbt-plugin, add the following lines to your :: - addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "21.12.0") + addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "22.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 @@ -41,8 +41,8 @@ An example using a `build.sbt` file. name := "Scrooge Demo", libraryDependencies ++= Seq( "org.apache.thrift" % "libthrift" % "0.10.0", - "com.twitter" %% "scrooge-core" % "21.12.0", - "com.twitter" %% "finagle-thrift" % "21.12.0", + "com.twitter" %% "scrooge-core" % "22.1.0", + "com.twitter" %% "finagle-thrift" % "22.1.0", scalaTest % Test ) ) @@ -101,7 +101,7 @@ have Scrooge generate Java code. scroogeLanguages in Compile := Seq("java"), libraryDependencies ++= Seq( "org.apache.thrift" % "libthrift" % "0.10.0", - "com.twitter" %% "scrooge-core" % "21.12.0", - "com.twitter" %% "finagle-thrift" % "21.12.0", + "com.twitter" %% "scrooge-core" % "22.1.0", + "com.twitter" %% "finagle-thrift" % "22.1.0", scalaTest % Test ) diff --git a/doc/src/sphinx/index.rst b/doc/src/sphinx/index.rst index 94b21747..dddeeb56 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 - 21.12.0 + 22.1.0 SBT users need this: :: - val scroogeCore = "com.twitter" %% "scrooge-core" % "21.12.0" + val scroogeCore = "com.twitter" %% "scrooge-core" % "22.1.0" Building Scrooge ---------------- diff --git a/scrooge-maven-plugin/pom.xml b/scrooge-maven-plugin/pom.xml index 32bacd19..18f8562c 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 - 22.1.0-SNAPSHOT + 22.1.0 3.0.4 @@ -297,7 +297,7 @@ com.twitter scrooge-generator_2.10 - 22.1.0-SNAPSHOT + 22.1.0