Skip to content

Commit

Permalink
Update dependencies (#45)
Browse files Browse the repository at this point in the history
* Update dependencies to PaaS beta versions

upgrade typesafe config to 1.3.0
upgrade akka to 2.4.9
upgrade json4s to 3.4.0
upgrade spark to 1.6.2

remove scala 2.11 profile

* remove scala_2.10 profile
  • Loading branch information
darroyo-stratio authored and compae committed Sep 21, 2016
1 parent 83885fe commit e631fd9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 20 deletions.
1 change: 0 additions & 1 deletion .jenkins.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
CROSSBUILD:
- 'scala-2.10'
- 'scala-2.11'

MAIL: jdelgado
Expand Down
30 changes: 11 additions & 19 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</parent>

<groupId>com.stratio.common</groupId>
<artifactId>common-utils_2.10</artifactId>
<artifactId>common-utils_2.11</artifactId>
<version>0.7.0-SNAPSHOT</version>
<packaging>jar</packaging>

Expand All @@ -38,22 +38,21 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<typesafe.version>1.2.1</typesafe.version>
<typesafe.version>1.3.0</typesafe.version>
<scalatest.version>2.2.2</scalatest.version>
<junit.version>4.11</junit.version>
<akka.version>2.3.11</akka.version>
<json4s.version>3.2.10</json4s.version>
<curator.version>2.9.0</curator.version>
<spark.version>1.5.2</spark.version>
<akka.version>2.4.9</akka.version>
<json4s.version>3.4.0</json4s.version>
<curator.version>2.11.0</curator.version>
<spark.version>1.6.2</spark.version>
<slf4j.version>1.7.7</slf4j.version>
<scalaz-version>7.2.1</scalaz-version>
<!-- Scala version and cross build properties -->
<scala.binary.version>2.10</scala.binary.version>
<scala.version>2.10.4</scala.version>
<scala_2.10.version>2.10.4</scala_2.10.version>
<scala_2.11.version>2.11.7</scala_2.11.version>
<default.scala.binary.version>2.10</default.scala.binary.version>
<default.scala.version>${scala_2.10.version}</default.scala.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.8</scala.version>
<scala_2.11.version>2.11.8</scala_2.11.version>
<default.scala.binary.version>2.11</default.scala.binary.version>
<default.scala.version>${scala_2.11.version}</default.scala.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -183,13 +182,6 @@
</build>

<profiles>
<profile>
<id>scala-2.10</id>
<properties>
<scala.binary.version>2.10</scala.binary.version>
<scala.version>${scala_2.10.version}</scala.version>
</properties>
</profile>
<profile>
<id>scala-2.11</id>
<properties>
Expand Down

0 comments on commit e631fd9

Please sign in to comment.