KERNEL-9861 feat: 适配slf4j&&pom修复

base-third-project/base-third-step8/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.fr.third</groupId>
         <artifactId>base-third</artifactId>
-        <version>10.0-FEATURE-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>step8</artifactId>

fine-hibernate/pom.xml

@@ -107,12 +107,12 @@
             <scope>system</scope>
             <systemPath>${basedir}/lib/validation-api-1.1.0.Final.jar</systemPath>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.fr.third</groupId>-->
-<!--            <artifactId>junit</artifactId>-->
-<!--            <version>local</version>-->
-<!--            <scope>system</scope>-->
-<!--            <systemPath>${basedir}/lib/junit-4.12.jar</systemPath>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.fr.third</groupId>
+            <artifactId>junit</artifactId>
+            <version>local</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/junit-4.12.jar</systemPath>
+        </dependency>
     </dependencies>
 </project>

fine-itext/pom.xml

@@ -25,5 +25,15 @@
             <artifactId>fine-icu4j</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fr.third</groupId>
+            <artifactId>fine-bouncycastle</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fr.third</groupId>
+            <artifactId>fine-sun-misc</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 </project>

fine-jedis/src/main/java/com/fr/third/redis/clients/jedis/HostAndPort.java

@@ -3,8 +3,8 @@ package com.fr.third.redis.clients.jedis;
 import java.io.Serializable;
 import java.net.InetAddress;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 public class HostAndPort implements Serializable {
   private static final long serialVersionUID = -519876229978427751L;

fine-jedis/src/main/java/com/fr/third/redis/clients/jedis/JedisSentinelPool.java

@@ -7,8 +7,8 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.fr.third.org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.redis.clients.jedis.exceptions.JedisConnectionException;
 import com.fr.third.redis.clients.jedis.exceptions.JedisException;

fine-kryo/pom.xml

@@ -25,5 +25,10 @@
             <artifactId>fine-sun-misc</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fr.essential</groupId>
+            <artifactId>fine-objenesis</artifactId>
+            <version>${essentialVersion}</version>
+        </dependency>
     </dependencies>
 </project>

fine-redisson/src/main/java/com/fr/third/org/redisson/BaseRemoteService.java

@@ -78,8 +78,8 @@ import com.fr.third.org.redisson.remote.RemoteServiceTimeoutException;
 import com.fr.third.org.redisson.remote.RequestId;
 import com.fr.third.org.redisson.remote.ResponseEntry;
 import com.fr.third.org.redisson.remote.ResponseEntry.Result;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.util.Timeout;

fine-redisson/src/main/java/com/fr/third/org/redisson/MapWriteBehindListener.java

@@ -19,8 +19,8 @@ import java.util.Queue;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.fr.third.org.redisson.command.CommandAsyncExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.FutureListener;

fine-redisson/src/main/java/com/fr/third/org/redisson/QueueTransferTask.java

@@ -27,8 +27,8 @@ import com.fr.third.org.redisson.api.RTopic;
 import com.fr.third.org.redisson.api.listener.BaseStatusListener;
 import com.fr.third.org.redisson.api.listener.MessageListener;
 import com.fr.third.org.redisson.connection.ConnectionManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.util.Timeout;
 import io.netty.util.TimerTask;

fine-redisson/src/main/java/com/fr/third/org/redisson/RedissonBaseAdder.java

@@ -35,8 +35,8 @@ import com.fr.third.org.redisson.client.codec.LongCodec;
 import com.fr.third.org.redisson.command.CommandAsyncExecutor;
 import com.fr.third.org.redisson.misc.RPromise;
 import com.fr.third.org.redisson.misc.RedissonPromise;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.FutureListener;

fine-redisson/src/main/java/com/fr/third/org/redisson/RedissonExecutorService.java

@@ -96,8 +96,8 @@ import com.fr.third.org.redisson.misc.RedissonPromise;
 import com.fr.third.org.redisson.remote.RequestId;
 import com.fr.third.org.redisson.remote.ResponseEntry;
 import com.fr.third.org.redisson.remote.ResponseEntry.Result;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;

fine-redisson/src/main/java/com/fr/third/org/redisson/RedissonLocalCachedMap.java

@@ -97,8 +97,8 @@ import com.fr.third.org.redisson.eviction.EvictionScheduler;
 import com.fr.third.org.redisson.misc.Hash;
 import com.fr.third.org.redisson.misc.RPromise;
 import com.fr.third.org.redisson.misc.RedissonPromise;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

fine-redisson/src/main/java/com/fr/third/org/redisson/RedissonLock.java

@@ -42,8 +42,8 @@ import com.fr.third.org.redisson.command.CommandAsyncExecutor;
 import com.fr.third.org.redisson.misc.RPromise;
 import com.fr.third.org.redisson.misc.RedissonPromise;
 import com.fr.third.org.redisson.pubsub.LockPubSub;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.util.Timeout;
 import io.netty.util.TimerTask;

fine-redisson/src/main/java/com/fr/third/org/redisson/RedissonNode.java

@@ -32,8 +32,8 @@ import com.fr.third.org.redisson.client.RedisConnection;
 import com.fr.third.org.redisson.config.RedissonNodeConfig;
 import com.fr.third.org.redisson.connection.ConnectionManager;
 import com.fr.third.org.redisson.connection.MasterSlaveEntry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.buffer.ByteBufUtil;
 import io.netty.util.internal.PlatformDependent;

fine-redisson/src/main/java/com/fr/third/org/redisson/RedissonRemoteService.java

@@ -75,8 +75,8 @@ import com.fr.third.org.redisson.remote.RemoteServiceRequest;
 import com.fr.third.org.redisson.remote.RemoteServiceResponse;
 import com.fr.third.org.redisson.remote.RequestId;
 import com.fr.third.org.redisson.remote.ResponseEntry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.FutureListener;

fine-redisson/src/main/java/com/fr/third/org/redisson/Version.java

@@ -20,8 +20,8 @@ import java.util.Enumeration;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 public class Version {
 

fine-redisson/src/main/java/com/fr/third/org/redisson/client/handler/CommandDecoder.java

@@ -49,8 +49,8 @@ import com.fr.third.org.redisson.client.protocol.decoder.MultiDecoder;
 import com.fr.third.org.redisson.client.protocol.decoder.SlotsDecoder;
 import com.fr.third.org.redisson.misc.LogHelper;
 import com.fr.third.org.redisson.misc.RPromise;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;

fine-redisson/src/main/java/com/fr/third/org/redisson/client/handler/CommandEncoder.java

@@ -19,8 +19,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.fr.third.org.redisson.client.protocol.CommandData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;

fine-redisson/src/main/java/com/fr/third/org/redisson/client/handler/CommandsQueue.java

@@ -25,8 +25,8 @@ import com.fr.third.org.redisson.client.WriteRedisConnectionException;
 import com.fr.third.org.redisson.client.protocol.CommandData;
 import com.fr.third.org.redisson.client.protocol.QueueCommand;
 import com.fr.third.org.redisson.client.protocol.QueueCommandHolder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelDuplexHandler;

fine-redisson/src/main/java/com/fr/third/org/redisson/client/handler/ConnectionWatchdog.java

@@ -23,8 +23,8 @@ import com.fr.third.org.redisson.client.RedisConnection;
 import com.fr.third.org.redisson.client.RedisPubSubConnection;
 import com.fr.third.org.redisson.client.codec.Codec;
 import com.fr.third.org.redisson.client.protocol.CommandData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;

fine-redisson/src/main/java/com/fr/third/org/redisson/cluster/ClusterConnectionManager.java

@@ -78,8 +78,8 @@ import com.fr.third.org.redisson.connection.SingleEntry;
 import com.fr.third.org.redisson.misc.RPromise;
 import com.fr.third.org.redisson.misc.RedissonPromise;
 import com.fr.third.org.redisson.misc.URIBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.resolver.AddressResolver;
 import io.netty.util.concurrent.Future;

fine-redisson/src/main/java/com/fr/third/org/redisson/command/CommandAsyncService.java

@@ -98,8 +98,8 @@ import com.fr.third.org.redisson.misc.LogHelper;
 import com.fr.third.org.redisson.misc.RPromise;
 import com.fr.third.org.redisson.misc.RedissonObjectFactory;
 import com.fr.third.org.redisson.misc.RedissonPromise;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;

fine-redisson/src/main/java/com/fr/third/org/redisson/command/CommandSyncService.java

@@ -25,8 +25,8 @@ import com.fr.third.org.redisson.api.RFuture;
 import com.fr.third.org.redisson.client.codec.Codec;
 import com.fr.third.org.redisson.client.protocol.RedisCommand;
 import com.fr.third.org.redisson.connection.ConnectionManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 /**
  *

fine-redisson/src/main/java/com/fr/third/org/redisson/config/BaseConfig.java

@@ -17,8 +17,8 @@ package com.fr.third.org.redisson.config;
 
 import java.net.URI;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 /**
  * 

fine-redisson/src/main/java/com/fr/third/org/redisson/connection/ClientConnectionsEntry.java

@@ -33,8 +33,8 @@ import com.fr.third.org.redisson.client.RedisConnection;
 import com.fr.third.org.redisson.client.RedisPubSubConnection;
 import com.fr.third.org.redisson.config.MasterSlaveServersConfig;
 import com.fr.third.org.redisson.pubsub.AsyncSemaphore;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.FutureListener;

fine-redisson/src/main/java/com/fr/third/org/redisson/connection/DNSMonitor.java

@@ -29,8 +29,8 @@ import com.fr.third.org.redisson.client.RedisClient;
 import com.fr.third.org.redisson.api.RFuture;
 import com.fr.third.org.redisson.client.RedisClient;
 import com.fr.third.org.redisson.connection.ClientConnectionsEntry.FreezeReason;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.resolver.AddressResolver;
 import io.netty.resolver.dns.DnsAddressResolverGroup;

fine-redisson/src/main/java/com/fr/third/org/redisson/connection/IdleConnectionWatcher.java

@@ -26,8 +26,8 @@ import com.fr.third.org.redisson.pubsub.AsyncSemaphore;
 import com.fr.third.org.redisson.client.RedisConnection;
 import com.fr.third.org.redisson.config.MasterSlaveServersConfig;
 import com.fr.third.org.redisson.pubsub.AsyncSemaphore;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.channel.ChannelFuture;
 import io.netty.util.concurrent.Future;

fine-redisson/src/main/java/com/fr/third/org/redisson/connection/MasterSlaveConnectionManager.java

@@ -72,8 +72,8 @@ import com.fr.third.org.redisson.misc.RedissonPromise;
 import com.fr.third.org.redisson.misc.URIBuilder;
 import com.fr.third.org.redisson.pubsub.AsyncSemaphore;
 import com.fr.third.org.redisson.pubsub.PublishSubscribeService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.epoll.EpollDatagramChannel;

fine-redisson/src/main/java/com/fr/third/org/redisson/connection/MasterSlaveEntry.java

@@ -64,8 +64,8 @@ import com.fr.third.org.redisson.misc.RPromise;
 import com.fr.third.org.redisson.misc.RedissonPromise;
 import com.fr.third.org.redisson.misc.TransferListener;
 import com.fr.third.org.redisson.misc.URIBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;

fine-redisson/src/main/java/com/fr/third/org/redisson/connection/ReplicatedConnectionManager.java

@@ -40,8 +40,8 @@ import com.fr.third.org.redisson.config.BaseMasterSlaveServersConfig;
 import com.fr.third.org.redisson.config.Config;
 import com.fr.third.org.redisson.config.MasterSlaveServersConfig;
 import com.fr.third.org.redisson.config.ReplicatedServersConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.FutureListener;

fine-redisson/src/main/java/com/fr/third/org/redisson/connection/SentinelConnectionManager.java

@@ -61,8 +61,8 @@ import com.fr.third.org.redisson.connection.ClientConnectionsEntry.FreezeReason;
 import com.fr.third.org.redisson.misc.RPromise;
 import com.fr.third.org.redisson.misc.RedissonPromise;
 import com.fr.third.org.redisson.misc.URIBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.resolver.AddressResolver;
 import io.netty.util.concurrent.Future;

fine-redisson/src/main/java/com/fr/third/org/redisson/connection/balancer/LoadBalancerManager.java

@@ -53,8 +53,8 @@ import com.fr.third.org.redisson.connection.pool.SlaveConnectionPool;
 import com.fr.third.org.redisson.misc.RPromise;
 import com.fr.third.org.redisson.misc.RedissonPromise;
 import com.fr.third.org.redisson.misc.URIBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.util.internal.PlatformDependent;
 

fine-redisson/src/main/java/com/fr/third/org/redisson/connection/pool/ConnectionPool.java

@@ -46,8 +46,8 @@ import com.fr.third.org.redisson.connection.ConnectionManager;
 import com.fr.third.org.redisson.connection.MasterSlaveEntry;
 import com.fr.third.org.redisson.misc.RPromise;
 import com.fr.third.org.redisson.misc.RedissonPromise;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.util.Timeout;
 import io.netty.util.TimerTask;

fine-redisson/src/main/java/com/fr/third/org/redisson/pubsub/PublishSubscribeService.java

@@ -36,8 +36,8 @@ import com.fr.third.org.redisson.connection.MasterSlaveEntry;
 import com.fr.third.org.redisson.connection.PubSubConnectionEntry;
 import com.fr.third.org.redisson.misc.RPromise;
 import com.fr.third.org.redisson.misc.RedissonPromise;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.util.Timeout;
 import io.netty.util.TimerTask;

fine-socketio/src/main/java/com/fr/third/socketio/JsonSupportWrapper.java

@@ -21,8 +21,8 @@ import io.netty.buffer.ByteBufOutputStream;
 import java.io.IOException;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.socketio.protocol.AckArgs;
 import com.fr.third.socketio.protocol.JsonSupport;

fine-socketio/src/main/java/com/fr/third/socketio/SocketIOChannelInitializer.java

@@ -24,8 +24,8 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 
 import com.fr.stable.ArrayUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.socketio.ack.AckManager;
 import com.fr.third.socketio.handler.AuthorizeHandler;

fine-socketio/src/main/java/com/fr/third/socketio/SocketIOServer.java

@@ -36,8 +36,8 @@ import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import io.netty.util.concurrent.GenericFutureListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.socketio.namespace.Namespace;
 import com.fr.third.socketio.namespace.NamespacesHub;

fine-socketio/src/main/java/com/fr/third/socketio/ack/AckManager.java

@@ -22,8 +22,8 @@ import com.fr.third.socketio.scheduler.CancelableScheduler;
 import com.fr.third.socketio.scheduler.SchedulerKey;
 import com.fr.third.socketio.scheduler.SchedulerKey.Type;
 import io.netty.util.internal.PlatformDependent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.Map;

fine-socketio/src/main/java/com/fr/third/socketio/annotation/ScannerEngine.java

@@ -21,8 +21,8 @@ import java.lang.reflect.Modifier;
 import java.util.Arrays;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.socketio.namespace.Namespace;
 

fine-socketio/src/main/java/com/fr/third/socketio/annotation/SpringAnnotationScanner.java

@@ -21,8 +21,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 import com.fr.third.springframework.beans.BeansException;
 import com.fr.third.springframework.beans.factory.config.BeanPostProcessor;
 import com.fr.third.springframework.util.ReflectionUtils;

fine-socketio/src/main/java/com/fr/third/socketio/handler/AuthorizeHandler.java

@@ -26,8 +26,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.socketio.Configuration;
 import com.fr.third.socketio.Disconnectable;

fine-socketio/src/main/java/com/fr/third/socketio/handler/ClientHead.java

@@ -36,8 +36,8 @@ import io.netty.channel.ChannelFutureListener;
 import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.util.AttributeKey;
 import io.netty.util.internal.PlatformDependent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import java.net.SocketAddress;
 import java.util.*;

fine-socketio/src/main/java/com/fr/third/socketio/handler/EncoderHandler.java

@@ -31,8 +31,8 @@ import com.fr.third.socketio.Configuration;
 import com.fr.third.socketio.Transport;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.socketio.messages.HttpErrorMessage;
 import com.fr.third.socketio.messages.HttpMessage;

fine-socketio/src/main/java/com/fr/third/socketio/handler/InPacketHandler.java

@@ -21,8 +21,8 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.util.CharsetUtil;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.socketio.listener.ExceptionListener;
 import com.fr.third.socketio.messages.PacketsMessage;

fine-socketio/src/main/java/com/fr/third/socketio/handler/WrongUrlHandler.java

@@ -17,8 +17,8 @@ package com.fr.third.socketio.handler;
 
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;

fine-socketio/src/main/java/com/fr/third/socketio/listener/DefaultExceptionListener.java

@@ -19,8 +19,8 @@ import io.netty.channel.ChannelHandlerContext;
 
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.socketio.SocketIOClient;
 

fine-socketio/src/main/java/com/fr/third/socketio/protocol/JacksonJsonSupport.java

@@ -28,8 +28,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.socketio.AckCallback;
 import com.fr.third.socketio.MultiTypeAckCallback;

fine-socketio/src/main/java/com/fr/third/socketio/store/pubsub/BaseStoreFactory.java

@@ -15,8 +15,8 @@
  */
 package com.fr.third.socketio.store.pubsub;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.socketio.handler.AuthorizeHandler;
 import com.fr.third.socketio.handler.ClientHead;

fine-socketio/src/main/java/com/fr/third/socketio/transport/NamespaceClient.java

@@ -21,8 +21,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.socketio.AckCallback;
 import com.fr.third.socketio.HandshakeData;

fine-socketio/src/main/java/com/fr/third/socketio/transport/PollingTransport.java

@@ -31,8 +31,8 @@ import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.codec.http.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.List;

fine-socketio/src/main/java/com/fr/third/socketio/transport/WebSocketTransport.java

@@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit;
 
 import com.fr.third.socketio.protocol.Packet;
 import com.fr.third.socketio.protocol.PacketType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;
 
 import com.fr.third.socketio.Configuration;
 import com.fr.third.socketio.SocketIOChannelInitializer;

fine-spring/pom.xml

@@ -39,6 +39,12 @@
             <groupId>com.fr.third</groupId>
             <artifactId>fine-commons-fileupload</artifactId>
             <version>${revision}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fr.third</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fr.essential</groupId>
@@ -320,6 +326,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
+            <version>local</version>
             <scope>system</scope>
             <systemPath>${basedir}/lib/jackson-dataformat-xml-2.8.11.jar</systemPath>
         </dependency>