Merge branch '2.x' of https://github.com/seata/seata into dev-mlv-com…

…plete-v1

# Conflicts:
#	core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Decoder.java
#	core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Encoder.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/AbstractNettyRemoting.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/CompatibleProtocolDecoder.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/CompatibleProtocolEncoder.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/NettyClientBootstrap.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/ProtocolDecoder.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/ProtocolEncoder.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/ProtocolRpcMessage.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/v0/MessageCodecV0.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/v0/ProtocolConstantsV0.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/v0/ProtocolDecoderV0.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/v0/ProtocolEncoderV0.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/v0/ProtocolRpcMessageV0.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/v1/ProtocolDecoderV1.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/v1/ProtocolEncoderV1.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/v1/ProtocolRpcMessageV1.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/v1/ProtocolV1Decoder.java
#	core/src/main/java/org/apache/seata/core/rpc/netty/v1/ProtocolV1Encoder.java
#	test/src/test/java/org/apache/seata/core/rpc/netty/v1/ProtocolV1Client.java
#	test/src/test/java/org/apache/seata/core/rpc/netty/v1/ProtocolV1Server.java

core/src/main/java/org/apache/seata/core/rpc/netty/CompatibleProtocolDecoder.java

@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.seata.core.rpc.netty;
+package org.apache.seata.core.rpc.netty;
 
 import com.google.common.collect.ImmutableMap;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
-import io.seata.core.exception.DecodeException;
-import io.seata.core.protocol.ProtocolConstants;
-import io.seata.core.rpc.netty.v0.ProtocolDecoderV0;
-import io.seata.core.rpc.netty.v1.ProtocolDecoderV1;
+import org.apache.seata.core.exception.DecodeException;
+import org.apache.seata.core.protocol.ProtocolConstants;
+import org.apache.seata.core.rpc.netty.v0.ProtocolDecoderV0;
+import org.apache.seata.core.rpc.netty.v1.ProtocolDecoderV1;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/org/apache/seata/core/rpc/netty/CompatibleProtocolEncoder.java

@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.seata.core.rpc.netty;
+package org.apache.seata.core.rpc.netty;
 
 import com.google.common.collect.ImmutableMap;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
-import io.seata.core.protocol.ProtocolConstants;
-import io.seata.core.protocol.RpcMessage;
-import io.seata.core.protocol.Version;
-import io.seata.core.rpc.netty.v0.ProtocolEncoderV0;
-import io.seata.core.rpc.netty.v1.ProtocolEncoderV1;
+import org.apache.seata.core.protocol.ProtocolConstants;
+import org.apache.seata.core.protocol.RpcMessage;
+import org.apache.seata.core.protocol.Version;
+import org.apache.seata.core.rpc.netty.v0.ProtocolEncoderV0;
+import org.apache.seata.core.rpc.netty.v1.ProtocolEncoderV1;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/org/apache/seata/core/rpc/netty/ProtocolDecoder.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.seata.core.rpc.netty;
+package org.apache.seata.core.rpc.netty;
 
 import io.netty.buffer.ByteBuf;
 

core/src/main/java/org/apache/seata/core/rpc/netty/ProtocolEncoder.java

@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.seata.core.rpc.netty;
+package org.apache.seata.core.rpc.netty;
 
 import io.netty.buffer.ByteBuf;
