This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 80e24d6 improve Environment keys test config (#255)
80e24d6 is described below
commit 80e24d65fcd64c2cabac443dd709823a3a397ad6
Author: daimingbao <[email protected]>
AuthorDate: Fri Jan 15 10:01:52 2021 +0800
improve Environment keys test config (#255)
---
.../case-configuration.yml | 24 ++++
dubbo-samples-environment-keys/pom.xml | 157 +++++----------------
.../main/resources/spring/dubbo-demo-consumer.xml | 2 +-
.../main/resources/spring/dubbo-demo-provider.xml | 2 +-
4 files changed, 58 insertions(+), 127 deletions(-)
diff --git a/dubbo-samples-environment-keys/case-configuration.yml
b/dubbo-samples-environment-keys/case-configuration.yml
new file mode 100644
index 0000000..3711aee
--- /dev/null
+++ b/dubbo-samples-environment-keys/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-environment-keys
+ main_class: org.apache.dubbo.samples.basic.BasicProvider
+ zookeeper_port: 2181
+ dubbo_port: 20880
+
diff --git a/dubbo-samples-environment-keys/pom.xml
b/dubbo-samples-environment-keys/pom.xml
index 458ffde..3de4ea3 100644
--- a/dubbo-samples-environment-keys/pom.xml
+++ b/dubbo-samples-environment-keys/pom.xml
@@ -30,158 +30,65 @@
<target.level>1.8</target.level>
<dubbo.version>2.7.7</dubbo.version>
<junit.version>4.12</junit.version>
- <docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
- <jib-maven-plugin.version>1.2.0</jib-maven-plugin.version>
- <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
- <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
- <image.name>${project.artifactId}:${dubbo.version}</image.name>
- <dubbo.port>20880</dubbo.port>
- <main-class>org.apache.dubbo.samples.basic.BasicProvider</main-class>
- <spring-test.version>4.3.16.RELEASE</spring-test.version>
+ <spring.version>4.3.16.RELEASE</spring.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>${spring.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-bom</artifactId>
+ <version>${dubbo.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-dependencies-zookeeper</artifactId>
+ <version>${dubbo.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
- <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-zookeeper</artifactId>
- <version>${dubbo.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring-test.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
- <profile>
- <id>dubbo-integration-test</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-maven-address-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- <executions>
- <execution>
- <goals>
- <goal>local-address</goal>
- </goals>
- <configuration>
-
<localAddress>dubbo-local-address</localAddress>
- </configuration>
- <phase>initialize</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>com.google.cloud.tools</groupId>
- <artifactId>jib-maven-plugin</artifactId>
- <version>${jib-maven-plugin.version}</version>
- <configuration>
- <from>
- <image>${java-image.name}</image>
- </from>
- <to>
- <image>${image.name}</image>
- </to>
- <container>
- <mainClass>${main-class}</mainClass>
- <ports>
- <port>${dubbo.port}</port>
- <port>2181</port>
- </ports>
- <environment>
-
<DUBBO_IP_TO_REGISTRY>${dubbo-local-address}</DUBBO_IP_TO_REGISTRY>
- </environment>
- </container>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>dockerBuild</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
- <configuration>
- <images>
- <image>
- <name>${image.name}</name>
- <run>
- <ports>
-
<port>${dubbo.port}:${dubbo.port}</port>
- <port>2181:2181</port>
- </ports>
- <wait>
- <log>dubbo service started</log>
- </wait>
- </run>
- </image>
- </images>
- </configuration>
- <executions>
- <execution>
- <id>start</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${maven-failsafe-plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/*IT.java</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
<!-- For jdk 11 above JavaEE annotation -->
<profile>
<id>javax.annotation</id>
@@ -203,7 +110,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
+ <version>3.7.0</version>
<configuration>
<source>${source.level}</source>
<target>${target.level}</target>
diff --git
a/dubbo-samples-environment-keys/src/main/resources/spring/dubbo-demo-consumer.xml
b/dubbo-samples-environment-keys/src/main/resources/spring/dubbo-demo-consumer.xml
index 86f34b4..651b7f7 100644
---
a/dubbo-samples-environment-keys/src/main/resources/spring/dubbo-demo-consumer.xml
+++
b/dubbo-samples-environment-keys/src/main/resources/spring/dubbo-demo-consumer.xml
@@ -27,7 +27,7 @@
<dubbo:application name="demo-consumer"/>
<!-- use multicast registry center to discover service -->
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
<!-- generate proxy for the remote service, then demoService can be used
in the same way as the
local regular interface -->
diff --git
a/dubbo-samples-environment-keys/src/main/resources/spring/dubbo-demo-provider.xml
b/dubbo-samples-environment-keys/src/main/resources/spring/dubbo-demo-provider.xml
index 9e13902..eb02b3b 100644
---
a/dubbo-samples-environment-keys/src/main/resources/spring/dubbo-demo-provider.xml
+++
b/dubbo-samples-environment-keys/src/main/resources/spring/dubbo-demo-provider.xml
@@ -25,7 +25,7 @@
<!-- provider's application name, used for tracing dependency relationship
-->
<dubbo:application name="demo-provider"/>
- <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
<!-- service implementation, as same as regular local bean -->
<bean id="demoService"
class="org.apache.dubbo.samples.basic.impl.DemoServiceImpl"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
