Skip to content

Commit

Permalink
Twitter-oss: Prepare OSS libraries for release
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jcrossley authored and jenkins committed Nov 22, 2016
1 parent 6da932a commit f7190e7
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion demos/scrooge-maven-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<plugin>
<groupId>com.twitter</groupId>
<artifactId>scrooge-maven-plugin</artifactId>
<version>4.11.0</version>
<version>4.12.0</version>
<configuration>
<thriftNamespaceMappings>
<thriftNamespaceMapping>
Expand Down
6 changes: 3 additions & 3 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions scrooge-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>scrooge-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>scrooge-maven-plugin</name>
<version>4.11.0</version>
<version>4.12.0</version>
<prerequisites>
<maven>3.0.4</maven>
</prerequisites>
Expand Down Expand Up @@ -247,7 +247,7 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>scrooge-generator_2.10</artifactId>
<version>4.11.0</version>
<version>4.12.0</version>
</dependency>
<!-- Test Dependencies-->
<dependency>
Expand Down

0 comments on commit f7190e7

Please sign in to comment.