From ca6e57b4538d910a8a30d683da8237653674534b Mon Sep 17 00:00:00 2001 From: nameless Date: Fri, 1 Dec 2023 20:50:58 +0800 Subject: [PATCH 01/18] Add test for issue 13439 --- .../src/main/resources/spring/client.xml | 2 +- .../case-configuration.yml | 43 ----------- .../case-configuration.yml | 74 +++++++++++++++++++ .../case-versions.conf | 0 .../dubbo-samples-test-13439/pom.xml | 55 ++++++++++++++ .../dubbo/samples/api/GreetService.java | 6 ++ .../dubbo/samples/provider/Application.java | 43 +++++++++++ .../samples/provider/GreetServiceImpl.java | 12 +++ .../src/main/resources/log4j2.xml | 29 ++++++++ pom.xml | 1 + 10 files changed, 221 insertions(+), 44 deletions(-) delete mode 100644 99-integration/dubbo-samples-test-13360-33x/case-configuration.yml create mode 100644 99-integration/dubbo-samples-test-13439/case-configuration.yml rename 99-integration/{dubbo-samples-test-13360-33x => dubbo-samples-test-13439}/case-versions.conf (100%) create mode 100644 99-integration/dubbo-samples-test-13439/pom.xml create mode 100644 99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/api/GreetService.java create mode 100644 99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/Application.java create mode 100644 99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java create mode 100644 99-integration/dubbo-samples-test-13439/src/main/resources/log4j2.xml diff --git a/4-governance/dubbo-samples-zipkin/src/main/resources/spring/client.xml b/4-governance/dubbo-samples-zipkin/src/main/resources/spring/client.xml index b67e19d47a..21f24cfb34 100644 --- a/4-governance/dubbo-samples-zipkin/src/main/resources/spring/client.xml +++ b/4-governance/dubbo-samples-zipkin/src/main/resources/spring/client.xml @@ -29,7 +29,7 @@ - diff --git a/99-integration/dubbo-samples-test-13360-33x/case-configuration.yml b/99-integration/dubbo-samples-test-13360-33x/case-configuration.yml deleted file mode 100644 index 404179f5f7..0000000000 --- a/99-integration/dubbo-samples-test-13360-33x/case-configuration.yml +++ /dev/null @@ -1,43 +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. - -services: - zookeeper: - image: zookeeper:latest - - provider: - type: app - basedir: . - mainClass: org.apache.dubbo.samples.provider.Application - systemProps: - - zookeeper.address=zookeeper - waitPortsBeforeRun: - - zookeeper:2181 - checkLog: "Dubbo application started." - depends_on: - - zookeeper - - test: - type: test - basedir: . - tests: - - "**/*IT.class" - systemProps: - - zookeeper.address=zookeeper - waitPortsBeforeRun: - - zookeeper:2181 - depends_on: - - zookeeper diff --git a/99-integration/dubbo-samples-test-13439/case-configuration.yml b/99-integration/dubbo-samples-test-13439/case-configuration.yml new file mode 100644 index 0000000000..ee78953ee8 --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/case-configuration.yml @@ -0,0 +1,74 @@ +# 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. + + +services: + nacos: + image: nacos/nacos-server:2.0.0 + environment: + - PREFER_HOST_MODE=hostname + - MODE=standalone + - NACOS_AUTH_ENABLE=true + - JVM_XMS=512m + - JVM_XMX=512m + - JVM_XMN=256m + + dubbo-samples-test-13439: + type: app + basedir: dubbo-samples-nacos-merge-provider1 + mainClass: org.apache.dubbo.samples.merge.MergeProvider + systemProps: + - nacos.address=nacos + - nacos.port=8848 + waitPortsBeforeRun: + - nacos:8848 + checkPorts: + - 20880 + checkLog: "dubbo service started" + depends_on: + - nacos + + dubbo-samples-nacos-merge-provider2: + type: app + basedir: dubbo-samples-nacos-merge-provider2 + mainClass: org.apache.dubbo.samples.merge.MergeProvider2 + systemProps: + - nacos.address=nacos + - nacos.port=8848 + waitPortsBeforeRun: + - nacos:8848 + checkPorts: + - 20881 + checkLog: "dubbo service started" + depends_on: + - nacos + + dubbo-samples-nacos-merge-consumer: + type: test + basedir: dubbo-samples-nacos-merge-consumer + tests: + - "**/*IT.class" + systemProps: + - nacos.address=nacos + - nacos.port=8848 + waitPortsBeforeRun: + - nacos:8848 + - dubbo-samples-nacos-merge-provider1:20880 + - dubbo-samples-nacos-merge-provider2:20881 + depends_on: + - nacos + - dubbo-samples-nacos-merge-provider1 + - dubbo-samples-nacos-merge-provider2 diff --git a/99-integration/dubbo-samples-test-13360-33x/case-versions.conf b/99-integration/dubbo-samples-test-13439/case-versions.conf similarity index 100% rename from 99-integration/dubbo-samples-test-13360-33x/case-versions.conf rename to 99-integration/dubbo-samples-test-13439/case-versions.conf diff --git a/99-integration/dubbo-samples-test-13439/pom.xml b/99-integration/dubbo-samples-test-13439/pom.xml new file mode 100644 index 0000000000..3c73ed19a1 --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + org.apache.dubbo + dubbo-samples-all + 1.0-SNAPSHOT + ../../pom.xml + + + dubbo-samples-test-13439 + + + 3.2.6 + 2.2.4 + 2.20.0 + 1.8 + 1.8 + UTF-8 + + + + + + org.apache.dubbo + dubbo-dependencies-bom + ${dubbo.version} + + + + + + + org.apache.dubbo + dubbo + ${dubbo.version} + + + + com.alibaba.nacos + nacos-client + ${nacos.version} + + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j2.version} + + + + + diff --git a/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/api/GreetService.java b/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/api/GreetService.java new file mode 100644 index 0000000000..038ebdf64b --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/api/GreetService.java @@ -0,0 +1,6 @@ +package org.apache.dubbo.samples.api; + +public interface GreetService { + + String greet(String msg); +} diff --git a/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/Application.java b/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/Application.java new file mode 100644 index 0000000000..64b38e2453 --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/Application.java @@ -0,0 +1,43 @@ +package org.apache.dubbo.samples.provider; + +import org.apache.dubbo.config.MetadataReportConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.ProviderConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.ServiceConfig; +import org.apache.dubbo.config.bootstrap.DubboBootstrap; +import org.apache.dubbo.samples.api.GreetService; + +public class Application { + + +// private static final String NACOS_ADDR = "nacos://localhost:8848"; +// +// private static final String NACOS_NAMESPACE_1 = NACOS_ADDR + "?namespace=DUBBO-1"; +// +// private static final String NACOS_NAMESPACE_2 = NACOS_ADDR + "?namespace=DUBBO-2"; + + + private static final String NACOS_ADDR = "nacos://10.21.32.98:8848"; + + private static final String NACOS_NAMESPACE_1 = NACOS_ADDR + "?namespace=DUBBO-1"; + + private static final String NACOS_NAMESPACE_2 = NACOS_ADDR + "?namespace=DUBBO-2"; + + public static void main(String[] args) { + + ServiceConfig serviceConfig = new ServiceConfig(); + serviceConfig.setRef(new GreetServiceImpl()); + + DubboBootstrap bootstrap = DubboBootstrap.getInstance() + .application("GreetApplication") + .registry(new RegistryConfig(NACOS_ADDR)) + .metadataReport(new MetadataReportConfig(NACOS_NAMESPACE_1)) + .metadataReport(new MetadataReportConfig(NACOS_NAMESPACE_2)) + .protocol(new ProtocolConfig("tri")) + .service(serviceConfig); + bootstrap.start(); + + } + +} diff --git a/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java b/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java new file mode 100644 index 0000000000..b1020f58c3 --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java @@ -0,0 +1,12 @@ +package org.apache.dubbo.samples.provider; + +import org.apache.dubbo.samples.api.GreetService; + +public class GreetServiceImpl implements GreetService { + + @Override + public String greet(String msg) { + return "Hello:"+msg; + } + +} diff --git a/99-integration/dubbo-samples-test-13439/src/main/resources/log4j2.xml b/99-integration/dubbo-samples-test-13439/src/main/resources/log4j2.xml new file mode 100644 index 0000000000..69e1321d22 --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/src/main/resources/log4j2.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 772b92ecd7..7066ea4c56 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,7 @@ 10-task 99-integration tools + 99-integration/dubbo-samples-test-13439 From 1b916af565a9e1e25233c7ddc4fdd172e844e662 Mon Sep 17 00:00:00 2001 From: nameless Date: Sat, 2 Dec 2023 20:38:02 +0800 Subject: [PATCH 02/18] Add test for issue 13439 --- .../dubbo-samples-memory-tri-server/pom.xml | 2 +- .../case-configuration.yml | 39 ++++------- .../case-versions.conf | 5 +- .../dubbo-samples-test-13439-api/pom.xml | 46 +++++++++++++ .../dubbo/samples/api/GreetService.java | 22 +++++++ .../dubbo-samples-test-13439-consumer/pom.xml | 34 ++++++++++ .../samples/consumer/GreetServiceIT.java | 31 +++++++++ .../src/test}/resources/log4j2.xml | 0 .../dubbo-samples-test-13439-provider/pom.xml | 28 ++++++++ .../samples/provider/GreetServiceImpl.java | 0 .../samples/provider/ProviderApplication.java | 66 +++++++++++++++++++ .../src/main/resources/log4j2.xml | 29 ++++++++ .../dubbo-samples-test-13439/pom.xml | 39 +++++------ .../dubbo/samples/api/GreetService.java | 6 -- .../dubbo/samples/provider/Application.java | 43 ------------ 15 files changed, 286 insertions(+), 104 deletions(-) create mode 100644 99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml create mode 100644 99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/src/main/java/org/apache/dubbo/samples/api/GreetService.java create mode 100644 99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml create mode 100644 99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/src/test/java/org/apache/dubbo/samples/consumer/GreetServiceIT.java rename 99-integration/dubbo-samples-test-13439/{src/main => dubbo-samples-test-13439-consumer/src/test}/resources/log4j2.xml (100%) create mode 100644 99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml rename 99-integration/dubbo-samples-test-13439/{ => dubbo-samples-test-13439-provider}/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java (100%) create mode 100644 99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/ProviderApplication.java create mode 100644 99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/resources/log4j2.xml delete mode 100644 99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/api/GreetService.java delete mode 100644 99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/Application.java diff --git a/99-integration/dubbo-samples-memory-tri-server/pom.xml b/99-integration/dubbo-samples-memory-tri-server/pom.xml index ac7e80d50d..2f08784cfa 100644 --- a/99-integration/dubbo-samples-memory-tri-server/pom.xml +++ b/99-integration/dubbo-samples-memory-tri-server/pom.xml @@ -40,7 +40,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.0-beta.2-ORIGIN 3.24.3 2.20.0 5.9.2 diff --git a/99-integration/dubbo-samples-test-13439/case-configuration.yml b/99-integration/dubbo-samples-test-13439/case-configuration.yml index ee78953ee8..e48af0d3b5 100644 --- a/99-integration/dubbo-samples-test-13439/case-configuration.yml +++ b/99-integration/dubbo-samples-test-13439/case-configuration.yml @@ -21,54 +21,37 @@ services: environment: - PREFER_HOST_MODE=hostname - MODE=standalone - - NACOS_AUTH_ENABLE=true + - NACOS_AUTH_ENABLE=false - JVM_XMS=512m - JVM_XMX=512m - JVM_XMN=256m - dubbo-samples-test-13439: + dubbo-samples-test-13439-provider: type: app - basedir: dubbo-samples-nacos-merge-provider1 - mainClass: org.apache.dubbo.samples.merge.MergeProvider + basedir: dubbo-samples-test-13439-provider + mainClass: org.apache.dubbo.samples.provider.ProviderApplication systemProps: - nacos.address=nacos - nacos.port=8848 waitPortsBeforeRun: - nacos:8848 checkPorts: - - 20880 - checkLog: "dubbo service started" + - 10001 + checkLog: "DubboBootstrap awaiting" depends_on: - nacos - dubbo-samples-nacos-merge-provider2: - type: app - basedir: dubbo-samples-nacos-merge-provider2 - mainClass: org.apache.dubbo.samples.merge.MergeProvider2 - systemProps: - - nacos.address=nacos - - nacos.port=8848 - waitPortsBeforeRun: - - nacos:8848 - checkPorts: - - 20881 - checkLog: "dubbo service started" - depends_on: - - nacos - - dubbo-samples-nacos-merge-consumer: + dubbo-samples-test-13439-consumer: type: test - basedir: dubbo-samples-nacos-merge-consumer + basedir: dubbo-samples-test-13439-consumer tests: - - "**/*IT.class" + - "**/*IT.class" systemProps: - nacos.address=nacos - nacos.port=8848 waitPortsBeforeRun: - nacos:8848 - - dubbo-samples-nacos-merge-provider1:20880 - - dubbo-samples-nacos-merge-provider2:20881 + - dubbo-samples-test-13439-provider:10001 depends_on: - nacos - - dubbo-samples-nacos-merge-provider1 - - dubbo-samples-nacos-merge-provider2 + - dubbo-samples-test-13439-provider diff --git a/99-integration/dubbo-samples-test-13439/case-versions.conf b/99-integration/dubbo-samples-test-13439/case-versions.conf index ca3c53a6ca..0b117c84f1 100644 --- a/99-integration/dubbo-samples-test-13439/case-versions.conf +++ b/99-integration/dubbo-samples-test-13439/case-versions.conf @@ -16,9 +16,6 @@ # limitations under the License. # - # Supported component versions of the test case - -# Spring app -dubbo.version=[ >= 3.3.0 ] +dubbo.version=[ > 3.2.0 ] java.version= [ >= 8 ] diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml new file mode 100644 index 0000000000..bb87198c16 --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml @@ -0,0 +1,46 @@ + + + 4.0.0 + + org.apache.dubbo + dubbo-samples-test-13439 + 1.0-SNAPSHOT + + + dubbo-samples-test-13439-api + + + 8 + 8 + UTF-8 + + + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + + + org.apache.dubbo + dubbo + ${dubbo.version} + + + + com.alibaba.nacos + nacos-client + + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j2.version} + + + + + diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/src/main/java/org/apache/dubbo/samples/api/GreetService.java b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/src/main/java/org/apache/dubbo/samples/api/GreetService.java new file mode 100644 index 0000000000..eca2acd8ae --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/src/main/java/org/apache/dubbo/samples/api/GreetService.java @@ -0,0 +1,22 @@ +package org.apache.dubbo.samples.api; + +public interface GreetService { + + String greet(String msg); + + String HOST = System.getProperty("nacos.address") + ":" + System.getProperty("nacos.port"); + + String NACOS_ADDR = "nacos://"+HOST; + + String NACOS_NAMESPACE_CONSOLE_PATH = "http://"+HOST+"/nacos/v1/console/namespaces"; + + String NACOS_NAMESPACE_NAME_1 = "DUBBO-TEST-1"; + + String NACOS_NAMESPACE_NAME_2 = "DUBBO-TEST-2"; + + String NACOS_NAMESPACE_1_PATH = NACOS_ADDR + "?namespace="+NACOS_NAMESPACE_NAME_1; + + String NACOS_NAMESPACE_2_PATH = NACOS_ADDR + "?namespace="+NACOS_NAMESPACE_NAME_2; + + int PORT = 10001; +} diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml new file mode 100644 index 0000000000..433d5b22b6 --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + org.apache.dubbo + dubbo-samples-test-13439 + 1.0-SNAPSHOT + + + dubbo-samples-test-13439-consumer + + + 8 + 8 + UTF-8 + + + + + org.apache.dubbo + dubbo-samples-test-13439-api + 1.0-SNAPSHOT + + + + junit + junit + test + + + + diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/src/test/java/org/apache/dubbo/samples/consumer/GreetServiceIT.java b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/src/test/java/org/apache/dubbo/samples/consumer/GreetServiceIT.java new file mode 100644 index 0000000000..53c3da38ed --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/src/test/java/org/apache/dubbo/samples/consumer/GreetServiceIT.java @@ -0,0 +1,31 @@ +package org.apache.dubbo.samples.consumer; + +import org.apache.dubbo.config.MetadataReportConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.ReferenceConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.bootstrap.DubboBootstrap; +import org.apache.dubbo.samples.api.GreetService; +import org.junit.Assert; +import org.junit.Test; + + +public class GreetServiceIT { + + @Test + public void test(){ + System.setProperty("dubbo.application.qos-enable","false"); + RegistryConfig registryConfig = new RegistryConfig(GreetService.NACOS_ADDR); + registryConfig.setRegisterMode("instance"); + ReferenceConfig referenceConfig = new ReferenceConfig<>(); + referenceConfig.setInterface(GreetService.class); + DubboBootstrap bootstrap = DubboBootstrap.getInstance() + .application("GreetConsumerApplication") + .registry(registryConfig) + .metadataReport(new MetadataReportConfig(GreetService.NACOS_NAMESPACE_2_PATH)) + .protocol(new ProtocolConfig("dubbo", GreetService.PORT)) + .reference(referenceConfig); + bootstrap.start(); + Assert.assertEquals("Hello:world",referenceConfig.get().greet("world")); + } +} diff --git a/99-integration/dubbo-samples-test-13439/src/main/resources/log4j2.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/src/test/resources/log4j2.xml similarity index 100% rename from 99-integration/dubbo-samples-test-13439/src/main/resources/log4j2.xml rename to 99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/src/test/resources/log4j2.xml diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml new file mode 100644 index 0000000000..e914cefc04 --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + org.apache.dubbo + dubbo-samples-test-13439 + 1.0-SNAPSHOT + + + dubbo-samples-test-13439-provider + + + 8 + 8 + UTF-8 + + + + + org.apache.dubbo + dubbo-samples-test-13439-api + 1.0-SNAPSHOT + + + + diff --git a/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java similarity index 100% rename from 99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java rename to 99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/ProviderApplication.java b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/ProviderApplication.java new file mode 100644 index 0000000000..46f759b548 --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/ProviderApplication.java @@ -0,0 +1,66 @@ +package org.apache.dubbo.samples.provider; + +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; +import org.apache.dubbo.config.MetadataReportConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.ServiceConfig; +import org.apache.dubbo.config.bootstrap.DubboBootstrap; +import org.apache.dubbo.samples.api.GreetService; + +import java.io.IOException; + +public class ProviderApplication { + + public static void main(String[] args) throws IOException { + prepareNacosServer(); + System.setProperty("dubbo.application.qos-enable","false"); + ServiceConfig serviceConfig = new ServiceConfig<>(); + serviceConfig.setRef(new org.apache.dubbo.samples.provider.GreetServiceImpl()); + serviceConfig.setInterface(GreetService.class); + RegistryConfig registryConfig = new RegistryConfig(GreetService.NACOS_ADDR); + registryConfig.setRegisterMode("instance"); + + DubboBootstrap bootstrap = DubboBootstrap.getInstance() + .application("GreetProviderApplication") + .registry(registryConfig) + .metadataReport(new MetadataReportConfig(GreetService.NACOS_NAMESPACE_1_PATH)) + .metadataReport(new MetadataReportConfig(GreetService.NACOS_NAMESPACE_2_PATH)) + .protocol(new ProtocolConfig("dubbo", GreetService.PORT)) + .service(serviceConfig); + bootstrap.start().await(); + } + + private static void prepareNacosServer() throws IOException{ + OkHttpClient client = new OkHttpClient().newBuilder() + .build(); + MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded"); + RequestBody body = RequestBody.create(mediaType, buildRequestContent(GreetService.NACOS_NAMESPACE_NAME_1)); + Request request = new Request.Builder() + .url(GreetService.NACOS_NAMESPACE_CONSOLE_PATH) + .method("POST", body) + .build(); + RequestBody body2 = RequestBody.create(mediaType, buildRequestContent(GreetService.NACOS_NAMESPACE_NAME_2)); + Request request2 = new Request.Builder() + .url(GreetService.NACOS_NAMESPACE_CONSOLE_PATH) + .method("POST", body2) + .build(); + try ( + Response response = client.newCall(request).execute(); + Response response2 = client.newCall(request2).execute(); + ) { + if (!response.isSuccessful() && !response2.isSuccessful()) { + throw new IOException("Can not access nacos server."); + } + } + } + + private static String buildRequestContent(String namespaceName){ + return "customNamespaceId="+namespaceName + "&namespaceName="+namespaceName+"&namespaceDesc="+namespaceName+"&namespaceID="; + } + +} diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/resources/log4j2.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/resources/log4j2.xml new file mode 100644 index 0000000000..69e1321d22 --- /dev/null +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/resources/log4j2.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + diff --git a/99-integration/dubbo-samples-test-13439/pom.xml b/99-integration/dubbo-samples-test-13439/pom.xml index 3c73ed19a1..eb6d8428d7 100644 --- a/99-integration/dubbo-samples-test-13439/pom.xml +++ b/99-integration/dubbo-samples-test-13439/pom.xml @@ -11,11 +11,17 @@ dubbo-samples-test-13439 + pom + + dubbo-samples-test-13439-provider + dubbo-samples-test-13439-consumer + dubbo-samples-test-13439-api + - 3.2.6 - 2.2.4 + 3.3.0-beta.2-NACOS-METADATA 2.20.0 + 4.9.0 1.8 1.8 UTF-8 @@ -27,29 +33,18 @@ org.apache.dubbo dubbo-dependencies-bom ${dubbo.version} + pom + import + + + org.apache.dubbo + dubbo-bom + ${dubbo.version} + pom + import - - - org.apache.dubbo - dubbo - ${dubbo.version} - - - - com.alibaba.nacos - nacos-client - ${nacos.version} - - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j2.version} - - - diff --git a/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/api/GreetService.java b/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/api/GreetService.java deleted file mode 100644 index 038ebdf64b..0000000000 --- a/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/api/GreetService.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.apache.dubbo.samples.api; - -public interface GreetService { - - String greet(String msg); -} diff --git a/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/Application.java b/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/Application.java deleted file mode 100644 index 64b38e2453..0000000000 --- a/99-integration/dubbo-samples-test-13439/src/main/java/org/apache/dubbo/samples/provider/Application.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.apache.dubbo.samples.provider; - -import org.apache.dubbo.config.MetadataReportConfig; -import org.apache.dubbo.config.ProtocolConfig; -import org.apache.dubbo.config.ProviderConfig; -import org.apache.dubbo.config.RegistryConfig; -import org.apache.dubbo.config.ServiceConfig; -import org.apache.dubbo.config.bootstrap.DubboBootstrap; -import org.apache.dubbo.samples.api.GreetService; - -public class Application { - - -// private static final String NACOS_ADDR = "nacos://localhost:8848"; -// -// private static final String NACOS_NAMESPACE_1 = NACOS_ADDR + "?namespace=DUBBO-1"; -// -// private static final String NACOS_NAMESPACE_2 = NACOS_ADDR + "?namespace=DUBBO-2"; - - - private static final String NACOS_ADDR = "nacos://10.21.32.98:8848"; - - private static final String NACOS_NAMESPACE_1 = NACOS_ADDR + "?namespace=DUBBO-1"; - - private static final String NACOS_NAMESPACE_2 = NACOS_ADDR + "?namespace=DUBBO-2"; - - public static void main(String[] args) { - - ServiceConfig serviceConfig = new ServiceConfig(); - serviceConfig.setRef(new GreetServiceImpl()); - - DubboBootstrap bootstrap = DubboBootstrap.getInstance() - .application("GreetApplication") - .registry(new RegistryConfig(NACOS_ADDR)) - .metadataReport(new MetadataReportConfig(NACOS_NAMESPACE_1)) - .metadataReport(new MetadataReportConfig(NACOS_NAMESPACE_2)) - .protocol(new ProtocolConfig("tri")) - .service(serviceConfig); - bootstrap.start(); - - } - -} From dd58e62b27131b2f27abfe5cdaa01d9f912fe24f Mon Sep 17 00:00:00 2001 From: nameless Date: Sat, 2 Dec 2023 20:42:20 +0800 Subject: [PATCH 03/18] Add test for issue 13439 --- 99-integration/dubbo-samples-test-13439/case-versions.conf | 2 +- 99-integration/dubbo-samples-test-13439/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/99-integration/dubbo-samples-test-13439/case-versions.conf b/99-integration/dubbo-samples-test-13439/case-versions.conf index 0b117c84f1..d81bcb28fc 100644 --- a/99-integration/dubbo-samples-test-13439/case-versions.conf +++ b/99-integration/dubbo-samples-test-13439/case-versions.conf @@ -17,5 +17,5 @@ # # Supported component versions of the test case -dubbo.version=[ > 3.2.0 ] +dubbo.version=[ > 3.2.9 ] java.version= [ >= 8 ] diff --git a/99-integration/dubbo-samples-test-13439/pom.xml b/99-integration/dubbo-samples-test-13439/pom.xml index eb6d8428d7..eef172e854 100644 --- a/99-integration/dubbo-samples-test-13439/pom.xml +++ b/99-integration/dubbo-samples-test-13439/pom.xml @@ -19,7 +19,7 @@ - 3.3.0-beta.2-NACOS-METADATA + 3.2.9 2.20.0 4.9.0 1.8 From 9f3c7c5f3d2c728e94805a3c76a5394874872a27 Mon Sep 17 00:00:00 2001 From: nameless Date: Sat, 2 Dec 2023 20:47:32 +0800 Subject: [PATCH 04/18] Add test for issue 13439 --- .../src/main/resources/spring/client.xml | 2 +- .../dubbo-samples-memory-tri-server/pom.xml | 2 +- .../case-configuration.yml | 43 +++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 99-integration/dubbo-samples-test-13360-33x/case-configuration.yml diff --git a/4-governance/dubbo-samples-zipkin/src/main/resources/spring/client.xml b/4-governance/dubbo-samples-zipkin/src/main/resources/spring/client.xml index 21f24cfb34..b67e19d47a 100644 --- a/4-governance/dubbo-samples-zipkin/src/main/resources/spring/client.xml +++ b/4-governance/dubbo-samples-zipkin/src/main/resources/spring/client.xml @@ -29,7 +29,7 @@ - diff --git a/99-integration/dubbo-samples-memory-tri-server/pom.xml b/99-integration/dubbo-samples-memory-tri-server/pom.xml index 2f08784cfa..ac7e80d50d 100644 --- a/99-integration/dubbo-samples-memory-tri-server/pom.xml +++ b/99-integration/dubbo-samples-memory-tri-server/pom.xml @@ -40,7 +40,7 @@ 1.8 UTF-8 - 3.3.0-beta.2-ORIGIN + 3.2.6 3.24.3 2.20.0 5.9.2 diff --git a/99-integration/dubbo-samples-test-13360-33x/case-configuration.yml b/99-integration/dubbo-samples-test-13360-33x/case-configuration.yml new file mode 100644 index 0000000000..404179f5f7 --- /dev/null +++ b/99-integration/dubbo-samples-test-13360-33x/case-configuration.yml @@ -0,0 +1,43 @@ +# 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. + +services: + zookeeper: + image: zookeeper:latest + + provider: + type: app + basedir: . + mainClass: org.apache.dubbo.samples.provider.Application + systemProps: + - zookeeper.address=zookeeper + waitPortsBeforeRun: + - zookeeper:2181 + checkLog: "Dubbo application started." + depends_on: + - zookeeper + + test: + type: test + basedir: . + tests: + - "**/*IT.class" + systemProps: + - zookeeper.address=zookeeper + waitPortsBeforeRun: + - zookeeper:2181 + depends_on: + - zookeeper From a2d10e5491f5e3e3cff5166722eea16f95b758c2 Mon Sep 17 00:00:00 2001 From: nameless Date: Sat, 2 Dec 2023 20:51:36 +0800 Subject: [PATCH 05/18] Add test for issue 13439 --- .../case-versions.conf | 5 ++++- 99-integration/pom.xml | 1 + pom.xml | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) rename 99-integration/{dubbo-samples-test-13439 => dubbo-samples-test-13360-33x}/case-versions.conf (95%) diff --git a/99-integration/dubbo-samples-test-13439/case-versions.conf b/99-integration/dubbo-samples-test-13360-33x/case-versions.conf similarity index 95% rename from 99-integration/dubbo-samples-test-13439/case-versions.conf rename to 99-integration/dubbo-samples-test-13360-33x/case-versions.conf index d81bcb28fc..ca3c53a6ca 100644 --- a/99-integration/dubbo-samples-test-13439/case-versions.conf +++ b/99-integration/dubbo-samples-test-13360-33x/case-versions.conf @@ -16,6 +16,9 @@ # limitations under the License. # + # Supported component versions of the test case -dubbo.version=[ > 3.2.9 ] + +# Spring app +dubbo.version=[ >= 3.3.0 ] java.version= [ >= 8 ] diff --git a/99-integration/pom.xml b/99-integration/pom.xml index 1f9d9100d4..bc150c3b5b 100644 --- a/99-integration/pom.xml +++ b/99-integration/pom.xml @@ -72,6 +72,7 @@ dubbo-samples-test-13224 dubbo-samples-test-13360-32x dubbo-samples-test-13360-33x + dubbo-samples-test-13439 dubbo-samples-test-abc-async dubbo-samples-test-register dubbo-samples-test-register-3-3 diff --git a/pom.xml b/pom.xml index 7066ea4c56..772b92ecd7 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ 10-task 99-integration tools - 99-integration/dubbo-samples-test-13439 From 447900c7cae06bec4ec797cc667de065d9eeec09 Mon Sep 17 00:00:00 2001 From: nameless Date: Sat, 2 Dec 2023 20:59:07 +0800 Subject: [PATCH 06/18] Add license --- 1-basic/dubbo-samples-api/pom.xml | 2 +- 2-advanced/dubbo-samples-triple-no-idl/pom.xml | 13 ++++++++++++- .../dubbo-samples-test-13439-api/pom.xml | 17 +++++++++++++++++ .../apache/dubbo/samples/api/GreetService.java | 17 +++++++++++++++++ .../dubbo-samples-test-13439-consumer/pom.xml | 17 +++++++++++++++++ .../dubbo/samples/consumer/GreetServiceIT.java | 17 +++++++++++++++++ .../dubbo-samples-test-13439-provider/pom.xml | 17 +++++++++++++++++ .../samples/provider/GreetServiceImpl.java | 17 +++++++++++++++++ .../samples/provider/ProviderApplication.java | 17 +++++++++++++++++ 9 files changed, 132 insertions(+), 2 deletions(-) diff --git a/1-basic/dubbo-samples-api/pom.xml b/1-basic/dubbo-samples-api/pom.xml index ae015a5743..560ff1a744 100644 --- a/1-basic/dubbo-samples-api/pom.xml +++ b/1-basic/dubbo-samples-api/pom.xml @@ -40,7 +40,7 @@ 1.8 UTF-8 - 3.3.0-beta.1 + 3.3.0-beta.2-NACOS-METADATA 2.20.0 5.9.2 diff --git a/2-advanced/dubbo-samples-triple-no-idl/pom.xml b/2-advanced/dubbo-samples-triple-no-idl/pom.xml index 8e8f89b648..f28acd7dd3 100644 --- a/2-advanced/dubbo-samples-triple-no-idl/pom.xml +++ b/2-advanced/dubbo-samples-triple-no-idl/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.3.0-beta.1 + 3.3.0-beta.2-NACOS-METADATA 3.19.6 2.20.0 @@ -41,10 +41,21 @@ + + com.alibaba.nacos + nacos-client + 2.1.1 + org.apache.dubbo dubbo ${dubbo.version} + + + com.alibaba.nacos + nacos-client + + org.apache.dubbo diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml index bb87198c16..75f8785014 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml @@ -1,4 +1,21 @@ + + diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/src/main/java/org/apache/dubbo/samples/api/GreetService.java b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/src/main/java/org/apache/dubbo/samples/api/GreetService.java index eca2acd8ae..c61e0f57c7 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/src/main/java/org/apache/dubbo/samples/api/GreetService.java +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/src/main/java/org/apache/dubbo/samples/api/GreetService.java @@ -1,3 +1,20 @@ +/* + * 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.samples.api; public interface GreetService { diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml index 433d5b22b6..ce5f62613d 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml @@ -1,4 +1,21 @@ + + diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/src/test/java/org/apache/dubbo/samples/consumer/GreetServiceIT.java b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/src/test/java/org/apache/dubbo/samples/consumer/GreetServiceIT.java index 53c3da38ed..33bdd5ef08 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/src/test/java/org/apache/dubbo/samples/consumer/GreetServiceIT.java +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/src/test/java/org/apache/dubbo/samples/consumer/GreetServiceIT.java @@ -1,3 +1,20 @@ +/* + * 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.samples.consumer; import org.apache.dubbo.config.MetadataReportConfig; diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml index e914cefc04..16b5a5398d 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml @@ -1,4 +1,21 @@ + + diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java index b1020f58c3..959f15cf08 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/GreetServiceImpl.java @@ -1,3 +1,20 @@ +/* + * 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.samples.provider; import org.apache.dubbo.samples.api.GreetService; diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/ProviderApplication.java b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/ProviderApplication.java index 46f759b548..43e49c5662 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/ProviderApplication.java +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/ProviderApplication.java @@ -1,3 +1,20 @@ +/* + * 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.samples.provider; import okhttp3.MediaType; From 1f4321a6185ce8000ba99f324b5207e8658a1749 Mon Sep 17 00:00:00 2001 From: nameless Date: Sat, 2 Dec 2023 22:59:06 +0800 Subject: [PATCH 07/18] Add version --- .../dubbo-samples-test-13439-api/pom.xml | 6 ------ .../dubbo-samples-test-13439-consumer/pom.xml | 2 +- .../dubbo-samples-test-13439-provider/pom.xml | 1 - 99-integration/dubbo-samples-test-13439/pom.xml | 4 +--- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml index 75f8785014..cc89e65346 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml @@ -28,12 +28,6 @@ dubbo-samples-test-13439-api - - 8 - 8 - UTF-8 - - com.squareup.okhttp3 diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml index ce5f62613d..e1c09add77 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml @@ -31,7 +31,6 @@ 8 8 - UTF-8 @@ -45,6 +44,7 @@ junit junit test + ${junit.version} diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml index 16b5a5398d..4a4de7488e 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml @@ -31,7 +31,6 @@ 8 8 - UTF-8 diff --git a/99-integration/dubbo-samples-test-13439/pom.xml b/99-integration/dubbo-samples-test-13439/pom.xml index eef172e854..f766deffcc 100644 --- a/99-integration/dubbo-samples-test-13439/pom.xml +++ b/99-integration/dubbo-samples-test-13439/pom.xml @@ -22,9 +22,7 @@ 3.2.9 2.20.0 4.9.0 - 1.8 - 1.8 - UTF-8 + 4.13.2 From c5051c0c715bd5cdc35592c5f57338db0906f309 Mon Sep 17 00:00:00 2001 From: nameless Date: Sat, 2 Dec 2023 23:04:02 +0800 Subject: [PATCH 08/18] Add license --- 99-integration/dubbo-samples-test-13439/pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/99-integration/dubbo-samples-test-13439/pom.xml b/99-integration/dubbo-samples-test-13439/pom.xml index f766deffcc..ed52cbc287 100644 --- a/99-integration/dubbo-samples-test-13439/pom.xml +++ b/99-integration/dubbo-samples-test-13439/pom.xml @@ -1,4 +1,21 @@ + + From 43ec02217e23810a9565d00a8d91da0f4ef06b02 Mon Sep 17 00:00:00 2001 From: namelessssssssssss <100946116+namelessssssssssss@users.noreply.github.com> Date: Sat, 2 Dec 2023 23:11:54 +0800 Subject: [PATCH 09/18] Update pom.xml --- 1-basic/dubbo-samples-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1-basic/dubbo-samples-api/pom.xml b/1-basic/dubbo-samples-api/pom.xml index 560ff1a744..ae015a5743 100644 --- a/1-basic/dubbo-samples-api/pom.xml +++ b/1-basic/dubbo-samples-api/pom.xml @@ -40,7 +40,7 @@ 1.8 UTF-8 - 3.3.0-beta.2-NACOS-METADATA + 3.3.0-beta.1 2.20.0 5.9.2 From 7077b5c4399965b126b1db11e5680aab5cacec70 Mon Sep 17 00:00:00 2001 From: namelessssssssssss <100946116+namelessssssssssss@users.noreply.github.com> Date: Sat, 2 Dec 2023 23:12:07 +0800 Subject: [PATCH 10/18] Update pom.xml --- 2-advanced/dubbo-samples-triple-no-idl/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2-advanced/dubbo-samples-triple-no-idl/pom.xml b/2-advanced/dubbo-samples-triple-no-idl/pom.xml index f28acd7dd3..e4576f8b42 100644 --- a/2-advanced/dubbo-samples-triple-no-idl/pom.xml +++ b/2-advanced/dubbo-samples-triple-no-idl/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.3.0-beta.2-NACOS-METADATA + 3.3.0-beta.1 3.19.6 2.20.0 From 6711973258b6fc22e08746b3c2d5b7b68a932103 Mon Sep 17 00:00:00 2001 From: namelessssssssssss <100946116+namelessssssssssss@users.noreply.github.com> Date: Sat, 2 Dec 2023 23:14:21 +0800 Subject: [PATCH 11/18] Update pom.xml --- 2-advanced/dubbo-samples-triple-no-idl/pom.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/2-advanced/dubbo-samples-triple-no-idl/pom.xml b/2-advanced/dubbo-samples-triple-no-idl/pom.xml index e4576f8b42..8e8f89b648 100644 --- a/2-advanced/dubbo-samples-triple-no-idl/pom.xml +++ b/2-advanced/dubbo-samples-triple-no-idl/pom.xml @@ -41,21 +41,10 @@ - - com.alibaba.nacos - nacos-client - 2.1.1 - org.apache.dubbo dubbo ${dubbo.version} - - - com.alibaba.nacos - nacos-client - - org.apache.dubbo From 545d48ff91c8425f896fe79c82d9875d44c54e79 Mon Sep 17 00:00:00 2001 From: namelessssssssssss <100946116+namelessssssssssss@users.noreply.github.com> Date: Sat, 2 Dec 2023 23:16:22 +0800 Subject: [PATCH 12/18] Update ProviderApplication.java --- .../org/apache/dubbo/samples/provider/ProviderApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/ProviderApplication.java b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/ProviderApplication.java index 43e49c5662..7841559ef0 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/ProviderApplication.java +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/src/main/java/org/apache/dubbo/samples/provider/ProviderApplication.java @@ -70,7 +70,7 @@ private static void prepareNacosServer() throws IOException{ Response response = client.newCall(request).execute(); Response response2 = client.newCall(request2).execute(); ) { - if (!response.isSuccessful() && !response2.isSuccessful()) { + if (!response.isSuccessful() || !response2.isSuccessful()) { throw new IOException("Can not access nacos server."); } } From 2bff63d7f15809f2dc8e027db5576a1e3a5d2c22 Mon Sep 17 00:00:00 2001 From: nameless Date: Sun, 3 Dec 2023 00:29:16 +0800 Subject: [PATCH 13/18] Fix java version --- .../dubbo-samples-test-13439-api/pom.xml | 7 +++++++ .../dubbo-samples-test-13439-consumer/pom.xml | 3 +++ .../dubbo-samples-test-13439-provider/pom.xml | 2 ++ 99-integration/dubbo-samples-test-13439/pom.xml | 3 +++ 4 files changed, 15 insertions(+) diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml index cc89e65346..1c9fc46d44 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml @@ -27,6 +27,13 @@ dubbo-samples-test-13439-api + Dubbo Samples Test for 13439 api + pom + + + 8 + 8 + diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml index e1c09add77..4365b5e880 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml @@ -27,6 +27,9 @@ dubbo-samples-test-13439-consumer + Dubbo Samples Test for 13439 consumer + pom + 8 diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml index 4a4de7488e..3f60522b02 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml @@ -27,6 +27,8 @@ dubbo-samples-test-13439-provider + Dubbo Samples Test for 13439 provider + pom 8 diff --git a/99-integration/dubbo-samples-test-13439/pom.xml b/99-integration/dubbo-samples-test-13439/pom.xml index ed52cbc287..3995094432 100644 --- a/99-integration/dubbo-samples-test-13439/pom.xml +++ b/99-integration/dubbo-samples-test-13439/pom.xml @@ -28,6 +28,7 @@ dubbo-samples-test-13439 + Dubbo Samples Test for 13439 pom dubbo-samples-test-13439-provider @@ -36,6 +37,8 @@ + 8 + 8 3.2.9 2.20.0 4.9.0 From 5a525f01606616cda6bbc9cb859dea9591e9e7bc Mon Sep 17 00:00:00 2001 From: nameless Date: Sun, 3 Dec 2023 12:41:56 +0800 Subject: [PATCH 14/18] Fix project structure --- .../dubbo-samples-test-13439-provider/pom.xml | 3 +-- 99-integration/dubbo-samples-test-13439/pom.xml | 11 +++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml index 3f60522b02..f1e9ae7861 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml @@ -28,7 +28,6 @@ dubbo-samples-test-13439-provider Dubbo Samples Test for 13439 provider - pom 8 @@ -39,7 +38,7 @@ org.apache.dubbo dubbo-samples-test-13439-api - 1.0-SNAPSHOT + ${project.version} diff --git a/99-integration/dubbo-samples-test-13439/pom.xml b/99-integration/dubbo-samples-test-13439/pom.xml index 3995094432..cfcab1fe7a 100644 --- a/99-integration/dubbo-samples-test-13439/pom.xml +++ b/99-integration/dubbo-samples-test-13439/pom.xml @@ -21,15 +21,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.dubbo - dubbo-samples-all - 1.0-SNAPSHOT - ../../pom.xml + org.apache + apache + 23 + + org.apache.dubbo dubbo-samples-test-13439 Dubbo Samples Test for 13439 + 1.0-SNAPSHOT pom + dubbo-samples-test-13439-provider dubbo-samples-test-13439-consumer From 7ea1004223e83a428a67a05e53aabe5748f551fc Mon Sep 17 00:00:00 2001 From: nameless Date: Sun, 3 Dec 2023 17:34:00 +0800 Subject: [PATCH 15/18] Fix project structure --- .../dubbo-samples-test-13439-api/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml index 1c9fc46d44..ce9c52788e 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml @@ -28,6 +28,7 @@ dubbo-samples-test-13439-api Dubbo Samples Test for 13439 api + 1.0-SNAPSHOT pom From a8cd4faee30d61625bc52dd8be5d0f58fbddd16a Mon Sep 17 00:00:00 2001 From: nameless Date: Sun, 3 Dec 2023 20:30:50 +0800 Subject: [PATCH 16/18] Fix project structure --- .../dubbo-samples-test-13439-consumer/pom.xml | 1 - .../dubbo-samples-test-13439-provider/pom.xml | 1 - 99-integration/dubbo-samples-test-13439/pom.xml | 5 +++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml index 4365b5e880..2195ec2928 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml @@ -40,7 +40,6 @@ org.apache.dubbo dubbo-samples-test-13439-api - 1.0-SNAPSHOT diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml index f1e9ae7861..5b2942719f 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml @@ -38,7 +38,6 @@ org.apache.dubbo dubbo-samples-test-13439-api - ${project.version} diff --git a/99-integration/dubbo-samples-test-13439/pom.xml b/99-integration/dubbo-samples-test-13439/pom.xml index cfcab1fe7a..ba28d3634f 100644 --- a/99-integration/dubbo-samples-test-13439/pom.xml +++ b/99-integration/dubbo-samples-test-13439/pom.xml @@ -50,6 +50,11 @@ + + org.apache.dubbo + dubbo-samples-test-13439-api + ${project.version} + org.apache.dubbo dubbo-dependencies-bom From 6d1d89a6ff668c330d3cc6a10136a6457efc1025 Mon Sep 17 00:00:00 2001 From: namelessssssssssss <1544669126@qq.com> Date: Mon, 4 Dec 2023 21:27:54 +0800 Subject: [PATCH 17/18] Fix pom --- .../dubbo-samples-test-13439-api/pom.xml | 3 +-- .../dubbo-samples-test-13439-consumer/pom.xml | 1 - .../dubbo-samples-test-13439-provider/pom.xml | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml index ce9c52788e..ea2ed98f84 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml @@ -21,14 +21,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.dubbo dubbo-samples-test-13439 + org.apache.dubbo 1.0-SNAPSHOT dubbo-samples-test-13439-api Dubbo Samples Test for 13439 api - 1.0-SNAPSHOT pom diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml index 2195ec2928..1b427a9bc0 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml @@ -30,7 +30,6 @@ Dubbo Samples Test for 13439 consumer pom - 8 8 diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml index 5b2942719f..dbe4fd0441 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml @@ -28,6 +28,7 @@ dubbo-samples-test-13439-provider Dubbo Samples Test for 13439 provider + pom 8 From 35b407c3a887a7ac1ea08aee8215e8080ff708ed Mon Sep 17 00:00:00 2001 From: namelessssssssssss <1544669126@qq.com> Date: Mon, 4 Dec 2023 23:01:40 +0800 Subject: [PATCH 18/18] Fix pom --- .../dubbo-samples-test-13439-api/pom.xml | 7 ------- .../dubbo-samples-test-13439-consumer/pom.xml | 6 ------ .../dubbo-samples-test-13439-provider/pom.xml | 6 ------ 99-integration/dubbo-samples-test-13439/pom.xml | 2 +- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml index ea2ed98f84..fe3a7b6717 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-api/pom.xml @@ -28,12 +28,6 @@ dubbo-samples-test-13439-api Dubbo Samples Test for 13439 api - pom - - - 8 - 8 - @@ -58,7 +52,6 @@ log4j-slf4j-impl ${log4j2.version} - diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml index 1b427a9bc0..4e68ecc8fc 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-consumer/pom.xml @@ -28,12 +28,6 @@ dubbo-samples-test-13439-consumer Dubbo Samples Test for 13439 consumer - pom - - - 8 - 8 - diff --git a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml index dbe4fd0441..d2a30aa218 100644 --- a/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml +++ b/99-integration/dubbo-samples-test-13439/dubbo-samples-test-13439-provider/pom.xml @@ -28,12 +28,6 @@ dubbo-samples-test-13439-provider Dubbo Samples Test for 13439 provider - pom - - - 8 - 8 - diff --git a/99-integration/dubbo-samples-test-13439/pom.xml b/99-integration/dubbo-samples-test-13439/pom.xml index ba28d3634f..284290f87b 100644 --- a/99-integration/dubbo-samples-test-13439/pom.xml +++ b/99-integration/dubbo-samples-test-13439/pom.xml @@ -34,9 +34,9 @@ pom + dubbo-samples-test-13439-api dubbo-samples-test-13439-provider dubbo-samples-test-13439-consumer - dubbo-samples-test-13439-api