From 77eb501c09b78b195050bdb478543f9f4dbbede1 Mon Sep 17 00:00:00 2001 From: pengxiaoyu Date: Thu, 23 Nov 2023 18:25:04 +0800 Subject: [PATCH] fix:dubbo-samples-grpc upgrade --- .../dubbo-samples-original/case-versions.conf | 2 +- .../dubbo-samples-reactor/case-versions.conf | 2 +- .../case-configuration.yml | 24 +++++++++++++++++ .../dubbo-samples-rxjava/case-versions.conf | 26 +++++++++++++++++++ .../case-configuration.yml | 24 +++++++++++++++++ .../case-versions.conf | 26 +++++++++++++++++++ .../case-configuration.yml | 24 +++++++++++++++++ .../case-versions.conf | 26 +++++++++++++++++++ 8 files changed, 152 insertions(+), 2 deletions(-) create mode 100644 99-integration/dubbo-samples-grpc/dubbo-samples-rxjava/case-configuration.yml create mode 100644 99-integration/dubbo-samples-grpc/dubbo-samples-rxjava/case-versions.conf create mode 100644 99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/case-configuration.yml create mode 100644 99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/case-versions.conf create mode 100644 99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/case-configuration.yml create mode 100644 99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/case-versions.conf diff --git a/99-integration/dubbo-samples-grpc/dubbo-samples-original/case-versions.conf b/99-integration/dubbo-samples-grpc/dubbo-samples-original/case-versions.conf index 18dcecb3b5..c7510a47c4 100644 --- a/99-integration/dubbo-samples-grpc/dubbo-samples-original/case-versions.conf +++ b/99-integration/dubbo-samples-grpc/dubbo-samples-original/case-versions.conf @@ -20,7 +20,7 @@ # Supported component versions of the test case # SpringBoot app -dubbo.version=2.7*, 3.1.6 +dubbo.version=2.7*, 3.2.* spring.version=4.*, 5.* java.version= [>= 8] compiler.version=0.0.*, 3.* diff --git a/99-integration/dubbo-samples-grpc/dubbo-samples-reactor/case-versions.conf b/99-integration/dubbo-samples-grpc/dubbo-samples-reactor/case-versions.conf index 7e6cd88e17..be1e4b414a 100644 --- a/99-integration/dubbo-samples-grpc/dubbo-samples-reactor/case-versions.conf +++ b/99-integration/dubbo-samples-grpc/dubbo-samples-reactor/case-versions.conf @@ -20,7 +20,7 @@ # Supported component versions of the test case # Spring app -dubbo.version=2.7*, 3.1.6 +dubbo.version=2.7*, 3.2.* spring.version=4.*, 5.* java.version= [>= 8] compiler.version=0.0.*, 3.* diff --git a/99-integration/dubbo-samples-grpc/dubbo-samples-rxjava/case-configuration.yml b/99-integration/dubbo-samples-grpc/dubbo-samples-rxjava/case-configuration.yml new file mode 100644 index 0000000000..386ff3f4b4 --- /dev/null +++ b/99-integration/dubbo-samples-grpc/dubbo-samples-rxjava/case-configuration.yml @@ -0,0 +1,24 @@ +# 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. + +from: app-builtin-zookeeper.yml + +props: + project_name: dubbo-samples-rxjava-grpc + main_class: org.apache.dubbo.samples.basic.BasicProvider + zookeeper_port: 2181 + dubbo_port: 50051 + diff --git a/99-integration/dubbo-samples-grpc/dubbo-samples-rxjava/case-versions.conf b/99-integration/dubbo-samples-grpc/dubbo-samples-rxjava/case-versions.conf new file mode 100644 index 0000000000..c7510a47c4 --- /dev/null +++ b/99-integration/dubbo-samples-grpc/dubbo-samples-rxjava/case-versions.conf @@ -0,0 +1,26 @@ +# +# +# 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. +# + + +# Supported component versions of the test case + +# SpringBoot app +dubbo.version=2.7*, 3.2.* +spring.version=4.*, 5.* +java.version= [>= 8] +compiler.version=0.0.*, 3.* diff --git a/99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/case-configuration.yml b/99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/case-configuration.yml new file mode 100644 index 0000000000..7de1aa2dba --- /dev/null +++ b/99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/case-configuration.yml @@ -0,0 +1,24 @@ +# 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. + +from: app-builtin-zookeeper.yml + +props: + project_name: dubbo-samples-grpc-ssl-consumer + main_class: org.apache.dubbo.samples.basic.SslBasicConsumer + zookeeper_port: 2181 + dubbo_port: 50051 + diff --git a/99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/case-versions.conf b/99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/case-versions.conf new file mode 100644 index 0000000000..c7510a47c4 --- /dev/null +++ b/99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/case-versions.conf @@ -0,0 +1,26 @@ +# +# +# 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. +# + + +# Supported component versions of the test case + +# SpringBoot app +dubbo.version=2.7*, 3.2.* +spring.version=4.*, 5.* +java.version= [>= 8] +compiler.version=0.0.*, 3.* diff --git a/99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/case-configuration.yml b/99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/case-configuration.yml new file mode 100644 index 0000000000..123ae927e8 --- /dev/null +++ b/99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/case-configuration.yml @@ -0,0 +1,24 @@ +# 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. + +from: app-builtin-zookeeper.yml + +props: + project_name: dubbo-samples-grpc-ssl-provider + main_class: org.apache.dubbo.samples.basic.SslBasicProvider + zookeeper_port: 2181 + dubbo_port: 50051 + diff --git a/99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/case-versions.conf b/99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/case-versions.conf new file mode 100644 index 0000000000..c7510a47c4 --- /dev/null +++ b/99-integration/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/case-versions.conf @@ -0,0 +1,26 @@ +# +# +# 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. +# + + +# Supported component versions of the test case + +# SpringBoot app +dubbo.version=2.7*, 3.2.* +spring.version=4.*, 5.* +java.version= [>= 8] +compiler.version=0.0.*, 3.*