Author: adulceanu
Date: Wed Sep 23 14:28:39 2020
New Revision: 1881957
URL: http://svn.apache.org/viewvc?rev=1881957&view=rev
Log:
OAK-9218 - Fix OSGi wiring after netty update to 4.1.52.Final
Merge revision 1881903 from trunk
Modified:
jackrabbit/oak/branches/1.22/oak-segment-tar/pom.xml
Modified: jackrabbit/oak/branches/1.22/oak-segment-tar/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.22/oak-segment-tar/pom.xml?rev=1881957&r1=1881956&r2=1881957&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.22/oak-segment-tar/pom.xml (original)
+++ jackrabbit/oak/branches/1.22/oak-segment-tar/pom.xml Wed Sep 23 14:28:39
2020
@@ -63,15 +63,20 @@
com.ning.compress;version="[1.0,2)";resolution:=optional,
com.ning.compress.lzf;version="[1.0,2)";resolution:=optional,
com.ning.compress.lzf.util;version="[1.0,2)";resolution:=optional,
+ com.oracle.svm.core.annotate;resolution:=optional,
io.netty.internal.tcnative;version="[2.0,3)";resolution:=optional,
javax.security.cert;resolution:=optional,
lzma.sdk;resolution:=optional,
lzma.sdk.lzma;resolution:=optional,
net.jpountz.lz4;resolution:=optional,
net.jpountz.xxhash;resolution:=optional,
+ reactor.blockhound;resolution:=optional,
+
reactor.blockhound.integration;resolution:=optional,
org.apache.commons.logging;resolution:=optional;version="[1.2,2)",
org.apache.log4j;resolution:=optional;version="[1.2,2)",
org.apache.logging.log4j;resolution:=optional;version="[2.6,3)",
+
org.apache.logging.log4j.message;resolution:=optional,
+ org.apache.logging.log4j.spi;resolution:=optional,
org.bouncycastle.asn1.x500;version="[1.54,2)";resolution:=optional,
org.bouncycastle.cert;version="[1.54,2)";resolution:=optional,
org.bouncycastle.cert.jcajce;version="[1.54,2)";resolution:=optional,
@@ -84,6 +89,7 @@
org.jboss.marshalling;resolution:=optional,
sun.misc;resolution:=optional,
sun.nio.ch;resolution:=optional,
+ sun.security.ssl;resolution:=optional,
sun.security.util;resolution:=optional,
sun.security.x509;resolution:=optional,
*
