skip update version on same value

laowhites · Aug 11, 2021 · 3d44c26 · 3d44c26
1 parent f4f4562
commit 3d44c26
Show file tree

Hide file tree

Showing 40 changed files with 291 additions and 57 deletions.
diff --git a/client/all/pom.xml b/client/all/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>registry-client-all</artifactId>
-    <version>6.0.2</version>
+    <version>6.0.3</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <url>http://github.com/alipay/sofa-registry</url>

diff --git a/client/api/pom.xml b/client/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/client/impl/pom.xml b/client/impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/client/log/pom.xml b/client/log/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/client/pom.xml b/client/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alipay.sofa</groupId>
     <artifactId>registry-parent</artifactId>
-    <version>6.0.2</version>
+    <version>6.0.3</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>

diff --git a/server/common/model/pom.xml b/server/common/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-common</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/common/model/src/main/java/com/alipay/sofa/registry/common/model/ServerDataBox.java b/server/common/model/src/main/java/com/alipay/sofa/registry/common/model/ServerDataBox.java
@@ -23,6 +23,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.util.Arrays;
 
 /**
  * @author zhuoyu.sjw
@@ -212,4 +213,16 @@ public int getSerialization() {
   public void setSerialization(int serial) {
     this.serialization = serial;
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ServerDataBox that = (ServerDataBox) o;
+    return Arrays.equals(bytes, that.bytes);
+  }
 }
diff --git a/server/common/pom.xml b/server/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/common/util/pom.xml b/server/common/util/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-common</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/common/util/src/main/java/com/alipay/sofa/registry/util/CollectionUtils.java b/server/common/util/src/main/java/com/alipay/sofa/registry/util/CollectionUtils.java
@@ -16,6 +16,8 @@
  */
 package com.alipay.sofa.registry.util;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -51,4 +53,27 @@ public static <K, V> Map<K, V> toSingletonMap(Map<K, V> m) {
     Map.Entry<K, V> one = m.entrySet().iterator().next();
     return Collections.singletonMap(one.getKey(), one.getValue());
   }
+
+  /**
+   * compare each item in two List
+   *
+   * @return
+   */
+  public static <T> boolean equals(List<T> coll1, List<T> coll2) {
+    if (coll1 == null) {
+      return coll2 == null;
+    }
+
+    if (coll2 == null || (coll1.size() != coll2.size())) {
+      return false;
+    }
+
+    Collection<T> source = new ArrayList<>(coll1);
+    Collection<T> destination = new ArrayList<>(coll2);
+
+    source.removeAll(coll2);
+    destination.removeAll(coll1);
+
+    return source.isEmpty() && destination.isEmpty();
+  }
 }
diff --git a/server/common/util/src/test/java/com/alipay/sofa/registry/util/CollectionUtilsTest.java b/server/common/util/src/test/java/com/alipay/sofa/registry/util/CollectionUtilsTest.java
@@ -16,6 +16,7 @@
  */
 package com.alipay.sofa.registry.util;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import java.util.*;
 import org.junit.Assert;
@@ -71,4 +72,52 @@ public void testSingleMap() {
     } catch (UnsupportedOperationException exception) {
     }
   }
+
+  @Test
+  public void testEquals() {
+    // false
+    List<String> a = null;
+    List<String> b = Lists.newArrayList();
+    Assert.assertFalse(CollectionUtils.equals(a, b));
+
+    // false
+    a = Lists.newArrayList();
+    b = null;
+    Assert.assertFalse(CollectionUtils.equals(a, b));
+
+    // true
+    a = null;
+    b = null;
+    Assert.assertTrue(CollectionUtils.equals(a, b));
+
+    // true
+    a = Lists.newArrayList();
+    b = Lists.newArrayList();
+    Assert.assertTrue(CollectionUtils.equals(a, b));
+
+    // false
+    a = Lists.newArrayList("a", "b", "c", null, "a");
+    b = Lists.newArrayList("a", "b", "c", null);
+    Assert.assertFalse(CollectionUtils.equals(a, b));
+
+    // true
+    a = Lists.newArrayList(null, "a", "b", "c");
+    b = Lists.newArrayList("a", "b", "c", null);
+    Assert.assertTrue(CollectionUtils.equals(a, b));
+
+    // false
+    a = Lists.newArrayList(null, "a", "b", "c", null);
+    b = Lists.newArrayList("a", "b", "c", null);
+    Assert.assertFalse(CollectionUtils.equals(a, b));
+
+    // false
+    a = Lists.newArrayList("a", "b", "c", "a");
+    b = Lists.newArrayList("a", "b", "c");
+    Assert.assertFalse(CollectionUtils.equals(a, b));
+
+    // true
+    a = Lists.newArrayList("b", null, "a", "c");
+    b = Lists.newArrayList("a", "b", "c", null);
+    Assert.assertTrue(CollectionUtils.equals(a, b));
+  }
 }
diff --git a/server/distribution/data/pom.xml b/server/distribution/data/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-distribution</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/distribution/integration/pom.xml b/server/distribution/integration/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-distribution</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/distribution/meta/pom.xml b/server/distribution/meta/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-distribution</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/distribution/pom.xml b/server/distribution/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/distribution/session/pom.xml b/server/distribution/session/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-distribution</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/pom.xml b/server/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/server/remoting/api/pom.xml b/server/remoting/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-remoting</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/remoting/bolt/pom.xml b/server/remoting/bolt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-remoting</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/remoting/http/pom.xml b/server/remoting/http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-remoting</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/remoting/pom.xml b/server/remoting/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/server/data/pom.xml b/server/server/data/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>