You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by sa...@apache.org on 2022/01/16 03:59:56 UTC
[incubator-shenyu] branch master updated: [type: refactor] Remove example moudle from shenyu (#2777)
This is an automated email from the ASF dual-hosted git repository.
sabersola pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new bc21a15 [type: refactor] Remove example moudle from shenyu (#2777)
bc21a15 is described below
commit bc21a150d1ee820074dc61ac7beae4d3ad44b44d
Author: Kunshuai Zhu <jo...@gmail.com>
AuthorDate: Sun Jan 16 11:59:50 2022 +0800
[type: refactor] Remove example moudle from shenyu (#2777)
* Remove examples moudle from shenyu
* Specified branch
---
.github/workflows/integrated-test-agent-tracing.yml | 3 +++
.github/workflows/integrated-test.yml | 3 +++
pom.xml | 2 --
.../shenyu-examples-alibaba-dubbo-service/pom.xml | 2 +-
.../shenyu-examples-apache-dubbo-service-xml/pom.xml | 2 +-
.../shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml | 2 +-
shenyu-examples/shenyu-examples-eureka/pom.xml | 2 +-
shenyu-examples/shenyu-examples-grpc/pom.xml | 2 +-
shenyu-examples/shenyu-examples-http/pom.xml | 2 +-
shenyu-examples/shenyu-examples-https/pom.xml | 2 +-
.../shenyu-examples-motan/shenyu-examples-motan-service/pom.xml | 2 +-
.../shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml | 2 +-
shenyu-examples/shenyu-examples-springcloud/pom.xml | 2 +-
shenyu-examples/shenyu-examples-springmvc/pom.xml | 2 +-
shenyu-examples/shenyu-examples-websocket/pom.xml | 2 +-
15 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/integrated-test-agent-tracing.yml b/.github/workflows/integrated-test-agent-tracing.yml
index 013d16e..e24eca5 100644
--- a/.github/workflows/integrated-test-agent-tracing.yml
+++ b/.github/workflows/integrated-test-agent-tracing.yml
@@ -49,6 +49,9 @@ jobs:
- name: Build with Maven
if: env.SKIP_CI != 'true'
run: ./mvnw -B clean install -Prelease,docker -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+ - name: Build examples
+ if: env.SKIP_CI != 'true'
+ run: ./mvnw -B clean install -Pexample -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -f ./shenyu-examples/pom.xml
- name: Build integrated tests for agent
if: env.SKIP_CI != 'true'
run: ./mvnw -B clean install -Pit4a -DskipTests -f ./shenyu-integrated-test/pom.xml
diff --git a/.github/workflows/integrated-test.yml b/.github/workflows/integrated-test.yml
index ae84df4..f4313b6 100644
--- a/.github/workflows/integrated-test.yml
+++ b/.github/workflows/integrated-test.yml
@@ -58,6 +58,9 @@ jobs:
- name: Build with Maven
if: env.SKIP_CI != 'true'
run: ./mvnw -B clean install -Prelease,docker -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
+ - name: Build examples
+ if: env.SKIP_CI != 'true'
+ run: ./mvnw -B clean install -Pexample -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -f ./shenyu-examples/pom.xml
- name: Build integrated tests
if: env.SKIP_CI != 'true'
run: ./mvnw -B clean install -Pit -DskipTests -f ./shenyu-integrated-test/pom.xml
diff --git a/pom.xml b/pom.xml
index e77631f..dd815be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,6 @@
<module>shenyu-dist</module>
<module>shenyu-agent</module>
<module>shenyu-loadbalancer</module>
- <module>shenyu-examples</module>
- <module>shenyu-integrated-test</module>
</modules>
<licenses>
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/pom.xml b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/pom.xml
index fb017df..bcff465 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/pom.xml
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/pom.xml
@@ -132,7 +132,7 @@
<profiles>
<profile>
- <id>docker</id>
+ <id>example</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/pom.xml b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/pom.xml
index 85b20c0..73ecd1a 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/pom.xml
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/pom.xml
@@ -146,7 +146,7 @@
<profiles>
<profile>
- <id>docker</id>
+ <id>example</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml
index 378c719..160b341 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml
@@ -147,7 +147,7 @@
<profiles>
<profile>
- <id>docker</id>
+ <id>example</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
diff --git a/shenyu-examples/shenyu-examples-eureka/pom.xml b/shenyu-examples/shenyu-examples-eureka/pom.xml
index 987b0fc..11766a4 100644
--- a/shenyu-examples/shenyu-examples-eureka/pom.xml
+++ b/shenyu-examples/shenyu-examples-eureka/pom.xml
@@ -97,7 +97,7 @@
<profiles>
<profile>
- <id>docker</id>
+ <id>example</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
diff --git a/shenyu-examples/shenyu-examples-grpc/pom.xml b/shenyu-examples/shenyu-examples-grpc/pom.xml
index 0e9795f..a836d30 100644
--- a/shenyu-examples/shenyu-examples-grpc/pom.xml
+++ b/shenyu-examples/shenyu-examples-grpc/pom.xml
@@ -113,7 +113,7 @@
<profiles>
<profile>
- <id>docker</id>
+ <id>example</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
diff --git a/shenyu-examples/shenyu-examples-http/pom.xml b/shenyu-examples/shenyu-examples-http/pom.xml
index 3fef347..2020e4a 100644
--- a/shenyu-examples/shenyu-examples-http/pom.xml
+++ b/shenyu-examples/shenyu-examples-http/pom.xml
@@ -87,7 +87,7 @@
<profiles>
<profile>
- <id>docker</id>
+ <id>example</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
diff --git a/shenyu-examples/shenyu-examples-https/pom.xml b/shenyu-examples/shenyu-examples-https/pom.xml
index ebc7e75..cd82f8e 100644
--- a/shenyu-examples/shenyu-examples-https/pom.xml
+++ b/shenyu-examples/shenyu-examples-https/pom.xml
@@ -73,7 +73,7 @@
<profiles>
<profile>
- <id>docker</id>
+ <id>example</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
diff --git a/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/pom.xml b/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/pom.xml
index 7cd5d4e..fd31ba4 100644
--- a/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/pom.xml
+++ b/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/pom.xml
@@ -71,7 +71,7 @@
<profiles>
<profile>
- <id>docker</id>
+ <id>example</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
diff --git a/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml b/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
index 44be48d..67674e0 100644
--- a/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
+++ b/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
@@ -90,7 +90,7 @@
<profiles>
<profile>
- <id>docker</id>
+ <id>example</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
diff --git a/shenyu-examples/shenyu-examples-springcloud/pom.xml b/shenyu-examples/shenyu-examples-springcloud/pom.xml
index 84627bb..7a32960 100644
--- a/shenyu-examples/shenyu-examples-springcloud/pom.xml
+++ b/shenyu-examples/shenyu-examples-springcloud/pom.xml
@@ -92,7 +92,7 @@
<profiles>
<profile>
- <id>docker</id>
+ <id>example</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
diff --git a/shenyu-examples/shenyu-examples-springmvc/pom.xml b/shenyu-examples/shenyu-examples-springmvc/pom.xml
index 311572a..926136c 100644
--- a/shenyu-examples/shenyu-examples-springmvc/pom.xml
+++ b/shenyu-examples/shenyu-examples-springmvc/pom.xml
@@ -62,7 +62,7 @@
<profiles>
<profile>
- <id>docker</id>
+ <id>example</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
diff --git a/shenyu-examples/shenyu-examples-websocket/pom.xml b/shenyu-examples/shenyu-examples-websocket/pom.xml
index eefea2f..01d3996 100644
--- a/shenyu-examples/shenyu-examples-websocket/pom.xml
+++ b/shenyu-examples/shenyu-examples-websocket/pom.xml
@@ -71,7 +71,7 @@
<profiles>
<profile>
- <id>docker</id>
+ <id>example</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>