Merge branch '6.2.x'
This commit is contained in:
@@ -92,8 +92,6 @@ class BaseDefaultCodecs implements CodecConfigurer.DefaultCodecs, CodecConfigure
|
|||||||
|
|
||||||
private static final boolean protobufPresent;
|
private static final boolean protobufPresent;
|
||||||
|
|
||||||
static final boolean synchronossMultipartPresent;
|
|
||||||
|
|
||||||
static final boolean nettyByteBufPresent;
|
static final boolean nettyByteBufPresent;
|
||||||
|
|
||||||
static final boolean kotlinSerializationCborPresent;
|
static final boolean kotlinSerializationCborPresent;
|
||||||
@@ -109,7 +107,6 @@ class BaseDefaultCodecs implements CodecConfigurer.DefaultCodecs, CodecConfigure
|
|||||||
jackson2SmilePresent = ClassUtils.isPresent("com.fasterxml.jackson.dataformat.smile.SmileFactory", classLoader);
|
jackson2SmilePresent = ClassUtils.isPresent("com.fasterxml.jackson.dataformat.smile.SmileFactory", classLoader);
|
||||||
jaxb2Present = ClassUtils.isPresent("jakarta.xml.bind.Binder", classLoader);
|
jaxb2Present = ClassUtils.isPresent("jakarta.xml.bind.Binder", classLoader);
|
||||||
protobufPresent = ClassUtils.isPresent("com.google.protobuf.Message", classLoader);
|
protobufPresent = ClassUtils.isPresent("com.google.protobuf.Message", classLoader);
|
||||||
synchronossMultipartPresent = ClassUtils.isPresent("org.synchronoss.cloud.nio.multipart.NioMultipartParser", classLoader);
|
|
||||||
nettyByteBufPresent = ClassUtils.isPresent("io.netty.buffer.ByteBuf", classLoader);
|
nettyByteBufPresent = ClassUtils.isPresent("io.netty.buffer.ByteBuf", classLoader);
|
||||||
kotlinSerializationCborPresent = ClassUtils.isPresent("kotlinx.serialization.cbor.Cbor", classLoader);
|
kotlinSerializationCborPresent = ClassUtils.isPresent("kotlinx.serialization.cbor.Cbor", classLoader);
|
||||||
kotlinSerializationJsonPresent = ClassUtils.isPresent("kotlinx.serialization.json.Json", classLoader);
|
kotlinSerializationJsonPresent = ClassUtils.isPresent("kotlinx.serialization.json.Json", classLoader);
|
||||||
|
|||||||
Reference in New Issue
Block a user