-import io.seata.core.protocol.RpcMessage;
+import org.apache.seata.core.protocol.RpcMessage;
 
 /**
  * the protocol encoder

core/src/main/java/org/apache/seata/core/rpc/netty/v0/MessageCodecV0.java

@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.seata.core.rpc.netty.v0;
+package org.apache.seata.core.rpc.netty.v0;
 
 import io.netty.buffer.ByteBuf;
-import io.seata.core.protocol.MessageTypeAware;
+import org.apache.seata.core.protocol.MessageTypeAware;
 
 /**
  * The interface Message codec.

core/src/main/java/org/apache/seata/core/rpc/netty/v0/ProtocolConstantsV0.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.seata.core.rpc.netty.v0;
+package org.apache.seata.core.rpc.netty.v0;
 
 /**
  * protocol v0 constants

core/src/main/java/org/apache/seata/core/rpc/netty/v0/ProtocolDecoderV0.java

@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.seata.core.rpc.netty.v0;
+package org.apache.seata.core.rpc.netty.v0;
 
 import io.netty.buffer.ByteBuf;
-import io.seata.core.protocol.HeartbeatMessage;
+import org.apache.seata.core.protocol.HeartbeatMessage;
 
-import io.seata.core.protocol.ProtocolConstants;
-import io.seata.core.rpc.netty.ProtocolDecoder;
-import io.seata.core.serializer.Serializer;
-import io.seata.core.serializer.SerializerServiceLoader;
-import io.seata.core.serializer.SerializerType;
+import org.apache.seata.core.protocol.ProtocolConstants;
+import org.apache.seata.core.rpc.netty.ProtocolDecoder;
+import org.apache.seata.core.serializer.Serializer;
+import org.apache.seata.core.serializer.SerializerServiceLoader;
+import org.apache.seata.core.serializer.SerializerType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/org/apache/seata/core/rpc/netty/v0/ProtocolEncoderV0.java

@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.seata.core.rpc.netty.v0;
+package org.apache.seata.core.rpc.netty.v0;
 
 import io.netty.buffer.ByteBuf;
-import io.seata.core.protocol.HeartbeatMessage;
-import io.seata.core.protocol.MessageTypeAware;
-import io.seata.core.protocol.ProtocolConstants;
-import io.seata.core.protocol.RpcMessage;
-import io.seata.core.rpc.netty.ProtocolEncoder;
-import io.seata.core.serializer.Serializer;
-import io.seata.core.serializer.SerializerServiceLoader;
-import io.seata.core.serializer.SerializerType;
+import org.apache.seata.core.protocol.HeartbeatMessage;
+import org.apache.seata.core.protocol.MessageTypeAware;
+import org.apache.seata.core.protocol.ProtocolConstants;
+import org.apache.seata.core.protocol.RpcMessage;
+import org.apache.seata.core.rpc.netty.ProtocolEncoder;
+import org.apache.seata.core.serializer.Serializer;
+import org.apache.seata.core.serializer.SerializerServiceLoader;
+import org.apache.seata.core.serializer.SerializerType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/org/apache/seata/core/rpc/netty/v1/ProtocolDecoderV1.java

@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.seata.core.rpc.netty.v1;
+package org.apache.seata.core.rpc.netty.v1;
 
 import io.netty.buffer.ByteBuf;
-import io.seata.core.compressor.Compressor;
-import io.seata.core.compressor.CompressorFactory;
-import io.seata.core.protocol.HeartbeatMessage;
-import io.seata.core.protocol.ProtocolConstants;
-import io.seata.core.rpc.netty.ProtocolDecoder;
-import io.seata.core.rpc.netty.ProtocolRpcMessage;
-import io.seata.core.serializer.Serializer;
-import io.seata.core.serializer.SerializerServiceLoader;
-import io.seata.core.serializer.SerializerType;
+import org.apache.seata.core.compressor.Compressor;
+import org.apache.seata.core.compressor.CompressorFactory;
+import org.apache.seata.core.protocol.HeartbeatMessage;
+import org.apache.seata.core.protocol.ProtocolConstants;
+import org.apache.seata.core.rpc.netty.ProtocolDecoder;
+import org.apache.seata.core.rpc.netty.ProtocolRpcMessage;
+import org.apache.seata.core.serializer.Serializer;
+import org.apache.seata.core.serializer.SerializerServiceLoader;
+import org.apache.seata.core.serializer.SerializerType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/org/apache/seata/core/rpc/netty/v1/ProtocolEncoderV1.java

@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.seata.core.rpc.netty.v1;
+package org.apache.seata.core.rpc.netty.v1;
 
 import io.netty.buffer.ByteBuf;
-import io.seata.core.rpc.netty.ProtocolEncoder;
-import io.seata.core.serializer.Serializer;
-import io.seata.core.compressor.Compressor;
-import io.seata.core.compressor.CompressorFactory;
-import io.seata.core.protocol.ProtocolConstants;
-import io.seata.core.protocol.RpcMessage;
-import io.seata.core.serializer.SerializerServiceLoader;
-import io.seata.core.serializer.SerializerType;
+import org.apache.seata.core.rpc.netty.ProtocolEncoder;
+import org.apache.seata.core.serializer.Serializer;
+import org.apache.seata.core.compressor.Compressor;
+import org.apache.seata.core.compressor.CompressorFactory;
+import org.apache.seata.core.protocol.ProtocolConstants;
+import org.apache.seata.core.protocol.RpcMessage;
+import org.apache.seata.core.serializer.SerializerServiceLoader;
+import org.apache.seata.core.serializer.SerializerType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;