Polish apache/incubator-dubbo/apache#3790 : Dependencies with no license

mercyblitz · May 23, 2019 · 21c97c8 · 21c97c8
1 parent ebafc18
commit 21c97c8
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 57 deletions.
diff --git a/dubbo-registry/dubbo-registry-nacos/pom.xml b/dubbo-registry/dubbo-registry-nacos/pom.xml
@@ -92,49 +92,6 @@
         </dependency>
 
         <!-- REST support dependencies -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-rpc-rest</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxrs</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-client</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-netty4</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jackson-provider</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxb-provider</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>

diff --git a/...stry-nacos/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceConsumerBootstrap.java b/...stry-nacos/src/test/java/org/apache/dubbo/demo/consumer/DemoServiceConsumerBootstrap.java
@@ -37,14 +37,10 @@ public class DemoServiceConsumerBootstrap {
     @Reference(version = "${demo.service.version}")
     private DemoService demoService;
 
-    @Reference(version = "${demo.service.version}", protocol = "rest")
-    private DemoService restDemoService;
-
     @PostConstruct
     public void init() throws InterruptedException {
         for (int j = 0; j < 10; j++) {
             System.out.println(demoService.sayName("小马哥（mercyblitz）"));
-            System.out.println(restDemoService.sayName("小马哥（mercyblitz）"));
         }
         Thread.sleep(TimeUnit.SECONDS.toMillis(5));
     }

diff --git a/...egistry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/demo/service/DemoService.java b/...egistry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/demo/service/DemoService.java
@@ -16,19 +16,13 @@
  */
 package org.apache.dubbo.demo.service;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
-
 /**
  * DemoService
  *
  * @since 2.6.5
  */
-@Path("/demo-service")
 public interface DemoService {
 
-    @GET
-    String sayName(@QueryParam("name") String name);
+    String sayName(String name);
 
 }
diff --git a/dubbo-registry/dubbo-registry-nacos/src/test/resources/provider-config.properties b/dubbo-registry/dubbo-registry-nacos/src/test/resources/provider-config.properties
@@ -6,9 +6,6 @@ dubbo.registry.address=127.0.0.1:8848
 ## Exports multiple protocols
 ### Dubbo Protocol using random port
 dubbo.protocols.dubbo.port=-1
-### REST protocol
-dubbo.protocols.rest.port=9090
-dubbo.protocols.rest.server=netty
 # Provider @Service info
 demo.service.version=1.0.0
 demo.service.name=demoService