From 93087ddfe97b3fea96d0d3c5a8d480ecc737d735 Mon Sep 17 00:00:00 2001 From: Chetan Tutika Date: Thu, 2 May 2024 15:30:24 +0000 Subject: [PATCH] Twitter-oss: Prepare OSS libraries for release 24.2.0 Problem We want to release the next versions of our Twitter OSS libraries 24.2.0 - util - scrooge - finagle - twitter-server - finatra Solution Prepare libraries for their next releases. Differential Revision: https://phabricator.twitter.biz/D1140781 --- 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 ++-- .../src/test/resources/unit/project-idl-deps/pom.xml | 2 +- .../unit/scrooge-maven-plugin-test/plugin-config.xml | 2 +- .../src/test/resources/unit/unresolved-idl/pom.xml | 2 +- 10 files changed, 25 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 446a8912..5fc02d0b 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 ---------- +24.2.0 +------ + +No Changes + 23.11.0 ------- diff --git a/README.md b/README.md index da8442b1..c49c234c 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) [![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) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.twitter/scrooge-core_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.twitter/scrooge-core_2.12) diff --git a/build.sbt b/build.sbt index 9f489952..36ca5f96 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,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 = "24.2.0-SNAPSHOT" +val releaseVersion = "24.2.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 c4a4dc84..92df2c6d 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 - 24.2.0-SNAPSHOT + 24.2.0 com.twitter finagle-thrift_2.12 - 24.2.0-SNAPSHOT + 24.2.0 com.twitter util-core_2.12 - 24.2.0-SNAPSHOT + 24.2.0 com.twitter util-codec_2.12 - 24.2.0-SNAPSHOT + 24.2.0 com.twitter finagle-core_2.12 - 24.2.0-SNAPSHOT + 24.2.0 junit @@ -129,7 +129,7 @@ com.twitter scrooge-maven-plugin - 24.2.0-SNAPSHOT + 24.2.0 diff --git a/doc/src/sphinx/SBTPlugin.rst b/doc/src/sphinx/SBTPlugin.rst index 127ba899..b905371f 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" % "23.11.0") + addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "24.2.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" % "23.11.0", - "com.twitter" %% "finagle-thrift" % "23.11.0", + "com.twitter" %% "scrooge-core" % "24.2.0", + "com.twitter" %% "finagle-thrift" % "24.2.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" % "23.11.0", - "com.twitter" %% "finagle-thrift" % "23.11.0", + "com.twitter" %% "scrooge-core" % "24.2.0", + "com.twitter" %% "finagle-thrift" % "24.2.0", scalaTest % Test ) diff --git a/doc/src/sphinx/index.rst b/doc/src/sphinx/index.rst index b1fb6e69..8f018930 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 - 23.11.0 + 24.2.0 SBT users need this: :: - val scroogeCore = "com.twitter" %% "scrooge-core" % "23.11.0" + val scroogeCore = "com.twitter" %% "scrooge-core" % "24.2.0" Building Scrooge ---------------- diff --git a/scrooge-maven-plugin/pom.xml b/scrooge-maven-plugin/pom.xml index 25dbc350..438b91a2 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 - 24.2.0-SNAPSHOT + 24.2.0 3.0.4 @@ -316,7 +316,7 @@ com.twitter scrooge-generator_2.10 - 24.2.0-SNAPSHOT + 24.2.0 diff --git a/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/pom.xml b/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/pom.xml index 4d9f02e8..b06c296e 100644 --- a/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/pom.xml +++ b/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/pom.xml @@ -10,7 +10,7 @@ com.twitter scrooge-maven-plugin - 24.2.0-SNAPSHOT + 24.2.0 idl diff --git a/scrooge-maven-plugin/src/test/resources/unit/scrooge-maven-plugin-test/plugin-config.xml b/scrooge-maven-plugin/src/test/resources/unit/scrooge-maven-plugin-test/plugin-config.xml index bd235bb7..af24c322 100644 --- a/scrooge-maven-plugin/src/test/resources/unit/scrooge-maven-plugin-test/plugin-config.xml +++ b/scrooge-maven-plugin/src/test/resources/unit/scrooge-maven-plugin-test/plugin-config.xml @@ -10,7 +10,7 @@ com.twitter scrooge-maven-plugin - 24.2.0-SNAPSHOT + 24.2.0 ${localRepository} diff --git a/scrooge-maven-plugin/src/test/resources/unit/unresolved-idl/pom.xml b/scrooge-maven-plugin/src/test/resources/unit/unresolved-idl/pom.xml index 9bef906f..b94badbd 100644 --- a/scrooge-maven-plugin/src/test/resources/unit/unresolved-idl/pom.xml +++ b/scrooge-maven-plugin/src/test/resources/unit/unresolved-idl/pom.xml @@ -10,7 +10,7 @@ com.twitter scrooge-maven-plugin - 24.2.0-SNAPSHOT + 24.2.0 idl