Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch version upgrades accross the board #2414

Merged
merged 2 commits into from
Sep 16, 2020
Merged

Patch version upgrades accross the board #2414

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bc30ac
Patch version upgrades accross the board
ennru Sep 14, 2020
d2d2e79
Exclude Tinkerpop as it pulls in extremely old versions
ennru Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object Dependencies {

val InfluxDBJavaVersion = "2.15"

val AwsSdk2Version = "2.11.3"
val AwsSdk2Version = "2.11.14"
val AwsSpiAkkaHttpVersion = "0.0.9"
// Sync with plugins.sbt
val AkkaGrpcBinaryVersion = "1.0"
Expand All @@ -28,13 +28,13 @@ object Dependencies {
val ScalaTestVersion = "3.2.2"
val mockitoVersion = "3.4.6" // check even https://github.com/scalatest/scalatestplus-mockito/releases

val CouchbaseVersion = "2.7.13"
val CouchbaseVersion = "2.7.16"
val CouchbaseVersionForDocs = "2.7"

val JwtCoreVersion = "3.0.1"

val log4jOverSlf4jVersion = "1.7.30"
val jclOverSlf4jVersion = "1.7.29"
val jclOverSlf4jVersion = "1.7.30"

// Allows to silence scalac compilation warnings selectively by code block or file path
// This is only compile time dependency, therefore it does not affect the generated bytecode
Expand Down Expand Up @@ -163,7 +163,7 @@ object Dependencies {

val Elasticsearch = Seq(
libraryDependencies ++= Seq(
"org.elasticsearch.client" % "elasticsearch-rest-client" % "6.3.1", // ApacheV2
"org.elasticsearch.client" % "elasticsearch-rest-client" % "6.3.2", // ApacheV2
"io.spray" %% "spray-json" % "1.3.5", // ApacheV2
"org.slf4j" % "jcl-over-slf4j" % jclOverSlf4jVersion % Test
) ++ JacksonDatabindDependencies
Expand All @@ -177,12 +177,12 @@ object Dependencies {

val AvroParquet = Seq(
libraryDependencies ++= Seq(
"org.apache.parquet" % "parquet-avro" % "1.10.0", //Apache2
"org.apache.parquet" % "parquet-avro" % "1.10.1", //Apache2
"org.apache.hadoop" % "hadoop-client" % "3.2.1" % Test exclude ("log4j", "log4j"), //Apache2
"org.apache.hadoop" % "hadoop-common" % "3.2.1" % Test exclude ("log4j", "log4j"), //Apache2
"com.sksamuel.avro4s" %% "avro4s-core" % "3.0.0" % Test,
"org.scalacheck" %% "scalacheck" % "1.14.1" % Test,
"org.specs2" %% "specs2-core" % "4.8.0" % Test, //MIT like: https://github.com/etorreborre/specs2/blob/master/LICENSE.txt
"com.sksamuel.avro4s" %% "avro4s-core" % "3.0.9" % Test,
"org.scalacheck" %% "scalacheck" % "1.14.3" % Test,
"org.specs2" %% "specs2-core" % "4.8.3" % Test, //MIT like: https://github.com/etorreborre/specs2/blob/master/LICENSE.txt
"org.slf4j" % "log4j-over-slf4j" % log4jOverSlf4jVersion % Test // MIT like: http://www.slf4j.org/license.html
)
)
Expand Down Expand Up @@ -212,7 +212,7 @@ object Dependencies {
"com.typesafe.akka" %% "akka-http" % AkkaHttpVersion,
"com.typesafe.akka" %% "akka-http-spray-json" % AkkaHttpVersion,
"com.pauldijou" %% "jwt-core" % JwtCoreVersion, //ApacheV2
"io.specto" % "hoverfly-java" % "0.12.2" % Test //ApacheV2
"io.specto" % "hoverfly-java" % "0.12.3" % Test //ApacheV2
) ++ Mockito
)

Expand Down Expand Up @@ -255,8 +255,8 @@ object Dependencies {
)

val HBase = {
val hbaseVersion = "1.4.9"
val hadoopVersion = "2.7.4"
val hbaseVersion = "1.4.13"
val hadoopVersion = "2.7.7"
Seq(
libraryDependencies ++= Seq(
"org.apache.hbase" % "hbase-shaded-client" % hbaseVersion exclude ("log4j", "log4j") exclude ("org.slf4j", "slf4j-log4j12"), // ApacheV2,
Expand Down Expand Up @@ -296,9 +296,9 @@ object Dependencies {
val Jms = Seq(
libraryDependencies ++= Seq(
"javax.jms" % "jms" % "1.1" % Provided, // CDDL + GPLv2
"com.ibm.mq" % "com.ibm.mq.allclient" % "9.1.3.0" % Test, // IBM International Program License Agreement https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/maven/licenses/L-APIG-AZYF2E/LI_en.html
"org.apache.activemq" % "activemq-broker" % "5.15.9" % Test, // ApacheV2
"org.apache.activemq" % "activemq-client" % "5.15.9" % Test, // ApacheV2
"com.ibm.mq" % "com.ibm.mq.allclient" % "9.2.0.0" % Test, // IBM International Program License Agreement https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/maven/licenses/L-APIG-AZYF2E/LI_en.html
"org.apache.activemq" % "activemq-broker" % "5.16.0" % Test, // ApacheV2
"org.apache.activemq" % "activemq-client" % "5.16.0" % Test, // ApacheV2
"io.github.sullis" %% "jms-testkit" % "0.2.8" % Test // ApacheV2
) ++ Mockito,
// Having JBoss as a first resolver is a workaround for https://github.com/coursier/coursier/issues/200
Expand Down Expand Up @@ -347,7 +347,7 @@ object Dependencies {

val Mqtt = Seq(
libraryDependencies ++= Seq(
"org.eclipse.paho" % "org.eclipse.paho.client.mqttv3" % "1.2.2" // Eclipse Public License 1.0
"org.eclipse.paho" % "org.eclipse.paho.client.mqttv3" % "1.2.5" // Eclipse Public License 1.0
)
)

Expand All @@ -362,8 +362,9 @@ object Dependencies {

val OrientDB = Seq(
libraryDependencies ++= Seq(
"com.orientechnologies" % "orientdb-graphdb" % "3.0.13", // ApacheV2
"com.orientechnologies" % "orientdb-object" % "3.0.13" // ApacheV2
("com.orientechnologies" % "orientdb-graphdb" % "3.0.34")
.exclude("com.tinkerpop.blueprints", "blueprints-core"),
"com.orientechnologies" % "orientdb-object" % "3.0.34" // ApacheV2
)
)

Expand Down Expand Up @@ -398,8 +399,8 @@ object Dependencies {
)

val SpringWeb = {
val SpringVersion = "5.1.4.RELEASE"
val SpringBootVersion = "2.1.2.RELEASE"
val SpringVersion = "5.1.17.RELEASE"
val SpringBootVersion = "2.1.16.RELEASE"
Seq(
libraryDependencies ++= Seq(
"org.springframework" % "spring-core" % SpringVersion,
Expand All @@ -412,7 +413,7 @@ object Dependencies {
)
}

val SlickVersion = "3.3.2"
val SlickVersion = "3.3.3"
val Slick = Seq(
libraryDependencies ++= Seq(
"com.typesafe.slick" %% "slick" % SlickVersion, // BSD 2-clause "Simplified" License
Expand Down Expand Up @@ -452,7 +453,7 @@ object Dependencies {
++ Mockito
)

val SolrjVersion = "7.7.2"
val SolrjVersion = "7.7.3"
val SolrVersionForDocs = "7_7"

val Solr = Seq(
Expand Down