Skip to content

Commit c03e084

Browse files
yadavan88yadavan88
authored
Merge branch 'master' into update/play-slick-6.1.0
2 parents 647249f + 9b06772 commit c03e084

File tree

9 files changed

+185
-7
lines changed

9 files changed

+185
-7
lines changed

‎build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ lazy val scala_akka_3 = (project in file("scala-akka-3"))
310310
)
311311

312312
val monocleVersion = "2.1.0"
313-
val slickVersion = "3.4.1"
313+
val slickVersion = "3.5.0"
314314
val shapelessVersion = "2.3.10"
315315
val scalazVersion = "7.3.8"
316316
val fs2Version = "3.9.4"
@@ -424,7 +424,7 @@ lazy val scala_libraries_3 = (project in file("scala-libraries-3"))
424424
libraryDependencies += "com.softwaremill.retry" %% "retry" % "0.3.6",
425425
libraryDependencies ++= Seq(
426426
log4jApiScalaDep,
427-
"org.apache.logging.log4j" % "log4j-core" % "2.23.0" % Runtime
427+
"org.apache.logging.log4j" % "log4j-core" % "2.23.1" % Runtime
428428
),
429429
libraryDependencies += osLibDep
430430
)
@@ -436,7 +436,7 @@ lazy val scala_libraries_os = (project in file("scala-libraries-os"))
436436
libraryDependencies ++= scalaTestDeps,
437437
libraryDependencies ++= Seq(
438438
log4jApiScalaDep,
439-
"org.apache.logging.log4j" % "log4j-core" % "2.23.0" % Runtime
439+
"org.apache.logging.log4j" % "log4j-core" % "2.23.1" % Runtime
440440
),
441441
libraryDependencies += osLibDep
442442
)
@@ -464,7 +464,7 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
464464
"org.testcontainers" % "pulsar" % "1.19.7" % IntegrationTest
465465
),
466466
libraryDependencies ++= Seq(
467-
"software.amazon.awssdk" % "s3" % "2.24.13"
467+
"software.amazon.awssdk" % "s3" % "2.25.9"
468468
),
469469
libraryDependencies ++= Seq(
470470
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.674" % IntegrationTest,
@@ -482,7 +482,7 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
482482
val spireVersion = "0.18.0"
483483
val kafkaVersion = "7.6.0-ce"
484484
val pureconfigVersion = "0.17.6"
485-
val jackSonVersion = "2.16.1"
485+
val jackSonVersion = "2.16.2"
486486
val log4jApiScalaVersion = "13.1.0"
487487
val log4jVersion = "2.20.0"
488488
val avro4sVersion = "4.1.2"

‎play-scala/application-tests/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ scalaVersion := ScalaVersions.scala2Version
99

1010
libraryDependencies += guice
1111
libraryDependencies += "com.h2database" % "h2" % "1.4.200"
12-
libraryDependencies += "org.postgresql" % "postgresql" % "42.2.28"
12+
libraryDependencies += "org.postgresql" % "postgresql" % "42.2.29"
1313
libraryDependencies += "org.playframework" %% "play-slick" % "6.1.0"
1414
libraryDependencies += "org.playframework" %% "play-slick-evolutions" % "6.1.0"
1515
libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test

‎scala-with-maven/hello-rest/pom.xml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>com.baeldung</groupId>
9+
<artifactId>scala-with-maven</artifactId>
10+
<version>${revision}</version>
11+
<relativePath>../pom.xml</relativePath>
12+
</parent>
13+
14+
<artifactId>hello-rest</artifactId>
15+
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.scala-lang</groupId>
20+
<artifactId>scala3-library_3</artifactId>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.scalatest</groupId>
24+
<artifactId>scalatest_3</artifactId>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.typelevel</groupId>
28+
<artifactId>cats-effect_3</artifactId>
29+
<version>3.5.4</version> <!-- Use the latest version -->
30+
</dependency>
31+
<dependency>
32+
<groupId>org.http4s</groupId>
33+
<artifactId>http4s-blaze-server_3</artifactId>
34+
<version>1.0.0-M39</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.http4s</groupId>
38+
<artifactId>http4s-dsl_3</artifactId>
39+
<version>1.0.0-M41</version>
40+
</dependency>
41+
</dependencies>
42+
43+
</project>

‎scala-with-maven/hello-rest/src/main/scala/HelloRest.scala

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import org.http4s.HttpRoutes
2+
import org.http4s.dsl.io._
3+
import cats.effect._
4+
5+
val helloWorldService = HttpRoutes.of[IO] {
6+
case GET -> Root / "hello" => Ok("Hello, World!")
7+
}

‎scala-with-maven/hello-world/pom.xml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>com.baeldung</groupId>
9+
<artifactId>scala-with-maven</artifactId>
10+
<version>${revision}</version>
11+
<relativePath>../pom.xml</relativePath>
12+
</parent>
13+
14+
<artifactId>hello-world</artifactId>
15+
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.scala-lang</groupId>
20+
<artifactId>scala3-library_3</artifactId>
21+
<version>${scala.version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.scalatest</groupId>
25+
<artifactId>scalatest_3</artifactId>
26+
<version>3.2.18</version>
27+
<scope>test</scope>
28+
</dependency>
29+
</dependencies>
30+
31+
<build>
32+
<sourceDirectory>src/main/scala</sourceDirectory>
33+
<testSourceDirectory>src/tests/scala</testSourceDirectory>
34+
<plugins>
35+
<plugin>
36+
<groupId>net.alchim31.maven</groupId>
37+
<artifactId>scala-maven-plugin</artifactId>
38+
<version>4.8.1</version>
39+
<configuration>
40+
<recompileMode>incremental</recompileMode>
41+
<scalaVersion>${scala.version}</scalaVersion>
42+
<javacArgs>
43+
<javacArg>-Xlint:unchecked</javacArg>
44+
<javacArg>-Xlint:deprecation</javacArg>
45+
</javacArgs>
46+
</configuration>
47+
<executions>
48+
<execution>
49+
<goals>
50+
<goal>compile</goal>
51+
<goal>testCompile</goal>
52+
</goals>
53+
</execution>
54+
</executions>
55+
</plugin>
56+
<plugin>
57+
<groupId>org.scalatest</groupId>
58+
<artifactId>scalatest-maven-plugin</artifactId>
59+
<version>2.2.0</version>
60+
<executions>
61+
<execution>
62+
<goals>
63+
<goal>test</goal>
64+
</goals>
65+
</execution>
66+
</executions>
67+
</plugin>
68+
</plugins>
69+
</build>
70+
</project>

‎scala-with-maven/hello-world/src/main/scala/HelloWorld.scala

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.baeldung.scalawithmaven
2+
3+
object HelloWorld {
4+
5+
def message: String = "Hello, World!"
6+
7+
def main(args: Array[String]): Unit = println(message)
8+
9+
}

‎scala-with-maven/hello-world/src/tests/scala/HelloWorldSpec.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.baeldung.scalawithmaven
2+
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
5+
6+
class HelloWorldSpec extends AnyFlatSpec with Matchers {
7+
8+
"The HelloWorld object" should "say hello" in {
9+
val greeting = HelloWorld.message
10+
greeting shouldEqual "Hello, World!"
11+
}
12+
}

‎scala-with-maven/pom.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>com.baeldung</groupId>
8+
<artifactId>scala-with-maven</artifactId>
9+
<version>${revision}</version>
10+
<packaging>pom</packaging>
11+
12+
<properties>
13+
<revision>1.0-SNAPSHOT</revision>
14+
<scala.version>3.4.0</scala.version>
15+
</properties>
16+
17+
<dependencyManagement>
18+
<dependencies>
19+
<dependency>
20+
<groupId>org.scala-lang</groupId>
21+
<artifactId>scala3-library_3</artifactId>
22+
<version>${scala.version}</version>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.scalatest</groupId>
26+
<artifactId>scalatest_3</artifactId>
27+
<version>3.2.18</version>
28+
<scope>test</scope>
29+
</dependency>
30+
</dependencies>
31+
</dependencyManagement>
32+
33+
<modules>
34+
<module>hello-world</module>
35+
<module>hello-rest</module>
36+
</modules>
37+
</project>

‎scalatra/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ libraryDependencies ++= Seq(
1414
"org.scalatra" %% "scalatra-auth" % ScalatraVersion,
1515
"org.scalatra" %% "scalatra-json" % "2.8.4",
1616
"org.json4s" %% "json4s-jackson" % "4.0.7",
17-
"com.typesafe.slick" %% "slick" % "3.4.1",
17+
"com.typesafe.slick" %% "slick" % "3.5.0",
1818
"com.h2database" % "h2" % "2.1.214",
1919
"com.mchange" % "c3p0" % "0.10.0"
2020
)

0 commit comments

Comments
 (0)