This is an automated email from the ASF dual-hosted git repository. fanningpj pushed a commit to branch 2.5 in repository https://gitbox.apache.org/repos/asf/incubator-pekko-samples.git
commit 767522ac64db040715dcc6da5d1c16c5fcf8406c Author: Johan Andrén <[email protected]> AuthorDate: Thu Oct 24 08:53:41 2019 +0200 Update Akka version to 2.5.26 (#130) * Update Akka version to 2.5.26 * Updated travis jabba setup --- .travis.yml | 8 ++++---- akka-sample-camel-java/build.sbt | 2 +- akka-sample-camel-scala/build.sbt | 2 +- akka-sample-cluster-java/build.sbt | 2 +- akka-sample-cluster-java/pom.xml | 4 ++-- akka-sample-cluster-scala/build.sbt | 2 +- akka-sample-cqrs-scala/build.sbt | 2 +- akka-sample-distributed-data-java/build.sbt | 2 +- akka-sample-distributed-data-scala/build.sbt | 2 +- akka-sample-fsm-java/build.sbt | 2 +- akka-sample-fsm-java/pom.xml | 6 +++--- akka-sample-fsm-scala/build.sbt | 2 +- akka-sample-main-java/build.sbt | 2 +- akka-sample-main-java/pom.xml | 2 +- akka-sample-main-scala/build.sbt | 2 +- akka-sample-multi-node-scala/build.sbt | 2 +- akka-sample-osgi-dining-hakkers/pom.xml | 2 +- akka-sample-persistence-dc-java/build.sbt | 2 +- akka-sample-persistence-dc-scala/build.sbt | 2 +- akka-sample-persistence-java/build.sbt | 2 +- akka-sample-persistence-java/pom.xml | 6 +++--- akka-sample-persistence-scala/build.sbt | 2 +- akka-sample-sharding-java/build.sbt | 2 +- akka-sample-sharding-scala/build.sbt | 2 +- akka-sample-supervision-java/build.sbt | 2 +- akka-sample-supervision-java/pom.xml | 4 ++-- akka-sample-vavr/pom.xml | 2 +- 27 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 321d1cf..efff769 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,6 @@ language: scala scala: - "2.12.8" -install: - - $JABBA_HOME/bin/jabba install $TRAVIS_JDK && export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH" && java -Xmx32m -version before_cache: - find $HOME/.ivy2 -name "ivydata-*.properties" -print -delete @@ -19,15 +17,17 @@ cache: - $HOME/.jabba/jdk before_install: - - curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.10.1/install.sh | bash && . ~/.jabba/jabba.sh + - curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh - wget https://archive.apache.org/dist/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.zip - unzip -qq apache-maven-3.6.1-bin.zip - export M2_HOME=$PWD/apache-maven-3.6.1 - export PATH=$M2_HOME/bin:$PATH +install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx32m -version + env: global: - - [email protected] + - TRAVIS_JDK=8 - JABBA_HOME=/home/travis/.jabba matrix: - CMD="cd akka-sample-camel-java && sbt test" diff --git a/akka-sample-camel-java/build.sbt b/akka-sample-camel-java/build.sbt index ce09634..4c5b2b4 100644 --- a/akka-sample-camel-java/build.sbt +++ b/akka-sample-camel-java/build.sbt @@ -3,7 +3,7 @@ name := "akka-sample-camel-java" scalaVersion := "2.12.8" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-camel" % "2.5.24", + "com.typesafe.akka" %% "akka-camel" % "2.5.26", "org.apache.camel" % "camel-jetty" % "2.17.7", "org.apache.camel" % "camel-quartz" % "2.17.7", "org.slf4j" % "slf4j-api" % "1.7.23", diff --git a/akka-sample-camel-scala/build.sbt b/akka-sample-camel-scala/build.sbt index 27fec2f..f8149ec 100644 --- a/akka-sample-camel-scala/build.sbt +++ b/akka-sample-camel-scala/build.sbt @@ -3,7 +3,7 @@ name := "akka-sample-camel-scala" scalaVersion := "2.12.8" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-camel" % "2.5.24", + "com.typesafe.akka" %% "akka-camel" % "2.5.26", "org.apache.camel" % "camel-jetty" % "2.17.7", "org.apache.camel" % "camel-quartz" % "2.17.7", "org.slf4j" % "slf4j-api" % "1.7.23", diff --git a/akka-sample-cluster-java/build.sbt b/akka-sample-cluster-java/build.sbt index 839bf1b..6c48965 100644 --- a/akka-sample-cluster-java/build.sbt +++ b/akka-sample-cluster-java/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.SbtMultiJvm.multiJvmSettings import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val akkaVersion = "2.5.24" +val akkaVersion = "2.5.26" val `akka-sample-cluster-java` = project .in(file(".")) diff --git a/akka-sample-cluster-java/pom.xml b/akka-sample-cluster-java/pom.xml index 6b31090..c8ab0f7 100644 --- a/akka-sample-cluster-java/pom.xml +++ b/akka-sample-cluster-java/pom.xml @@ -17,12 +17,12 @@ <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-cluster-tools_2.12</artifactId> - <version>2.5.24</version> + <version>2.5.26</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-cluster-metrics_2.12</artifactId> - <version>2.5.24</version> + <version>2.5.26</version> </dependency> </dependencies> diff --git a/akka-sample-cluster-scala/build.sbt b/akka-sample-cluster-scala/build.sbt index fcc7243..a44cdd0 100644 --- a/akka-sample-cluster-scala/build.sbt +++ b/akka-sample-cluster-scala/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.SbtMultiJvm.multiJvmSettings import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val akkaVersion = "2.5.24" +val akkaVersion = "2.5.26" lazy val `akka-sample-cluster-scala` = project .in(file(".")) diff --git a/akka-sample-cqrs-scala/build.sbt b/akka-sample-cqrs-scala/build.sbt index 9805df5..6760cd2 100644 --- a/akka-sample-cqrs-scala/build.sbt +++ b/akka-sample-cqrs-scala/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.SbtMultiJvm.multiJvmSettings import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val AkkaVersion = "2.5.24" +val AkkaVersion = "2.5.26" val AkkaAddOnsVersion = "1.1.0" val AkkaPersistenceCassandraVersion = "0.93" val AkkaHttpVersion = "10.1.8" diff --git a/akka-sample-distributed-data-java/build.sbt b/akka-sample-distributed-data-java/build.sbt index ea1a4ee..43c82c3 100644 --- a/akka-sample-distributed-data-java/build.sbt +++ b/akka-sample-distributed-data-java/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.SbtMultiJvm.multiJvmSettings import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val akkaVersion = "2.5.24" +val akkaVersion = "2.5.26" val `akka-sample-distributed-data-java` = project .in(file(".")) diff --git a/akka-sample-distributed-data-scala/build.sbt b/akka-sample-distributed-data-scala/build.sbt index 6293b4d..50e5699 100644 --- a/akka-sample-distributed-data-scala/build.sbt +++ b/akka-sample-distributed-data-scala/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.SbtMultiJvm.multiJvmSettings import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val akkaVersion = "2.5.24" +val akkaVersion = "2.5.26" val `akka-sample-distributed-data-scala` = project .in(file(".")) diff --git a/akka-sample-fsm-java/build.sbt b/akka-sample-fsm-java/build.sbt index cc84ada..b7c1cda 100644 --- a/akka-sample-fsm-java/build.sbt +++ b/akka-sample-fsm-java/build.sbt @@ -1,7 +1,7 @@ organization := "com.typesafe.akka.samples" name := "akka-sample-fsm-java" -val akkaVersion = "2.5.24" +val akkaVersion = "2.5.26" scalaVersion := "2.12.8" libraryDependencies ++= Seq( diff --git a/akka-sample-fsm-java/pom.xml b/akka-sample-fsm-java/pom.xml index 77ecea9..303ebe8 100644 --- a/akka-sample-fsm-java/pom.xml +++ b/akka-sample-fsm-java/pom.xml @@ -17,17 +17,17 @@ <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-actor_2.12</artifactId> - <version>2.5.24</version> + <version>2.5.26</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-actor-typed_2.12</artifactId> - <version>2.5.24</version> + <version>2.5.26</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-testkit_2.12</artifactId> - <version>2.5.24</version> + <version>2.5.26</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/akka-sample-fsm-scala/build.sbt b/akka-sample-fsm-scala/build.sbt index ac40faf..b19fdc1 100644 --- a/akka-sample-fsm-scala/build.sbt +++ b/akka-sample-fsm-scala/build.sbt @@ -1,7 +1,7 @@ organization := "com.typesafe.akka.samples" name := "akka-sample-fsm-scala" -val akkaVersion = "2.5.24" +val akkaVersion = "2.5.26" scalaVersion := "2.12.8" libraryDependencies ++= Seq( diff --git a/akka-sample-main-java/build.sbt b/akka-sample-main-java/build.sbt index ea3f849..a90fd37 100644 --- a/akka-sample-main-java/build.sbt +++ b/akka-sample-main-java/build.sbt @@ -3,7 +3,7 @@ name := "akka-sample-main-java" scalaVersion := "2.12.8" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-actor" % "2.5.24" + "com.typesafe.akka" %% "akka-actor" % "2.5.26" ) licenses := Seq(("CC0", url("http://creativecommons.org/publicdomain/zero/1.0";))) diff --git a/akka-sample-main-java/pom.xml b/akka-sample-main-java/pom.xml index 8e11cfc..f8900b7 100644 --- a/akka-sample-main-java/pom.xml +++ b/akka-sample-main-java/pom.xml @@ -17,7 +17,7 @@ <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-actor_2.12</artifactId> - <version>2.5.24</version> + <version>2.5.26</version> </dependency> </dependencies> diff --git a/akka-sample-main-scala/build.sbt b/akka-sample-main-scala/build.sbt index f6916d5..ff17a1f 100644 --- a/akka-sample-main-scala/build.sbt +++ b/akka-sample-main-scala/build.sbt @@ -3,7 +3,7 @@ name := "akka-sample-main-scala" scalaVersion := "2.12.8" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-actor" % "2.5.24" + "com.typesafe.akka" %% "akka-actor" % "2.5.26" ) licenses := Seq(("CC0", url("http://creativecommons.org/publicdomain/zero/1.0";))) diff --git a/akka-sample-multi-node-scala/build.sbt b/akka-sample-multi-node-scala/build.sbt index 69392da..e1e9ed1 100644 --- a/akka-sample-multi-node-scala/build.sbt +++ b/akka-sample-multi-node-scala/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.SbtMultiJvm.multiJvmSettings import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val akkaVersion = "2.5.24" +val akkaVersion = "2.5.26" val `akka-sample-multi-node-scala` = project .in(file(".")) diff --git a/akka-sample-osgi-dining-hakkers/pom.xml b/akka-sample-osgi-dining-hakkers/pom.xml index 2ba1882..4461254 100644 --- a/akka-sample-osgi-dining-hakkers/pom.xml +++ b/akka-sample-osgi-dining-hakkers/pom.xml @@ -9,7 +9,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <akka.version>2.5.24</akka.version> + <akka.version>2.5.26</akka.version> <!-- Support for eecap-1.8 (Java 8) is from 3.0.2 --> <!-- https://github.com/apache/karaf/blob/karaf-3.0.2/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties --> <karaf.version>3.0.8</karaf.version> diff --git a/akka-sample-persistence-dc-java/build.sbt b/akka-sample-persistence-dc-java/build.sbt index eae6e85..8e41cb4 100644 --- a/akka-sample-persistence-dc-java/build.sbt +++ b/akka-sample-persistence-dc-java/build.sbt @@ -5,7 +5,7 @@ enablePlugins(ProtobufPlugin) scalaVersion := "2.12.8" -val AkkaVersion = "2.5.24" +val AkkaVersion = "2.5.26" val AkkaAddOnsVersion = "1.1.9" val AkkaPersistenceCassandraVersion = "0.93" val AkkaHttpVersion = "10.1.8" diff --git a/akka-sample-persistence-dc-scala/build.sbt b/akka-sample-persistence-dc-scala/build.sbt index 1138975..9d55dcf 100644 --- a/akka-sample-persistence-dc-scala/build.sbt +++ b/akka-sample-persistence-dc-scala/build.sbt @@ -5,7 +5,7 @@ enablePlugins(ProtobufPlugin) scalaVersion := "2.12.8" -val AkkaVersion = "2.5.24" +val AkkaVersion = "2.5.26" val AkkaAddOnsVersion = "1.1.9" val AkkaPersistenceCassandraVersion = "0.93" val AkkaHttpVersion = "10.1.8" diff --git a/akka-sample-persistence-java/build.sbt b/akka-sample-persistence-java/build.sbt index 4c08cb4..c5cb6e7 100644 --- a/akka-sample-persistence-java/build.sbt +++ b/akka-sample-persistence-java/build.sbt @@ -3,7 +3,7 @@ name := "akka-sample-persistence-java" scalaVersion := "2.12.8" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-persistence" % "2.5.24", + "com.typesafe.akka" %% "akka-persistence" % "2.5.26", "org.iq80.leveldb" % "leveldb" % "0.7", "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8" ) diff --git a/akka-sample-persistence-java/pom.xml b/akka-sample-persistence-java/pom.xml index 4a0ada7..bcb7666 100644 --- a/akka-sample-persistence-java/pom.xml +++ b/akka-sample-persistence-java/pom.xml @@ -17,17 +17,17 @@ <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-actor_2.12</artifactId> - <version>2.5.24</version> + <version>2.5.26</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-persistence_2.12</artifactId> - <version>2.5.24</version> + <version>2.5.26</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-testkit_2.12</artifactId> - <version>2.5.24</version> + <version>2.5.26</version> </dependency> <dependency> <groupId>org.iq80.leveldb</groupId> diff --git a/akka-sample-persistence-scala/build.sbt b/akka-sample-persistence-scala/build.sbt index ac8617d..86400bd 100644 --- a/akka-sample-persistence-scala/build.sbt +++ b/akka-sample-persistence-scala/build.sbt @@ -3,7 +3,7 @@ name := "akka-sample-persistence-scala" scalaVersion := "2.12.8" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-persistence" % "2.5.24", + "com.typesafe.akka" %% "akka-persistence" % "2.5.26", "org.iq80.leveldb" % "leveldb" % "0.7", "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8" ) diff --git a/akka-sample-sharding-java/build.sbt b/akka-sample-sharding-java/build.sbt index fb69e5a..531591f 100644 --- a/akka-sample-sharding-java/build.sbt +++ b/akka-sample-sharding-java/build.sbt @@ -1,4 +1,4 @@ -val akkaVersion = "2.5.24" +val akkaVersion = "2.5.26" val `akka-sample-sharding-java` = project .in(file(".")) diff --git a/akka-sample-sharding-scala/build.sbt b/akka-sample-sharding-scala/build.sbt index f1790d1..55bdb07 100644 --- a/akka-sample-sharding-scala/build.sbt +++ b/akka-sample-sharding-scala/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.SbtMultiJvm.multiJvmSettings import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val akkaVersion = "2.5.24" +val akkaVersion = "2.5.26" lazy val `akka-sample-sharding-scala` = project .in(file(".")) diff --git a/akka-sample-supervision-java/build.sbt b/akka-sample-supervision-java/build.sbt index 44a7da8..b7ddbfe 100644 --- a/akka-sample-supervision-java/build.sbt +++ b/akka-sample-supervision-java/build.sbt @@ -1,7 +1,7 @@ organization := "com.typesafe.akka.samples" name := "akka-sample-supervision-java" -val akkaVersion = "2.5.24" +val akkaVersion = "2.5.26" scalaVersion := "2.12.8" libraryDependencies ++= Seq( diff --git a/akka-sample-supervision-java/pom.xml b/akka-sample-supervision-java/pom.xml index 15709c8..017d112 100644 --- a/akka-sample-supervision-java/pom.xml +++ b/akka-sample-supervision-java/pom.xml @@ -17,12 +17,12 @@ <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-actor_2.12</artifactId> - <version>2.5.24</version> + <version>2.5.26</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-testkit_2.12</artifactId> - <version>2.5.24</version> + <version>2.5.26</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/akka-sample-vavr/pom.xml b/akka-sample-vavr/pom.xml index 755c7df..8dfa8e3 100644 --- a/akka-sample-vavr/pom.xml +++ b/akka-sample-vavr/pom.xml @@ -18,7 +18,7 @@ <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-actor_2.12</artifactId> - <version>2.5.24</version> + <version>2.5.26</version> </dependency> <dependency> <groupId>io.vavr</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
