From 2a1355354408155ee939097cfffa845a7b1bdd77 Mon Sep 17 00:00:00 2001
From: Fahim Farook <fahim@fahimfarook.me>
Date: Wed, 23 May 2018 19:25:44 +0530
Subject: [PATCH] Fixes failing maven eclipse:eclipse goal. (#2953)

---
 docs/pom.xml                                                 | 1 -
 pom.xml                                                      | 5 ++---
 spring-cloud-netflix-archaius/pom.xml                        | 3 ---
 spring-cloud-netflix-core/pom.xml                            | 3 ---
 spring-cloud-netflix-eureka-client/pom.xml                   | 3 +--
 spring-cloud-netflix-eureka-server/pom.xml                   | 1 -
 spring-cloud-netflix-hystrix-contract/pom.xml                | 1 -
 spring-cloud-netflix-hystrix-dashboard/pom.xml               | 3 ---
 spring-cloud-netflix-hystrix-stream/pom.xml                  | 3 ---
 spring-cloud-netflix-ribbon/pom.xml                          | 3 ---
 spring-cloud-netflix-sidecar/pom.xml                         | 3 ---
 spring-cloud-netflix-turbine-stream/pom.xml                  | 1 -
 spring-cloud-netflix-turbine/pom.xml                         | 1 -
 spring-cloud-netflix-zuul/pom.xml                            | 1 -
 .../spring-cloud-starter-netflix-archaius/pom.xml            | 3 ---
 .../spring-cloud-starter-netflix-atlas/pom.xml               | 3 ---
 .../spring-cloud-starter-netflix-eureka-client/pom.xml       | 3 ---
 .../spring-cloud-starter-netflix-eureka-server/pom.xml       | 3 ---
 .../spring-cloud-starter-netflix-hystrix-dashboard/pom.xml   | 3 ---
 .../spring-cloud-starter-netflix-hystrix/pom.xml             | 3 ---
 .../spring-cloud-starter-netflix-ribbon/pom.xml              | 3 ---
 .../spring-cloud-starter-netflix-turbine-stream/pom.xml      | 1 -
 .../spring-cloud-starter-netflix-turbine/pom.xml             | 1 -
 .../spring-cloud-starter-netflix-zuul/pom.xml                | 3 ---
 24 files changed, 3 insertions(+), 55 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index f94598fa5..8ddd93453 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -13,7 +13,6 @@
 	<description>Spring Cloud Docs</description>
 	<properties>
 		<docs.main>spring-cloud-netflix</docs.main>
-		<main.basedir>${basedir}/..</main.basedir>
 		<docs.whitelisted.branches>1.2.x,1.3.x,1.4.x</docs.whitelisted.branches>
 	</properties>
 	<build>
diff --git a/pom.xml b/pom.xml
index f4eaaa667..0c85deca4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,6 @@
 	</scm>
 	<properties>
 		<bintray.package>netflix</bintray.package>
-		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.7.3</jackson.version>
 		<spring-cloud-commons.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
 		<spring-cloud-config.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-config.version>
@@ -50,11 +49,11 @@
 					<additionalConfig>
 						<file>
 							<name>.settings/org.eclipse.jdt.ui.prefs</name>
-							<location>${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs</location>
+							<location>${maven.multiModuleProjectDirectory}/eclipse/org.eclipse.jdt.ui.prefs</location>
 						</file>
 						<file>
 							<name>.settings/org.eclipse.jdt.core.prefs</name>
-							<location>${main.basedir}/eclipse/org.eclipse.jdt.core.prefs</location>
+							<location>${maven.multiModuleProjectDirectory}/eclipse/org.eclipse.jdt.core.prefs</location>
 						</file>
 					</additionalConfig>
 				</configuration>
diff --git a/spring-cloud-netflix-archaius/pom.xml b/spring-cloud-netflix-archaius/pom.xml
index bfef5c55e..3f544573c 100644
--- a/spring-cloud-netflix-archaius/pom.xml
+++ b/spring-cloud-netflix-archaius/pom.xml
@@ -15,9 +15,6 @@
     <packaging>jar</packaging>
     <name>Spring Cloud Netflix Archaius</name>
     <description>Spring Cloud Netflix Archaius</description>
-    <properties>
-        <main.basedir>${basedir}/..</main.basedir>
-    </properties>
 
     <dependencies>
         <dependency>
diff --git a/spring-cloud-netflix-core/pom.xml b/spring-cloud-netflix-core/pom.xml
index 114905b82..4cda307bb 100644
--- a/spring-cloud-netflix-core/pom.xml
+++ b/spring-cloud-netflix-core/pom.xml
@@ -12,9 +12,6 @@
 	<packaging>jar</packaging>
 	<name>Spring Cloud Netflix Core</name>
 	<description>Spring Cloud Netflix Core</description>
-	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml
index c6d832ea3..a69dadb07 100644
--- a/spring-cloud-netflix-eureka-client/pom.xml
+++ b/spring-cloud-netflix-eureka-client/pom.xml
@@ -14,8 +14,7 @@
 	<description>Spring Cloud Netflix Eureka Client</description>
 	<properties>
 		<!-- Why do I need this now? -->
-		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
-		<main.basedir>${basedir}/..</main.basedir>
+		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>		
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml
index 02a94e38f..edb5735e7 100644
--- a/spring-cloud-netflix-eureka-server/pom.xml
+++ b/spring-cloud-netflix-eureka-server/pom.xml
@@ -12,7 +12,6 @@
 	<name>Spring Cloud Netflix Eureka Server</name>
 	<url>https://projects.spring.io/spring-cloud/</url>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
 		<wro4j.version>1.7.9</wro4j.version>
 	</properties>
 	<dependencies>
diff --git a/spring-cloud-netflix-hystrix-contract/pom.xml b/spring-cloud-netflix-hystrix-contract/pom.xml
index 93f5dad23..d6c314391 100644
--- a/spring-cloud-netflix-hystrix-contract/pom.xml
+++ b/spring-cloud-netflix-hystrix-contract/pom.xml
@@ -14,7 +14,6 @@
 	<name>spring-cloud-netflix-hystrix-contract</name>
 	<description>Spring Cloud Netflix Hystrix Contract</description>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
 		<donotreplacespring-cloud-contract.version>1.2.4.RELEASE</donotreplacespring-cloud-contract.version>
 	</properties>
 	<dependencies>
diff --git a/spring-cloud-netflix-hystrix-dashboard/pom.xml b/spring-cloud-netflix-hystrix-dashboard/pom.xml
index da5f03d38..bd523eb0d 100644
--- a/spring-cloud-netflix-hystrix-dashboard/pom.xml
+++ b/spring-cloud-netflix-hystrix-dashboard/pom.xml
@@ -11,9 +11,6 @@
 		<version>2.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
-	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-netflix-hystrix-stream/pom.xml b/spring-cloud-netflix-hystrix-stream/pom.xml
index 5d6d4d315..a6a55b55c 100644
--- a/spring-cloud-netflix-hystrix-stream/pom.xml
+++ b/spring-cloud-netflix-hystrix-stream/pom.xml
@@ -12,9 +12,6 @@
 	<packaging>jar</packaging>
 	<name>Spring Cloud Netflix Hystrix Stream</name>
 	<description>Spring Cloud Netflix Hystrix Stream</description>
-	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-netflix-ribbon/pom.xml b/spring-cloud-netflix-ribbon/pom.xml
index 3214c636c..45804e36a 100644
--- a/spring-cloud-netflix-ribbon/pom.xml
+++ b/spring-cloud-netflix-ribbon/pom.xml
@@ -12,9 +12,6 @@
 
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-netflix-ribbon</artifactId>
-    <properties>
-        <main.basedir>${basedir}/..</main.basedir>
-    </properties>
 
     <dependencies>
         <dependency>
diff --git a/spring-cloud-netflix-sidecar/pom.xml b/spring-cloud-netflix-sidecar/pom.xml
index be80b9f1f..241c297d8 100644
--- a/spring-cloud-netflix-sidecar/pom.xml
+++ b/spring-cloud-netflix-sidecar/pom.xml
@@ -12,9 +12,6 @@
 	<packaging>jar</packaging>
 	<name>Spring Cloud Netflix Sidecar</name>
 	<url>https://projects.spring.io/spring-cloud/</url>
-	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-netflix-turbine-stream/pom.xml b/spring-cloud-netflix-turbine-stream/pom.xml
index a4b22bf0a..12c478a68 100644
--- a/spring-cloud-netflix-turbine-stream/pom.xml
+++ b/spring-cloud-netflix-turbine-stream/pom.xml
@@ -13,7 +13,6 @@
 	<name>Spring Cloud Netflix Turbine Stream</name>
 	<description>Spring Cloud Netflix Turbine Stream</description>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
 		<turbine.version>2.0.0-DP.2</turbine.version>
 	</properties>
 	<build>
diff --git a/spring-cloud-netflix-turbine/pom.xml b/spring-cloud-netflix-turbine/pom.xml
index 1185b7a57..72a7b33e0 100644
--- a/spring-cloud-netflix-turbine/pom.xml
+++ b/spring-cloud-netflix-turbine/pom.xml
@@ -13,7 +13,6 @@
 	<name>Spring Cloud Netflix Turbine</name>
 	<url>https://projects.spring.io/spring-cloud/</url>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
 		<turbine.version>1.0.0</turbine.version>
 	</properties>
 	<dependencyManagement>
diff --git a/spring-cloud-netflix-zuul/pom.xml b/spring-cloud-netflix-zuul/pom.xml
index 3cbef60aa..115d3c1fc 100644
--- a/spring-cloud-netflix-zuul/pom.xml
+++ b/spring-cloud-netflix-zuul/pom.xml
@@ -16,7 +16,6 @@
     <name>Spring Cloud Netflix Zuul</name>
     <description>Spring Cloud Netflix Zuul</description>
     <properties>
-        <main.basedir>${basedir}/..</main.basedir>
         <apachehttpclient.version>4.5.4</apachehttpclient.version>
     </properties>
 
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml
index 4095f2ab2..ba58fb4de 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml
@@ -14,9 +14,6 @@
 		<name>Pivotal Software, Inc.</name>
 		<url>https://www.spring.io</url>
 	</organization>
-	<properties>
-		<main.basedir>${basedir}/../../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-atlas/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-atlas/pom.xml
index 0749a08a0..ad358c77a 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-atlas/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-atlas/pom.xml
@@ -14,9 +14,6 @@
 		<name>Pivotal Software, Inc.</name>
 		<url>https://www.spring.io</url>
 	</organization>
-	<properties>
-		<main.basedir>${basedir}/../../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml
index 979623770..d3f57e90a 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml
@@ -14,9 +14,6 @@
 		<name>Pivotal Software, Inc.</name>
 		<url>https://www.spring.io</url>
 	</organization>
-	<properties>
-		<main.basedir>${basedir}/../../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml
index 271e852c6..c7499ca2b 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml
@@ -13,9 +13,6 @@
 		<name>Pivotal Software, Inc.</name>
 		<url>https://www.spring.io</url>
 	</organization>
-	<properties>
-		<main.basedir>${basedir}/../../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix-dashboard/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix-dashboard/pom.xml
index c6c5de7a2..69f1f8ed1 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix-dashboard/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix-dashboard/pom.xml
@@ -14,9 +14,6 @@
 		<name>Pivotal Software, Inc.</name>
 		<url>https://www.spring.io</url>
 	</organization>
-	<properties>
-		<main.basedir>${basedir}/../../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml
index e063c85d5..8620f87dc 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml
@@ -14,9 +14,6 @@
 		<name>Pivotal Software, Inc.</name>
 		<url>https://www.spring.io</url>
 	</organization>
-	<properties>
-		<main.basedir>${basedir}/../../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-ribbon/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-ribbon/pom.xml
index 9125d0099..b437c88f2 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-ribbon/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-ribbon/pom.xml
@@ -14,9 +14,6 @@
 		<name>Pivotal Software, Inc.</name>
 		<url>https://www.spring.io</url>
 	</organization>
-	<properties>
-		<main.basedir>${basedir}/../../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml
index bc993e174..74668b959 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml
@@ -15,7 +15,6 @@
 		<url>https://www.spring.io</url>
 	</organization>
 	<properties>
-		<main.basedir>${basedir}/../../..</main.basedir>
 		<turbine.version>2.0.0-DP.2</turbine.version>
 	</properties>
 	<dependencies>
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine/pom.xml
index 9465c95c2..ef33d3752 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine/pom.xml
@@ -15,7 +15,6 @@
 		<url>https://www.spring.io</url>
 	</organization>
 	<properties>
-		<main.basedir>${basedir}/../../..</main.basedir>
 		<turbine.version>1.0.0</turbine.version>
 	</properties>
 	<dependencies>
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-zuul/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-zuul/pom.xml
index 1ca7b8f7c..ec56c4ea5 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-zuul/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-zuul/pom.xml
@@ -14,9 +14,6 @@
 		<name>Pivotal Software, Inc.</name>
 		<url>https://www.spring.io</url>
 	</organization>
-	<properties>
-		<main.basedir>${basedir}/../../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>