Skip to content

Commit

Permalink
finatra - prepare for release version 2.1.3
Browse files Browse the repository at this point in the history
Update build files in preperation for release.

RB_ID=797308
  • Loading branch information
cacoco authored and jenkins committed Feb 5, 2016
1 parent d0ca7be commit 6e6cf19
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 30 deletions.
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,6 @@ Authors
-----------------------------------------------------------
* Steve Cosenza <https://github.com/scosenza>
* Christopher Coco <https://github.com/cacoco>
* Jason Carey <https://github.com/jcarey03>
* Eugene Ma <https://github.com/edma2>
* Nikolaj Nielsen <https://github.com/nhnFreespirit>
* Alex Leong <https://github.com/adleong>

A full list of [contributors](https://github.com/twitter/finatra/graphs/contributors?type=a) can be found on GitHub.

Expand Down
16 changes: 8 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import ScoverageSbtPlugin.ScoverageKeys._
parallelExecution in ThisBuild := false

lazy val aggregated = taskKey[Unit]("Print currently aggregated tasks under the root.")
lazy val projectVersion = "2.1.3-SNAPSHOT"
lazy val projectVersion = "2.1.3"

lazy val buildSettings = Seq(
version := projectVersion,
Expand Down Expand Up @@ -175,7 +175,7 @@ lazy val finatraModules = Seq(
utils)

lazy val finatraExamples =
// START EXAMPLES
/* // START EXAMPLES
Seq(
benchmarkServer,
exampleInjectJavaServer,
Expand All @@ -186,7 +186,7 @@ lazy val finatraExamples =
thriftExampleServer,
tinyUrl,
twitterClone) ++
// END EXAMPLES
*/ // END EXAMPLES
Seq.empty

def aggregatedProjects = {
Expand All @@ -205,12 +205,12 @@ lazy val root = (project in file(".")).
organization := "com.twitter.finatra",
moduleName := "finatra-root",
unidocProjectFilter in(ScalaUnidoc, unidoc) := inAnyProject
-- inProjects(benchmarks)
// exclude example projects
-- inProjects(benchmarks),
/* // exclude example projects
-- inProjects(benchmarkServer, exampleInjectJavaServer,
helloWorld, helloWorldHeroku, streamingExample,
thriftExampleIdl, thriftExampleServer,
tinyUrl, twitterClone),
tinyUrl, twitterClone),*/
aggregated := {
println(aggregatedProjects.map(_.id).mkString("\n"))
}
Expand Down Expand Up @@ -477,7 +477,7 @@ lazy val injectThriftClientHttpMapper = (project in file("inject-thrift-client-h
thrift % "test->test"
)

// START EXAMPLES
/* // START EXAMPLES
// 2.11 only due to rlazoti/finagle-metrics dependency
lazy val helloWorldHeroku = (project in file("examples/hello-world-heroku")).
Expand Down Expand Up @@ -628,4 +628,4 @@ lazy val thriftExampleServer = (project in file("examples/thrift-server/thrift-e
injectServer % "test->test"
)
// END EXAMPLES
*/ // END EXAMPLES
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name := "benchmark-server"
organization := "com.twitter.finatra.example"
version := "2.1.3-SNAPSHOT"
version := "2.1.3"
scalaVersion := "2.11.7"
parallelExecution in ThisBuild := false

lazy val versions = new {
val finatra = "2.1.3-SNAPSHOT"
val finatra = "2.1.3"
}

resolvers ++= Seq(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import com.typesafe.sbt.SbtNativePackager._
packageArchetype.java_application
name := "hello-world-heroku"
organization := "com.twitter.finatra.example"
version := "2.1.3-SNAPSHOT"
version := "2.1.3"
scalaVersion := "2.11.7"
fork in run := true
parallelExecution in ThisBuild := false

lazy val versions = new {
val finatra = "2.1.3-SNAPSHOT"
val finatra = "2.1.3"
val guice = "4.0"
val logback = "1.0.13"
val finagleMetrics = "0.0.2"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name := "hello-world"
organization := "com.twitter.finatra.example"
version := "2.1.3-SNAPSHOT"
version := "2.1.3"
scalaVersion := "2.11.7"
parallelExecution in ThisBuild := false

lazy val versions = new {
val finatra = "2.1.3-SNAPSHOT"
val finatra = "2.1.3"
val guice = "4.0"
val logback = "1.0.13"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.twitter.finatra.example</groupId>
<artifactId>hello-world</artifactId>
<version>2.1.3-SNAPSHOT</version>
<version>2.1.3</version>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<encoding>UTF-8</encoding>
<scala.version>2.11.7</scala.version>
<finatra.version>2.1.3-SNAPSHOT</finatra.version>
<finatra.version>2.1.3</finatra.version>

<mainClass>com.twitter.hello.HelloWorldServerMain</mainClass>
<buildPropertiesPackage>com.twitter.hello</buildPropertiesPackage>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "java-server"
organization := "com.twitter.example"
version := "2.1.3-SNAPSHOT"
version := "2.1.3"
scalaVersion := "2.11.7"
parallelExecution in ThisBuild := false
publishMavenStyle := true
Expand All @@ -10,7 +10,7 @@ autoScalaLibrary := false
mainClass in (Compile, packageBin) := Some("com.twitter.hello.server.HelloWorldServerMain")

lazy val versions = new {
val finatra = "2.1.3-SNAPSHOT"
val finatra = "2.1.3"
val guice = "4.0"
val logback = "1.0.13"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name := "streaming-example"
organization := "com.twitter.finatra.example"
version := "2.1.3-SNAPSHOT"
version := "2.1.3"
scalaVersion := "2.11.7"
parallelExecution in ThisBuild := false

lazy val versions = new {
val finatra = "2.1.3-SNAPSHOT"
val finatra = "2.1.3"
val guice = "4.0"
val logback = "1.0.13"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import sbt.Keys._
parallelExecution in ThisBuild := false

lazy val versions = new {
val finatra = "2.1.3-SNAPSHOT"
val finatra = "2.1.3"
val guice = "4.0"
val logback = "1.0.13"
}

lazy val baseSettings = Seq(
version := "2.1.3-SNAPSHOT",
version := "2.1.3",
scalaVersion := "2.11.7",
ivyScala := ivyScala.value.map(_.copy(overrideScalaVersion = true)),
libraryDependencies ++= Seq(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import com.typesafe.sbt.SbtNativePackager._
packageArchetype.java_application
name := "tiny-url"
organization := "com.twitter.finatra.example"
version := "2.1.3-SNAPSHOT"
version := "2.1.3"
scalaVersion := "2.11.7"
fork in run := true
parallelExecution in ThisBuild := false

lazy val versions = new {
val finatra = "2.1.3-SNAPSHOT"
val finatra = "2.1.3"
val guice = "4.0"
val logback = "1.0.13"
val redis = "2.7.2"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name := "twitter-clone"
organization := "com.twitter.finatra.example"
version := "2.1.3-SNAPSHOT"
version := "2.1.3"
scalaVersion := "2.11.7"
parallelExecution in ThisBuild := false

lazy val versions = new {
val finatra = "2.1.3-SNAPSHOT"
val finatra = "2.1.3"
val guice = "4.0"
val logback = "1.0.13"
}
Expand Down

0 comments on commit 6e6cf19

Please sign in to comment.