Merge pull request #1822 from RongtongJin/fix_1821
[ISSUE #1821]Fix the issue that MessageClientIDSetter#getIPFromID return wrong pid
diff --git a/NOTICE b/NOTICE
index 85e2dc3..65ebdd0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache RocketMQ
-Copyright 2016-2019 The Apache Software Foundation
+Copyright 2016-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/common/src/main/java/org/apache/rocketmq/common/MQVersion.java b/common/src/main/java/org/apache/rocketmq/common/MQVersion.java
index 43b8f9b..baff127 100644
--- a/common/src/main/java/org/apache/rocketmq/common/MQVersion.java
+++ b/common/src/main/java/org/apache/rocketmq/common/MQVersion.java
@@ -18,7 +18,7 @@
public class MQVersion {
- public static final int CURRENT_VERSION = Version.V4_6_1.ordinal();
+ public static final int CURRENT_VERSION = Version.V4_7_0.ordinal();
public static String getVersionDesc(int value) {
int length = Version.values().length;
diff --git a/common/src/test/java/org/apache/rocketmq/common/protocol/NamespaceUtilTest.java b/common/src/test/java/org/apache/rocketmq/common/protocol/NamespaceUtilTest.java
index 1120d9e..7e470d9 100644
--- a/common/src/test/java/org/apache/rocketmq/common/protocol/NamespaceUtilTest.java
+++ b/common/src/test/java/org/apache/rocketmq/common/protocol/NamespaceUtilTest.java
@@ -1,18 +1,20 @@
-/**
- * Copyright (C) 2010-2016 Alibaba Group Holding Limited
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.rocketmq.common.protocol;
import org.apache.rocketmq.common.MixAll;
