aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-03-24 11:21:18 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-03-24 11:33:42 +0100
commit4c2195cc5f5d03902d385a4ef9140a60303be4cb (patch)
treef07d7c667ad16506c8faf707f239224d99c1c66e
parent37a0a9d1eb55e4b343c831d6c58280b93101c4a9 (diff)
Upgrade slf4j dependencies to 1.7.30
Upgrade jcl-over-slf4j to a version that exports common-logging 1.1.3 or newer (1.2 for 1.7.30). Previous version exported 1.1.1 which is older than the version visible through container-dev Maven dependency tree.
-rw-r--r--cloud-tenant-base-dependencies-enforcer/pom.xml2
-rw-r--r--container-dependency-versions/pom.xml2
-rw-r--r--zkfacade/pom.xml2
-rw-r--r--zookeeper-command-line-client/pom.xml2
-rw-r--r--zookeeper-server/zookeeper-server-3.6.2/pom.xml2
5 files changed, 5 insertions, 5 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index ee3ed48318b..ddddab4bf90 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -35,7 +35,7 @@
<junit5.platform.version>1.7.0</junit5.platform.version>
<org.lz4.version>1.7.1</org.lz4.version>
<org.json.version>20090211</org.json.version><!-- TODO Vespa 8: remove as provided dependency -->
- <slf4j.version>1.7.5</slf4j.version>
+ <slf4j.version>1.7.30</slf4j.version>
<tensorflow.version>1.12.0</tensorflow.version>
<xml-apis.version>1.4.01</xml-apis.version>
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index a278421f603..2c5d764c013 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -461,7 +461,7 @@
<jetty.version>9.4.38.v20210224</jetty.version>
<org.lz4.version>1.7.1</org.lz4.version>
<org.json.version>20090211</org.json.version>
- <slf4j.version>1.7.5</slf4j.version>
+ <slf4j.version>1.7.30</slf4j.version>
<xml-apis.version>1.4.01</xml-apis.version>
<!-- These must be kept in sync with version used by current jersey2.version. -->
diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml
index 7563ef068a9..25cc678fe66 100644
--- a/zkfacade/pom.xml
+++ b/zkfacade/pom.xml
@@ -64,7 +64,7 @@
<!-- Needed to have the same version as slf4j-api -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
diff --git a/zookeeper-command-line-client/pom.xml b/zookeeper-command-line-client/pom.xml
index c186b377eb6..50301914e41 100644
--- a/zookeeper-command-line-client/pom.xml
+++ b/zookeeper-command-line-client/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
<build>
diff --git a/zookeeper-server/zookeeper-server-3.6.2/pom.xml b/zookeeper-server/zookeeper-server-3.6.2/pom.xml
index 04f8b012b09..2f0029169ea 100644
--- a/zookeeper-server/zookeeper-server-3.6.2/pom.xml
+++ b/zookeeper-server/zookeeper-server-3.6.2/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
+ <version>${slf4j.version}</version>
</dependency>
<!-- snappy-java and metrics-core are included here
to be able to work with ZooKeeper 3.6.2 due to