From 679977c931500b7c8240021f84267f9e213fc800 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Oct 2020 11:29:35 +0100 Subject: [PATCH] Update slf4j to 1.7.30 Bug: 566475 Change-Id: Ia3e5b72d53ead435e4677e46c73a3ff45a606b41 Signed-off-by: Matthias Sohn --- WORKSPACE | 8 ++++---- .../org.eclipse.jgit.target/jgit-4.10.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.11.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.12.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.13.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.14.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.15.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.16.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.17-staging.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.6.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.7.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.8.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.9.target | 10 +++++----- .../org.eclipse.jgit.target/orbit/S20201027182932.tpd | 8 ++++---- org.eclipse.jgit.test/build.properties | 2 +- pom.xml | 2 +- 16 files changed, 70 insertions(+), 70 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 9cd666f8e..7651cba4e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -119,14 +119,14 @@ maven_jar( maven_jar( name = "log-api", - artifact = "org.slf4j:slf4j-api:1.7.2", - sha1 = "0081d61b7f33ebeab314e07de0cc596f8e858d97", + artifact = "org.slf4j:slf4j-api:1.7.30", + sha1 = "b5a4b6d16ab13e34a88fae84c35cd5d68cac922c", ) maven_jar( name = "slf4j-simple", - artifact = "org.slf4j:slf4j-simple:1.7.2", - sha1 = "760055906d7353ba4f7ce1b8908bc6b2e91f39fa", + artifact = "org.slf4j:slf4j-simple:1.7.30", + sha1 = "e606eac955f55ecf1d8edcccba04eb8ac98088dd", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target index d49ef2f89..6eac67ff0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target @@ -1,7 +1,7 @@ - + @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target index 0482d209f..a3f3013a7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target @@ -1,7 +1,7 @@ - + @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target index 610c2ea9c..451ee96fc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target @@ -1,7 +1,7 @@ - + @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target index 910df388e..b0b791038 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target @@ -1,7 +1,7 @@ - + @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target index 3a1453127..a2e25d5fc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target @@ -1,7 +1,7 @@ - + @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target index 40f0a8229..70f5a8223 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target @@ -1,7 +1,7 @@ - + @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target index 3c1369397..804e96f61 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target @@ -1,7 +1,7 @@ - + @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17-staging.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17-staging.target index 25ce13624..589c7f5d5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17-staging.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17-staging.target @@ -1,7 +1,7 @@ - + @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target index 08ea3e5c9..ac5c0d188 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target @@ -1,7 +1,7 @@ - + @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target index 2611c1654..002f07db7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target @@ -1,7 +1,7 @@ - + @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target index ae1db2c43..c0bc168bd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target @@ -1,7 +1,7 @@ - + @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target index 3c56b6f0e..d45d3367c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target @@ -1,7 +1,7 @@ - + @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20201027182932.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20201027182932.tpd index b88ee21e8..3276402f8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20201027182932.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20201027182932.tpd @@ -57,10 +57,10 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/S202010271829 org.mockito.source [2.23.0.v20200310-1642,2.23.0.v20200310-1642] org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519] org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519] - org.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250] - org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250] - org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200] - org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200] + org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150] + org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150] + org.slf4j.binding.log4j12 [1.7.30.v20201016-1131,1.7.30.v20201016-1131] + org.slf4j.binding.log4j12.source [1.7.30.v20201016-1131,1.7.30.v20201016-1131] org.tukaani.xz [1.8.0.v20180207-1613,1.8.0.v20180207-1613] org.tukaani.xz.source [1.8.0.v20180207-1613,1.8.0.v20180207-1613] } diff --git a/org.eclipse.jgit.test/build.properties b/org.eclipse.jgit.test/build.properties index 7dc26c0b0..b527a7479 100644 --- a/org.eclipse.jgit.test/build.properties +++ b/org.eclipse.jgit.test/build.properties @@ -8,4 +8,4 @@ bin.includes = META-INF/,\ bin-tst/,\ bin/ additional.bundles = org.apache.log4j,\ - org.slf4j.impl.log4j12 + org.slf4j.binding.log4j12 diff --git a/pom.xml b/pom.xml index 73ab76223..4f4ab4202 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ 0.14.3 4.5.10 4.4.12 - 1.7.2 + 1.7.30 1.2.15 3.2.0 1.7.0