Skip to content

Commit a68a2ff

Browse files
committed
Transporting updates to shopping-cart-java
1 parent 586953b commit a68a2ff

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

shopping-cart/shopping-cart-java/build.sbt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import com.lightbend.lagom.core.LagomVersion
33
organization in ThisBuild := "com.example"
44

55
// the Scala version that will be used for cross-compiled libraries
6-
scalaVersion in ThisBuild := "2.13.1"
6+
scalaVersion in ThisBuild := "2.13.3"
77

88
val lombok = "org.projectlombok" % "lombok" % "1.18.8"
9-
val postgresDriver = "org.postgresql" % "postgresql" % "42.2.8"
9+
val postgresDriver = "org.postgresql" % "postgresql" % "42.2.18"
1010
val hamcrestLibrary = "org.hamcrest" % "hamcrest-library" % "2.1" % Test
1111
val hibernateEntityManager = "org.hibernate" % "hibernate-entitymanager" % "5.4.2.Final"
1212
val jpaApi = "org.hibernate.javax.persistence" % "hibernate-jpa-2.1-api" % "1.0.0.Final"
@@ -15,8 +15,7 @@ val validationApi = "javax.validation" % "validation-api
1515
val akkaPersistenceQuery = "com.typesafe.akka" %% "akka-persistence-query" % LagomVersion.akka
1616
val akkaStreamTestkit = "com.typesafe.akka" %% "akka-stream-testkit" % LagomVersion.akka
1717

18-
val akkaManagementVersion = "1.0.3"
19-
val akkaDiscoveryKubernetesApi = "com.lightbend.akka.discovery" %% "akka-discovery-kubernetes-api" % akkaManagementVersion
18+
val akkaDiscoveryKubernetesApi = "com.lightbend.akka.discovery" %% "akka-discovery-kubernetes-api" % "1.0.9"
2019
val lagomJavadslAkkaDiscovery = "com.lightbend.lagom" %% "lagom-javadsl-akka-discovery-service-locator" % LagomVersion.current
2120

2221
val playJavaClusterSharding = "com.typesafe.play" %% "play-java-cluster-sharding" % LagomVersion.play
@@ -30,7 +29,7 @@ def dockerSettings = Seq(
3029

3130
def getDockerBaseImage(): String = sys.props.get("java.version") match {
3231
case Some(v) if v.startsWith("11") => "adoptopenjdk/openjdk11"
33-
case _ => "adoptopenjdk/openjdk8"
32+
case _ => "adoptopenjdk/openjdk8"
3433
}
3534

3635
// Update the version generated by sbt-dynver to remove any + characters, since these are illegal in docker tags

shopping-cart/shopping-cart-java/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
<dependency>
150150
<groupId>org.postgresql</groupId>
151151
<artifactId>postgresql</artifactId>
152-
<version>42.2.8</version>
152+
<version>42.2.18</version>
153153
</dependency>
154154
<dependency>
155155
<groupId>org.hibernate</groupId>
@@ -204,7 +204,7 @@
204204
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
205205
<lagom.version>1.6.4</lagom.version>
206206
<scala.binary.version>2.13</scala.binary.version>
207-
<akka.management.version>1.0.3</akka.management.version>
207+
<akka.management.version>1.0.9</akka.management.version>
208208
<hamcrest.version>2.1</hamcrest.version>
209209
<version.number>${git.commit.time}.${git.commit.id.abbrev}</version.number>
210210

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.13
1+
sbt.version=1.4.2

0 commit comments

Comments
 (0)