Skip to content

Commit f4847d0

Browse files
authored
Merge pull request #1432 from rumakt/bump-dependecy-versions
Bump the dependencies versions
2 parents 57395d6 + e43cf2f commit f4847d0

File tree

6 files changed

+41
-12
lines changed

6 files changed

+41
-12
lines changed

example/rest-api/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@
2020
<dependency>
2121
<groupId>com.softwaremill.sttp.client4</groupId>
2222
<artifactId>core_2.13</artifactId>
23-
<version>4.0.0-M9</version>
23+
<version>4.0.0-M16</version>
24+
<exclusions>
25+
<exclusion>
26+
<groupId>org.scala-lang</groupId>
27+
<artifactId>scala-library</artifactId>
28+
</exclusion>
29+
</exclusions>
2430
</dependency>
2531
</dependencies>
2632

example/rest-api/src/main/scala/org/finos/vuu/example/rest/client/StubbedBackend.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package org.finos.vuu.example.rest.client
33
import org.finos.toolbox.json.JsonUtil
44
import org.finos.vuu.example.rest.model.RandomInstrument
55
import sttp.client4.{Response, SyncBackend}
6-
import sttp.client4.testing.SyncBackendStub
6+
import sttp.client4.testing.{ResponseStub, SyncBackendStub}
77
import sttp.model.Method
88

99
object StubbedBackend {
@@ -14,7 +14,7 @@ object StubbedBackend {
1414
.whenRequestMatches(req => req.method == Method.GET && req.uri.path.endsWith(List("instruments")))
1515
.thenRespondF(req => {
1616
val limit = req.uri.params.get("limit").flatMap(_.toIntOption).getOrElse(DEFAULT_LIMIT)
17-
Response.ok(JsonUtil.toRawJson(RandomInstrument.create(size = limit)))
17+
ResponseStub.ok(JsonUtil.toRawJson(RandomInstrument.create(size = limit)))
1818
})
1919
.whenAnyRequest.thenRespondNotFound()
2020
}

pom.xml

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,21 @@
6868
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6969
<maven.compiler.source>11</maven.compiler.source>
7070
<maven.compiler.target>11</maven.compiler.target>
71-
<scala.version>2.13.10</scala.version>
71+
<scala.version>2.13.14</scala.version>
7272
<metrics.version>4.2.5</metrics.version>
7373
<curator.version>3.1.0</curator.version>
74-
<scalatest.version>3.2.9</scalatest.version>
75-
<scalamock.version>5.2.0</scalamock.version>
74+
<scalatest.version>3.2.19</scalatest.version>
75+
<scalamock.version>6.0.0</scalamock.version>
7676
<scala.logging>3.9.5</scala.logging>
77-
<jackson.version>2.15.4</jackson.version>
77+
<jackson.version>2.17.2</jackson.version>
7878
<aeron.version>1.17.0</aeron.version>
7979
<antlr.version>4.11.1</antlr.version>
8080
<netty.version>4.1.100.Final</netty.version>
8181
<maven.scala.plugin>2.15.2</maven.scala.plugin>
8282
<vertx.version>4.4.6</vertx.version>
8383
<typesafe.conf.version>1.4.2</typesafe.conf.version>
84-
<logback.version>1.3.12</logback.version>
85-
<slf4j.version>2.0.11</slf4j.version>
84+
<logback.version>1.5.6</logback.version>
85+
<slf4j.version>2.0.13</slf4j.version>
8686
<jmh.version>1.36</jmh.version>
8787
<guava.version>32.0.1-jre</guava.version>
8888
<maven.gpg.plugin.version>3.1.0</maven.gpg.plugin.version>
@@ -193,6 +193,12 @@
193193
<artifactId>scalamock_2.13</artifactId>
194194
<version>${scalamock.version}</version>
195195
<scope>test</scope>
196+
<exclusions>
197+
<exclusion>
198+
<groupId>org.scala-lang</groupId>
199+
<artifactId>scala-library</artifactId>
200+
</exclusion>
201+
</exclusions>
196202
</dependency>
197203

198204
</dependencies>
@@ -283,6 +289,16 @@
283289

284290
</plugins>
285291
</pluginManagement>
286-
292+
<plugins>
293+
<plugin>
294+
<groupId>org.apache.maven.plugins</groupId>
295+
<artifactId>maven-compiler-plugin</artifactId>
296+
<version>3.13.0</version>
297+
<configuration>
298+
<source>${maven.compiler.source}</source>
299+
<release>${maven.compiler.target}</release>
300+
</configuration>
301+
</plugin>
302+
</plugins>
287303
</build>
288304
</project>

toolbox/src/main/scala/org/finos/toolbox/json/JsonUtil.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.finos.toolbox.json
22

3-
import com.fasterxml.jackson.core.JsonParser
3+
import com.fasterxml.jackson.core.{JsonParser, StreamReadFeature}
44
import com.fasterxml.jackson.databind.json.JsonMapper
55
import com.fasterxml.jackson.module.scala.{ClassTagExtensions, DefaultScalaModule, JavaTypeable}
66

vuu/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@
8181
<groupId>com.typesafe.scala-logging</groupId>
8282
<artifactId>scala-logging_2.13</artifactId>
8383
<version>${scala.logging}</version>
84+
<exclusions>
85+
<exclusion>
86+
<groupId>org.scala-lang</groupId>
87+
<artifactId>scala-library</artifactId>
88+
</exclusion>
89+
</exclusions>
8490
</dependency>
8591

8692
<dependency>

vuu/src/test/scala/org/finos/vuu/core/table/TableContainerTest.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import org.finos.vuu.viewport.ViewPortTable
1010
import org.scalamock.scalatest.MockFactory
1111
import org.scalatest.BeforeAndAfterEach
1212
import org.scalatest.featurespec.AnyFeatureSpec
13+
import org.scalatest.flatspec.AnyFlatSpec
1314
import org.scalatest.matchers.should.Matchers
1415

1516
class TableContainerTest extends AnyFeatureSpec with Matchers with BeforeAndAfterEach {
@@ -78,7 +79,7 @@ class TableContainerTest extends AnyFeatureSpec with Matchers with BeforeAndAfte
7879

7980
}
8081

81-
object TableMockFactory extends MockFactory {
82+
object TableMockFactory extends AnyFlatSpec with MockFactory {
8283
private def createTestTableDef(name: String, moduleName: Option[String] = None, isSessionDef: Boolean = false): TableDef = {
8384
val tableDef = if (isSessionDef) new SessionTableDef(name, "id", Array.empty, joinFields = Seq.empty, indices = Indices())
8485
else new TableDef(name, "id", Array.empty, Seq.empty, false, VisualLinks(), Indices())

0 commit comments

Comments
 (0)