You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2022/06/12 17:15:42 UTC
svn commit: r1901856 - in /jackrabbit/branches/2.20: ./ jackrabbit-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java jackrabbit-parent/pom.xml
Author: reschke
Date: Sun Jun 12 17:15:41 2022
New Revision: 1901856
URL: http://svn.apache.org/viewvc?rev=1901856&view=rev
Log:
JCR-4778: Update slf4j dependency to 1.7.36 (merged r1899813 into 2.20)
Modified:
jackrabbit/branches/2.20/ (props changed)
jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
jackrabbit/branches/2.20/jackrabbit-parent/pom.xml
Propchange: jackrabbit/branches/2.20/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1899813
Modified: jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java?rev=1901856&r1=1901855&r2=1901856&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java Sun Jun 12 17:15:41 2022
@@ -64,7 +64,7 @@ public class OSGiIT {
mavenBundle("org.osgi", "org.osgi.dto", "1.0.0"),
mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.8.16"),
mavenBundle("org.apache.felix", "org.apache.felix.fileinstall", "3.2.6"),
- mavenBundle("org.slf4j", "slf4j-api", "1.7.35"),
+ mavenBundle("org.slf4j", "slf4j-api", "1.7.36"),
mavenBundle("commons-logging", "commons-logging", "1.2"),
mavenBundle("ch.qos.logback", "logback-core", "1.2.11"),
mavenBundle("ch.qos.logback", "logback-classic", "1.2.11"),
Modified: jackrabbit/branches/2.20/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-parent/pom.xml?rev=1901856&r1=1901855&r2=1901856&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-parent/pom.xml Sun Jun 12 17:15:41 2022
@@ -50,8 +50,8 @@
<jetty.version>9.2.30.v20200428</jetty.version>
<tika.version>2.3.0</tika.version>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
- <slf4j.api.version>1.7.35</slf4j.api.version>
- <slf4j.version>1.7.35</slf4j.version> <!-- sync with logback version -->
+ <slf4j.api.version>1.7.36</slf4j.api.version>
+ <slf4j.version>1.7.36</slf4j.version> <!-- sync with logback version -->
<logback.version>1.2.11</logback.version>
<java.version>1.8</java.version>
<java.version.signature>java18</java.version.signature>