From 93d5ce1054eb44e23eb58da2a5371d7ff163b89d Mon Sep 17 00:00:00 2001
From: mercyblitz <mercyblitz@gmail.com>
Date: Fri, 6 Mar 2020 14:20:28 +0800
Subject: [PATCH] Polish alibaba/spring-cloud-alibaba/#1222 : Resolve the
 relative path of pom.xml

---
 spring-cloud-alibaba-coverage/pom.xml                        | 5 ++++-
 spring-cloud-alibaba-docs/pom.xml                            | 2 ++
 spring-cloud-alibaba-examples/pom.xml                        | 1 +
 spring-cloud-starter-alibaba/pom.xml                         | 2 ++
 .../spring-cloud-alibaba-sentinel-datasource/pom.xml         | 4 +++-
 .../spring-cloud-alibaba-sentinel-gateway/pom.xml            | 4 +++-
 .../spring-cloud-circuitbreaker-sentinel/pom.xml             | 4 +++-
 .../spring-cloud-starter-alibaba-nacos-config/pom.xml        | 2 ++
 .../spring-cloud-starter-alibaba-nacos-discovery/pom.xml     | 2 ++
 .../spring-cloud-starter-alibaba-seata/pom.xml               | 2 ++
 .../spring-cloud-starter-alibaba-sentinel/pom.xml            | 2 ++
 .../spring-cloud-starter-alibaba-sidecar/pom.xml             | 2 ++
 .../spring-cloud-starter-bus-rocketmq/pom.xml                | 2 ++
 .../spring-cloud-starter-dubbo/pom.xml                       | 2 ++
 .../spring-cloud-starter-stream-rocketmq/pom.xml             | 1 +
 spring-cloud-starter-alicloud/pom.xml                        | 2 ++
 .../spring-cloud-alicloud-context/pom.xml                    | 4 +++-
 .../spring-cloud-starter-alicloud-acm/pom.xml                | 2 ++
 .../spring-cloud-starter-alicloud-ans/pom.xml                | 2 ++
 .../spring-cloud-starter-alicloud-oss/pom.xml                | 2 ++
 .../spring-cloud-starter-alicloud-schedulerx/pom.xml         | 2 ++
 .../spring-cloud-starter-alicloud-sms/pom.xml                | 2 ++
 22 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-alibaba-coverage/pom.xml b/spring-cloud-alibaba-coverage/pom.xml
index 7930793d..2487908b 100644
--- a/spring-cloud-alibaba-coverage/pom.xml
+++ b/spring-cloud-alibaba-coverage/pom.xml
@@ -2,12 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-alibaba-coverage</artifactId>
     <name>Spring Cloud Alibaba Coverage</name>
diff --git a/spring-cloud-alibaba-docs/pom.xml b/spring-cloud-alibaba-docs/pom.xml
index 9b486a08..6b9159de 100644
--- a/spring-cloud-alibaba-docs/pom.xml
+++ b/spring-cloud-alibaba-docs/pom.xml
@@ -6,7 +6,9 @@
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-alibaba-docs</artifactId>
diff --git a/spring-cloud-alibaba-examples/pom.xml b/spring-cloud-alibaba-examples/pom.xml
index b4e6e49e..0de5fc3d 100644
--- a/spring-cloud-alibaba-examples/pom.xml
+++ b/spring-cloud-alibaba-examples/pom.xml
@@ -8,6 +8,7 @@
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-alibaba-examples</artifactId>
diff --git a/spring-cloud-starter-alibaba/pom.xml b/spring-cloud-starter-alibaba/pom.xml
index 5628330c..0838d8b1 100644
--- a/spring-cloud-starter-alibaba/pom.xml
+++ b/spring-cloud-starter-alibaba/pom.xml
@@ -1,12 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>spring-cloud-starter-alibaba</artifactId>
     <packaging>pom</packaging>
     <name>Spring Cloud Alibaba Starters</name>
diff --git a/spring-cloud-starter-alibaba/spring-cloud-alibaba-sentinel-datasource/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-alibaba-sentinel-datasource/pom.xml
index 96bb26ed..dbfc47fb 100644
--- a/spring-cloud-starter-alibaba/spring-cloud-alibaba-sentinel-datasource/pom.xml
+++ b/spring-cloud-starter-alibaba/spring-cloud-alibaba-sentinel-datasource/pom.xml
@@ -4,9 +4,11 @@
 
     <parent>
         <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-alibaba</artifactId>
+        <artifactId>spring-cloud-starter-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-alibaba-sentinel-datasource</artifactId>
diff --git a/spring-cloud-starter-alibaba/spring-cloud-alibaba-sentinel-gateway/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-alibaba-sentinel-gateway/pom.xml
index 3b8084c3..5cd73a06 100644
--- a/spring-cloud-starter-alibaba/spring-cloud-alibaba-sentinel-gateway/pom.xml
+++ b/spring-cloud-starter-alibaba/spring-cloud-alibaba-sentinel-gateway/pom.xml
@@ -4,9 +4,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-alibaba</artifactId>
+        <artifactId>spring-cloud-starter-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
diff --git a/spring-cloud-starter-alibaba/spring-cloud-circuitbreaker-sentinel/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-circuitbreaker-sentinel/pom.xml
index 6617e3f8..dde7426e 100644
--- a/spring-cloud-starter-alibaba/spring-cloud-circuitbreaker-sentinel/pom.xml
+++ b/spring-cloud-starter-alibaba/spring-cloud-circuitbreaker-sentinel/pom.xml
@@ -4,9 +4,11 @@
 
     <parent>
         <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-alibaba</artifactId>
