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:19:53 UTC
[dubbo] 07/45: fix version & compile problem
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 a479697b4c6bbcbff7564e3a9120eae559d923ce
Author: 未宇 <li...@alibaba-inc.com>
AuthorDate: Tue Jul 14 17:08:20 2020 +0800
fix version & compile problem
---
compiler/pom.xml | 2 +-
dubbo-build-tools/pom.xml | 2 +-
.../dubbo/config/metadata/ConfigurableMetadataServiceExporter.java | 3 ++-
dubbo-dependencies-bom/pom.xml | 2 +-
dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java | 4 ++--
pom.xml | 4 ++--
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 9c51f41..ad92736 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</version>
+ <version>2.7.8-hsf3-1</version>
<packaging>jar</packaging>
diff --git a/dubbo-build-tools/pom.xml b/dubbo-build-tools/pom.xml
index a3912d0..f74eda4 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</version>
+ <version>2.7.8-hsf3-1</version>
<packaging>jar</packaging>
<properties>
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
index fdb011f..7fff726 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
@@ -29,6 +29,7 @@ import org.apache.dubbo.metadata.MetadataServiceExporter;
import org.apache.dubbo.rpc.model.ApplicationModel;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import static java.util.Collections.emptyList;
@@ -103,7 +104,7 @@ public class ConfigurableMetadataServiceExporter implements MetadataServiceExpor
@Override
public List<URL> getExportedURLs() {
- return serviceConfig != null ? serviceConfig.getExportedUrls() : emptyList();
+ return serviceConfig != null ? serviceConfig.getExportedUrls() : Collections.<URL>emptyList();
}
public boolean isExported() {
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 9d440a5..9460bbc 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</revision>
+ <revision>2.7.8-hsf3-1</revision>
</properties>
<dependencyManagement>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index 290ff72..2070180 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</revision>
+ <revision>2.7.8-hsf3-1</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
</properties>
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java
index 7459da1..2b38079 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java
@@ -722,7 +722,7 @@ public class ServiceDiscoveryRegistry extends FailbackRegistry {
Map<String, List<URL>> revisionExportedURLsMap = getRevisionExportedURLsMap(serviceName);
List<URL> exportedURLs = revisionExportedURLsMap.get(revision);
// Get a copy from source in order to prevent the caller trying to change the cached data
- return exportedURLs != null ? new ArrayList<>(exportedURLs) : emptyList();
+ return exportedURLs != null ? new ArrayList<>(exportedURLs) : Collections.<URL>emptyList();
});
}
@@ -900,4 +900,4 @@ public class ServiceDiscoveryRegistry extends FailbackRegistry {
return protocol == null || Objects.equals(protocol, targetURL.getParameter(PROTOCOL_KEY))
|| Objects.equals(protocol, targetURL.getProtocol());
}
-}
\ No newline at end of file
+}
diff --git a/pom.xml b/pom.xml
index 2e954f0..967ae69 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</revision>
+ <revision>2.7.8-hsf3-1</revision>
</properties>
<modules>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-build-tools</artifactId>
- <version>2.7.8-hsf3</version>
+ <version>2.7.8-hsf3-1</version>
</dependency>
</dependencies>
<executions>