You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2021/11/25 06:20:27 UTC
[dubbo] 41/45: update version
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch release/3.0.14-rpccontext-bugfix
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 67f6947ab8a53f0ebb6d4ceea0e5c7c9bf583502
Author: 未宇 <li...@alibaba-inc.com>
AuthorDate: Thu Jul 15 16:17:36 2021 +0800
update version
---
compiler/pom.xml | 2 +-
dubbo-build-tools/pom.xml | 2 +-
.../org/apache/dubbo/common/extension/support/ActivateComparator.java | 4 +++-
dubbo-dependencies-bom/pom.xml | 2 +-
dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +-
pom.xml | 4 ++--
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 7a99b8a..f773074 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-compiler</artifactId>
- <version>2.7.8-hsf3-13</version>
+ <version>2.7.8-hsf3-14</version>
<packaging>jar</packaging>
diff --git a/dubbo-build-tools/pom.xml b/dubbo-build-tools/pom.xml
index c485edb..97ff428 100644
--- a/dubbo-build-tools/pom.xml
+++ b/dubbo-build-tools/pom.xml
@@ -20,7 +20,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-build-tools</artifactId>
- <version>2.7.8-hsf3-13</version>
+ <version>2.7.8-hsf3-14</version>
<packaging>jar</packaging>
<properties>
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
index 8b2a4c1..6878eb1 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
@@ -105,12 +105,14 @@ public class ActivateComparator implements Comparator<Object> {
info.before = activate.before();
info.after = activate.after();
info.order = activate.order();
- } else {
+ } else if (clazz.isAnnotationPresent(com.alibaba.dubbo.common.extension.Activate.class)) {
com.alibaba.dubbo.common.extension.Activate activate = clazz.getAnnotation(
com.alibaba.dubbo.common.extension.Activate.class);
info.before = activate.before();
info.after = activate.after();
info.order = activate.order();
+ } else {
+ info.order = 0;
}
return info;
}
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 7ef03f5..918e48a 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -163,7 +163,7 @@
<mortbay_jetty_version>6.1.26</mortbay_jetty_version>
<portlet_version>2.0</portlet_version>
<maven_flatten_version>1.1.0</maven_flatten_version>
- <revision>2.7.8-hsf3-13</revision>
+ <revision>2.7.8-hsf3-14</revision>
</properties>
<dependencyManagement>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index 1d7e961..efb9cf0 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
- <revision>2.7.8-hsf3-13</revision>
+ <revision>2.7.8-hsf3-14</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
</properties>
diff --git a/pom.xml b/pom.xml
index c0cb4ed..3d886e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<arguments />
<checkstyle.skip>true</checkstyle.skip>
<rat.skip>true</rat.skip>
- <revision>2.7.8-hsf3-13</revision>
+ <revision>2.7.8-hsf3-14</revision>
</properties>
<modules>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-build-tools</artifactId>
- <version>2.7.8-hsf3-13</version>
+ <version>2.7.8-hsf3-14</version>
</dependency>
</dependencies>
<executions>