+        <artifactId>spring-cloud-starter-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-circuitbreaker-sentinel</artifactId>
diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config/pom.xml
index 569ddc13..c2bc738c 100644
--- a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config/pom.xml
+++ b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config/pom.xml
@@ -6,7 +6,9 @@
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
     <name>Spring Cloud Starter Alibaba Nacos Config</name>
 
diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-discovery/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-discovery/pom.xml
index 91de6cf1..fdb4e11d 100644
--- a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-discovery/pom.xml
+++ b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-discovery/pom.xml
@@ -6,7 +6,9 @@
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
     <name>Spring Cloud Starter Alibaba Nacos Discovery</name>
 
diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-seata/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-seata/pom.xml
index d3a34fec..e8a78dd9 100644
--- a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-seata/pom.xml
+++ b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-seata/pom.xml
@@ -6,7 +6,9 @@
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
     <name>Spring Cloud Starter Alibaba Seata</name>
 
diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml
index f1c8b2a3..29c9ed58 100644
--- a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml
+++ b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml
@@ -6,7 +6,9 @@
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
     <name>Spring Cloud Starter Alibaba Sentinel</name>
 
diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sidecar/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sidecar/pom.xml
index a7f03dfb..0177b7d5 100644
--- a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sidecar/pom.xml
+++ b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sidecar/pom.xml
@@ -2,12 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <parent>
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-starter-alibaba-sidecar</artifactId>
diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/pom.xml
index 4867b541..d1fec7fd 100644
--- a/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/pom.xml
+++ b/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/pom.xml
@@ -2,12 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <parent>
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-starter-bus-rocketmq</artifactId>
diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-dubbo/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-dubbo/pom.xml
index 2e87378b..2b985f02 100644
--- a/spring-cloud-starter-alibaba/spring-cloud-starter-dubbo/pom.xml
+++ b/spring-cloud-starter-alibaba/spring-cloud-starter-dubbo/pom.xml
@@ -2,12 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <parent>
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-starter-dubbo</artifactId>
diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml
index 47def7d5..1d5fc759 100644
--- a/spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml
+++ b/spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml
@@ -8,6 +8,7 @@
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>spring-cloud-starter-stream-rocketmq</artifactId>
     <name>Spring Cloud Starter Stream RocketMQ</name>
 
diff --git a/spring-cloud-starter-alicloud/pom.xml b/spring-cloud-starter-alicloud/pom.xml
index e4b8a527..06313076 100644
--- a/spring-cloud-starter-alicloud/pom.xml
+++ b/spring-cloud-starter-alicloud/pom.xml
@@ -1,12 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>spring-cloud-starter-alicloud</artifactId>
     <packaging>pom</packaging>
     <name>Spring Cloud Alibaba Cloud Starters</name>
diff --git a/spring-cloud-starter-alicloud/spring-cloud-alicloud-context/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-alicloud-context/pom.xml
index cbb58a38..2f7aee35 100644
--- a/spring-cloud-starter-alicloud/spring-cloud-alicloud-context/pom.xml
+++ b/spring-cloud-starter-alicloud/spring-cloud-alicloud-context/pom.xml
@@ -4,9 +4,11 @@
 
     <parent>
         <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-alibaba</artifactId>
+        <artifactId>spring-cloud-starter-alicloud</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-alicloud-context</artifactId>
diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml
index 045a5e41..0ba4cd28 100644
--- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml
+++ b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml
@@ -6,7 +6,9 @@
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alicloud</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>spring-cloud-starter-alicloud-acm</artifactId>
     <name>Spring Cloud Starter Alibaba Cloud ACM</name>
 
diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml
index 91f3e175..0f50827d 100644
--- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml
+++ b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml
@@ -2,10 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alicloud</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>spring-cloud-starter-alicloud-ans</artifactId>
diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-oss/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-oss/pom.xml
index 739127f4..1c38c12f 100644
--- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-oss/pom.xml
+++ b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-oss/pom.xml
@@ -6,7 +6,9 @@
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alicloud</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>spring-cloud-starter-alicloud-oss</artifactId>
     <name>Spring Cloud Starter Alibaba Cloud OSS</name>
 
diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/pom.xml
index 98e112a9..6076036f 100644
--- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/pom.xml
+++ b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/pom.xml
@@ -6,7 +6,9 @@
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alicloud</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>spring-cloud-starter-alicloud-schedulerx</artifactId>
     <name>Spring Cloud Starter Alibaba Cloud SchedulerX</name>
 
diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/pom.xml
index 7f92c2c6..b535a7cb 100644
--- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/pom.xml
+++ b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/pom.xml
@@ -6,7 +6,9 @@
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alicloud</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>spring-cloud-starter-alicloud-sms</artifactId>
     <name>Spring Cloud Starter Alibaba Cloud SMS</name>