You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by mi...@apache.org on 2018/11/14 08:32:04 UTC
[incubator-dubbo-ops] branch metadata updated: change dubbo
dependency to 2.7-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/metadata by this push:
new 995e06b change dubbo dependency to 2.7-SNAPSHOT
995e06b is described below
commit 995e06b547cb7554c99deb3129fca19b2c35aa8b
Author: nzomkxia <z8...@gmail.com>
AuthorDate: Wed Nov 14 16:31:52 2018 +0800
change dubbo dependency to 2.7-SNAPSHOT
---
dubbo-admin-backend/pom.xml | 7 +++-
.../dubbo/admin/common/util/ConvertUtil.java | 4 +-
.../dubbo/admin/common/util/OverrideUtils.java | 2 +-
.../apache/dubbo/admin/common/util/ParseUtils.java | 2 +-
.../apache/dubbo/admin/common/util/RouteRule.java | 2 +-
.../apache/dubbo/admin/common/util/SyncUtils.java | 6 +--
.../dubbo/admin/controller/AccessesController.java | 4 +-
.../admin/controller/OverridesController.java | 2 +-
.../dubbo/admin/controller/ServiceController.java | 4 +-
.../admin/handler/CustomExceptionHandler.java | 4 +-
.../apache/dubbo/admin/model/domain/Consumer.java | 6 +--
.../apache/dubbo/admin/model/domain/Override.java | 6 +--
.../apache/dubbo/admin/model/domain/Provider.java | 4 +-
.../org/apache/dubbo/admin/model/domain/Route.java | 4 +-
.../apache/dubbo/admin/service/ConfigService.java | 34 ----------------
.../dubbo/admin/service/RegistryServerSync.java | 16 ++++----
.../dubbo/admin/service/impl/AbstractService.java | 8 ++--
.../admin/service/impl/ConfigServiceImpl.java | 46 ----------------------
.../admin/service/impl/ConsumerServiceImpl.java | 4 +-
.../admin/service/impl/OverrideServiceImpl.java | 34 +---------------
.../dubbo/admin/service/impl/OwnerServiceImpl.java | 4 +-
.../admin/service/impl/ProviderServiceImpl.java | 6 +--
.../dubbo/admin/service/impl/RouteServiceImpl.java | 4 +-
.../src/main/resources/dubbo-admin.xml | 2 +-
pom.xml | 10 ++++-
25 files changed, 63 insertions(+), 162 deletions(-)
diff --git a/dubbo-admin-backend/pom.xml b/dubbo-admin-backend/pom.xml
index 0cf43c5..f61a8e0 100644
--- a/dubbo-admin-backend/pom.xml
+++ b/dubbo-admin-backend/pom.xml
@@ -53,7 +53,7 @@
</dependency>
<dependency>
- <groupId>com.alibaba</groupId>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<exclusions>
<exclusion>
@@ -64,6 +64,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-metadata-report-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<exclusions>
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/ConvertUtil.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/ConvertUtil.java
index e8181f4..9f3eb4c 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/ConvertUtil.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/ConvertUtil.java
@@ -16,8 +16,8 @@
*/
package org.apache.dubbo.admin.common.util;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.utils.StringUtils;
import java.util.HashMap;
import java.util.Map;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
index 8b24f5f..e7b55d6 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
@@ -16,7 +16,7 @@
*/
package org.apache.dubbo.admin.common.util;
-import com.alibaba.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.admin.model.domain.LoadBalance;
import org.apache.dubbo.admin.model.domain.Override;
import org.apache.dubbo.admin.model.domain.Weight;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/ParseUtils.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/ParseUtils.java
index 5e3954a..13035db 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/ParseUtils.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/ParseUtils.java
@@ -16,7 +16,7 @@
*/
package org.apache.dubbo.admin.common.util;
-import com.alibaba.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.utils.StringUtils;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/RouteRule.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/RouteRule.java
index ee28fcd..ac9f683 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/RouteRule.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/RouteRule.java
@@ -16,7 +16,7 @@
*/
package org.apache.dubbo.admin.common.util;
-import com.alibaba.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.admin.model.domain.Route;
import java.text.ParseException;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java
index f0aebfd..c87d916 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/SyncUtils.java
@@ -16,9 +16,9 @@
*/
package org.apache.dubbo.admin.common.util;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.URL;
-import com.alibaba.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.admin.model.domain.Consumer;
import org.apache.dubbo.admin.model.domain.Override;
import org.apache.dubbo.admin.model.domain.Provider;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/AccessesController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/AccessesController.java
index b4bbff2..6634d1e 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/AccessesController.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/AccessesController.java
@@ -16,8 +16,8 @@
*/
package org.apache.dubbo.admin.controller;
-import com.alibaba.dubbo.common.logger.Logger;
-import com.alibaba.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.commons.lang3.StringUtils;
import org.apache.dubbo.admin.common.exception.ParamValidationException;
import org.apache.dubbo.admin.common.exception.ResourceNotFoundException;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java
index b57203e..52e933a 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/OverridesController.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.admin.controller;
-import com.alibaba.dubbo.common.URL;
+import org.apache.dubbo.common.URL;
import org.apache.commons.lang3.StringUtils;
import org.apache.dubbo.admin.common.exception.ParamValidationException;
import org.apache.dubbo.admin.common.exception.ResourceNotFoundException;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
index a0358e4..0a4e3cb 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
@@ -17,8 +17,8 @@
package org.apache.dubbo.admin.controller;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.admin.model.dto.ServiceDTO;
import org.apache.dubbo.admin.model.dto.ServiceDetailDTO;
import org.apache.dubbo.admin.service.ConsumerService;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/handler/CustomExceptionHandler.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/handler/CustomExceptionHandler.java
index 94c4a22..cc580c1 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/handler/CustomExceptionHandler.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/handler/CustomExceptionHandler.java
@@ -16,8 +16,8 @@
*/
package org.apache.dubbo.admin.handler;
-import com.alibaba.dubbo.common.logger.Logger;
-import com.alibaba.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.admin.common.CommonResponse;
import org.apache.dubbo.admin.common.exception.ParamValidationException;
import org.apache.dubbo.admin.common.exception.PermissionDeniedException;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Consumer.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Consumer.java
index 3866cbd..ee0a326 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Consumer.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Consumer.java
@@ -16,9 +16,9 @@
*/
package org.apache.dubbo.admin.model.domain;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.URL;
-import com.alibaba.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.utils.StringUtils;
import java.util.Date;
import java.util.List;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Override.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Override.java
index 936dd1b..ff79fad 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Override.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Override.java
@@ -16,9 +16,9 @@
*/
package org.apache.dubbo.admin.model.domain;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.URL;
-import com.alibaba.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.utils.StringUtils;
import java.util.Map;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Provider.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Provider.java
index e4fc291..ee3b7e0 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Provider.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Provider.java
@@ -16,8 +16,8 @@
*/
package org.apache.dubbo.admin.model.domain;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.URL;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.URL;
import org.apache.dubbo.admin.common.util.ConvertUtil;
import java.util.Date;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Route.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Route.java
index c385de6..0d57e90 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Route.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/domain/Route.java
@@ -16,8 +16,8 @@
*/
package org.apache.dubbo.admin.model.domain;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.URL;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.URL;
import java.util.List;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/ConfigService.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/ConfigService.java
deleted file mode 100644
index a44b037..0000000
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/ConfigService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.dubbo.admin.service;
-
-import org.apache.dubbo.admin.model.domain.Config;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * TODO Comment of ConfigDAO
- *
- */
-public interface ConfigService {
-
- void update(List<Config> configs);
-
- Map<String, String> findAllConfigsMap();
-
-}
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/RegistryServerSync.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/RegistryServerSync.java
index 4ab5196..b666b11 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/RegistryServerSync.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/RegistryServerSync.java
@@ -16,14 +16,14 @@
*/
package org.apache.dubbo.admin.service;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.URL;
-import com.alibaba.dubbo.common.logger.Logger;
-import com.alibaba.dubbo.common.logger.LoggerFactory;
-import com.alibaba.dubbo.common.utils.NetUtils;
-import com.alibaba.dubbo.common.utils.StringUtils;
-import com.alibaba.dubbo.registry.NotifyListener;
-import com.alibaba.dubbo.registry.RegistryService;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.NetUtils;
+import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.registry.NotifyListener;
+import org.apache.dubbo.registry.RegistryService;
import org.apache.dubbo.admin.common.util.MD5Util;
import org.apache.dubbo.admin.common.util.Tool;
import org.springframework.beans.factory.DisposableBean;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/AbstractService.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/AbstractService.java
index 13dd9d4..56518b2 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/AbstractService.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/AbstractService.java
@@ -16,10 +16,10 @@
*/
package org.apache.dubbo.admin.service.impl;
-import com.alibaba.dubbo.common.URL;
-import com.alibaba.dubbo.common.logger.Logger;
-import com.alibaba.dubbo.common.logger.LoggerFactory;
-import com.alibaba.dubbo.registry.RegistryService;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.registry.RegistryService;
import org.apache.dubbo.admin.service.RegistryServerSync;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ConfigServiceImpl.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ConfigServiceImpl.java
deleted file mode 100644
index e03b8e9..0000000
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ConfigServiceImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.dubbo.admin.service.impl;
-
-import org.apache.dubbo.admin.service.ConfigService;
-import org.apache.dubbo.admin.model.domain.Config;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * TODO Comment of IbatisConfigDAO
- *
- */
-public class ConfigServiceImpl extends AbstractService implements ConfigService {
-
- /* (non-Javadoc)
- * @see com.alibaba.dubbo.governance.service.ConfigService#update(java.util.List)
- */
- public void update(List<Config> configs) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see com.alibaba.dubbo.governance.service.ConfigService#findAllConfigsMap()
- */
- public Map<String, String> findAllConfigsMap() {
- // TODO Auto-generated method stub
- return null;
- }
-}
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ConsumerServiceImpl.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ConsumerServiceImpl.java
index 42d3af5..2f70321 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ConsumerServiceImpl.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ConsumerServiceImpl.java
@@ -16,8 +16,8 @@
*/
package org.apache.dubbo.admin.service.impl;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.URL;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.URL;
import org.apache.dubbo.admin.service.ConsumerService;
import org.apache.dubbo.admin.common.util.Pair;
import org.apache.dubbo.admin.common.util.SyncUtils;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
index cc64a66..f179bab 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OverrideServiceImpl.java
@@ -16,8 +16,8 @@
*/
package org.apache.dubbo.admin.service.impl;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.URL;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.URL;
import org.apache.dubbo.admin.service.OverrideService;
import org.apache.dubbo.admin.common.util.Pair;
import org.apache.dubbo.admin.common.util.SyncUtils;
@@ -151,36 +151,6 @@ public class OverrideServiceImpl extends AbstractService implements OverrideServ
private URL getUrlFromOverride(Override override) {
return override.toUrl();
- /*Map<String, String> params = ConvertUtil.serviceName2Map(override.getService());
- if(!params.containsKey(Constants.INTERFACE_KEY)) {
- throw new IllegalArgumentException("No interface info");
- }
- if(!params.containsKey(Constants.VERSION_KEY)) {
- throw new IllegalArgumentException("No version info");
- }
-
- boolean enabled = override.isEnabled();
- if(!enabled) {
- params.put("enabled", "false");
- }
- String application = override.getApplication();
- if(!StringUtils.isEmpty(application)) {
- params.put("application", application);
- }
- String address = override.getAddress();
- if(!StringUtils.isEmpty(address)) {
- params.put("address", address);
- }
-
- String overrideAddress = override.getOverrideAddress();
- if(StringUtils.isEmpty(overrideAddress)) {
- overrideAddress = "0.0.0.0";
- }
- params.put(Constants.CATEGORY_KEY, Constants.CONFIGURATORS_CATEGORY);
-
- URL url = new URL("override", overrideAddress, -1, params);
- url = url.addParameterString(override.getParams());
- return url;*/
}
URL findOverrideUrl(String id) {
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OwnerServiceImpl.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OwnerServiceImpl.java
index 4c817a8..8482dbe 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OwnerServiceImpl.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/OwnerServiceImpl.java
@@ -16,8 +16,8 @@
*/
package org.apache.dubbo.admin.service.impl;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.admin.service.OverrideService;
import org.apache.dubbo.admin.service.OwnerService;
import org.apache.dubbo.admin.service.ProviderService;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java
index 8c8a901..1af3ece 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/ProviderServiceImpl.java
@@ -16,9 +16,9 @@
*/
package org.apache.dubbo.admin.service.impl;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.URL;
-import com.alibaba.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.admin.service.OverrideService;
import org.apache.dubbo.admin.service.ProviderService;
import org.apache.dubbo.admin.common.util.Pair;
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
index 1c3da77..f9e5f19 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/service/impl/RouteServiceImpl.java
@@ -16,8 +16,8 @@
*/
package org.apache.dubbo.admin.service.impl;
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.URL;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.URL;
import org.apache.dubbo.admin.model.dto.AccessDTO;
import org.apache.dubbo.admin.service.RouteService;
import org.apache.dubbo.admin.common.util.Pair;
diff --git a/dubbo-admin-backend/src/main/resources/dubbo-admin.xml b/dubbo-admin-backend/src/main/resources/dubbo-admin.xml
index d0dce31..d708c78 100644
--- a/dubbo-admin-backend/src/main/resources/dubbo-admin.xml
+++ b/dubbo-admin-backend/src/main/resources/dubbo-admin.xml
@@ -24,5 +24,5 @@
<dubbo:application name="dubbo-admin"/>
<dubbo:registry address="${dubbo.registry.address}" group="${dubbo.registry.group}"/>
- <dubbo:reference id="registryService" interface="com.alibaba.dubbo.registry.RegistryService" check="false"/>
+ <dubbo:reference id="registryService" interface="org.apache.dubbo.registry.RegistryService" check="false"/>
</beans>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3e66a5f..e5a85fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<properties>
<main.basedir>${project.basedir}</main.basedir>
<commons-lang3-version>3.7</commons-lang3-version>
- <dubbo-version>2.6.4</dubbo-version>
+ <dubbo-version>2.7.0-SNAPSHOT</dubbo-version>
<curator-version>2.12.0</curator-version>
<fastjson-version>1.2.46</fastjson-version>
<springfox-swagger-version>2.9.2</springfox-swagger-version>
@@ -59,7 +59,13 @@
</dependency>
<dependency>
- <groupId>com.alibaba</groupId>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-metadata-report-api</artifactId>
+ <version>${dubbo-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>${dubbo-version}</version>
</dependency>