From 4aa6fd59cdb3c3d5c9f4fb308c27cebd8eca79c3 Mon Sep 17 00:00:00 2001 From: linxin Date: Wed, 3 Apr 2019 20:58:58 +0800 Subject: [PATCH] Release/1.5.4 (#146) * Dev 1.5.3 (#129) * Make getAfterRun un-block avoid deadlock. (#107) * update readme * Timeout object no longer references RemotingCommand * remove strongly of sofahessian * update readme * remove reference of request * remove ci jdk1.6 * fix https://github.com/alipay/sofa-bolt/issues/143 (#144) * update version to 1.5.4 * upgrade version to 1.5.4 --- README.md | 2 +- pom.xml | 2 +- .../java/com/alipay/remoting/DefaultConnectionManager.java | 4 ++-- src/main/java/com/alipay/remoting/Url.java | 4 ++-- .../com/alipay/remoting/rpc/protocol/RpcCommandDecoderV2.java | 4 ++-- .../com/alipay/remoting/rpc/protocol/RpcCommandEncoderV2.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 9c93d179..5d720e72 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://travis-ci.org/alipay/sofa-bolt.svg?branch=master)](https://travis-ci.org/alipay/sofa-bolt) [![Coverage Status](https://codecov.io/gh/alipay/sofa-bolt/branch/master/graph/badge.svg)](https://codecov.io/gh/alipay/sofa-bolt) ![license](https://img.shields.io/badge/license-Apache--2.0-green.svg) -![version](https://img.shields.io/badge/bolt-1.5.3-blue.svg) +![version](https://img.shields.io/maven-central/v/com.alipay.sofa/bolt.svg?label=bolt) # 1. 介绍 SOFABolt 是蚂蚁金融服务集团开发的一套基于 Netty 实现的网络通信框架。 diff --git a/pom.xml b/pom.xml index 55e7354d..949b9491 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.alipay.sofa bolt - 1.5.3 + 1.5.4 jar ${project.groupId}:${project.artifactId} diff --git a/src/main/java/com/alipay/remoting/DefaultConnectionManager.java b/src/main/java/com/alipay/remoting/DefaultConnectionManager.java index d80e0037..60520e05 100644 --- a/src/main/java/com/alipay/remoting/DefaultConnectionManager.java +++ b/src/main/java/com/alipay/remoting/DefaultConnectionManager.java @@ -32,8 +32,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import com.alipay.remoting.log.BoltLoggerFactory; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.alipay.remoting.config.ConfigManager; import com.alipay.remoting.config.switches.GlobalSwitch; @@ -56,7 +56,7 @@ public class DefaultConnectionManager implements ConnectionManager, ConnectionHe /** * logger */ - private static final Logger logger = LoggerFactory + private static final Logger logger = BoltLoggerFactory .getLogger("CommonDefault"); /** diff --git a/src/main/java/com/alipay/remoting/Url.java b/src/main/java/com/alipay/remoting/Url.java index 2605bfa5..c0cbe798 100644 --- a/src/main/java/com/alipay/remoting/Url.java +++ b/src/main/java/com/alipay/remoting/Url.java @@ -20,8 +20,8 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; +import com.alipay.remoting.log.BoltLoggerFactory; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.alipay.remoting.config.Configs; import com.alipay.remoting.rpc.protocol.RpcProtocolV2; @@ -265,7 +265,7 @@ public String toString() { public static volatile boolean isCollected = false; /** logger */ - private static final Logger logger = LoggerFactory + private static final Logger logger = BoltLoggerFactory .getLogger("RpcRemoting"); /** diff --git a/src/main/java/com/alipay/remoting/rpc/protocol/RpcCommandDecoderV2.java b/src/main/java/com/alipay/remoting/rpc/protocol/RpcCommandDecoderV2.java index ec4cab9c..7e86ec71 100644 --- a/src/main/java/com/alipay/remoting/rpc/protocol/RpcCommandDecoderV2.java +++ b/src/main/java/com/alipay/remoting/rpc/protocol/RpcCommandDecoderV2.java @@ -19,8 +19,8 @@ import java.net.InetSocketAddress; import java.util.List; +import com.alipay.remoting.log.BoltLoggerFactory; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.alipay.remoting.CommandCode; import com.alipay.remoting.CommandDecoder; @@ -44,7 +44,7 @@ */ public class RpcCommandDecoderV2 implements CommandDecoder { - private static final Logger logger = LoggerFactory.getLogger("RpcRemoting"); + private static final Logger logger = BoltLoggerFactory.getLogger("RpcRemoting"); private int lessLen; diff --git a/src/main/java/com/alipay/remoting/rpc/protocol/RpcCommandEncoderV2.java b/src/main/java/com/alipay/remoting/rpc/protocol/RpcCommandEncoderV2.java index 2bba03ba..cfbc4db2 100644 --- a/src/main/java/com/alipay/remoting/rpc/protocol/RpcCommandEncoderV2.java +++ b/src/main/java/com/alipay/remoting/rpc/protocol/RpcCommandEncoderV2.java @@ -18,8 +18,8 @@ import java.io.Serializable; +import com.alipay.remoting.log.BoltLoggerFactory; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.alipay.remoting.CommandEncoder; import com.alipay.remoting.Connection; @@ -41,7 +41,7 @@ */ public class RpcCommandEncoderV2 implements CommandEncoder { /** logger */ - private static final Logger logger = LoggerFactory.getLogger("RpcRemoting"); + private static final Logger logger = BoltLoggerFactory.getLogger("RpcRemoting"); /** * @see CommandEncoder#encode(ChannelHandlerContext, Serializable, ByteBuf)