From f7190e7f6b92684107b8cebf853d0d2403473022 Mon Sep 17 00:00:00 2001 From: Jillian Crossley Date: Tue, 22 Nov 2016 23:15:13 +0000 Subject: [PATCH] Twitter-oss: Prepare OSS libraries for release Problem We want to release the next versions our of Twitter OSS libraries: - util -> 6.39.0 - ostrich -> 9.23.0 - scrooge -> 4.12.0 - finagle -> 6.40.0 - twitter-server -> 1.25.0 - finatra -> 2.6.0 Solution Prepare libraries for their next releases. RB_ID=892743 TBR=true --- CHANGES | 4 ++++ demos/scrooge-maven-demo/pom.xml | 2 +- project/Build.scala | 6 +++--- scrooge-maven-plugin/pom.xml | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 3bd827c71..9ab821be1 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,10 @@ as it is included in Scrooge's user's guide. 4.x ----- + +4.12.0 +------ + - scrooge-generator: Remove check for 22 args when generating scala ServiceIface. Now that we no longer support Scala 2.10 we can always generate a case class for the generated scala ServiceIface. diff --git a/demos/scrooge-maven-demo/pom.xml b/demos/scrooge-maven-demo/pom.xml index 5198ae16c..13c4e88a9 100644 --- a/demos/scrooge-maven-demo/pom.xml +++ b/demos/scrooge-maven-demo/pom.xml @@ -137,7 +137,7 @@ com.twitter scrooge-maven-plugin - 4.11.0 + 4.12.0 diff --git a/project/Build.scala b/project/Build.scala index a0b992690..7585b0d04 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -14,12 +14,12 @@ object Scrooge extends Build { val branch = Process("git" :: "rev-parse" :: "--abbrev-ref" :: "HEAD" :: Nil).!!.trim val suffix = if (branch == "master") "" else "-SNAPSHOT" - val libVersion = "4.11.0" + suffix + val libVersion = "4.12.0" + suffix // To build the develop branch you need to publish util, and finagle locally: // 'git checkout develop; sbt publishLocal' to publish SNAPSHOT versions of these projects. - val utilVersion = "6.38.0" + suffix - val finagleVersion = "6.39.0" + suffix + val utilVersion = "6.39.0" + suffix + val finagleVersion = "6.40.0" + suffix val libthriftVersion = "0.5.0-7" diff --git a/scrooge-maven-plugin/pom.xml b/scrooge-maven-plugin/pom.xml index c73065c53..a94cb408a 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 - 4.11.0 + 4.12.0 3.0.4 @@ -247,7 +247,7 @@ com.twitter scrooge-generator_2.10 - 4.11.0 + 4.12.0