commit a0e2e1e474c61f36bb1bb7f27f0b27fde5c12a3d
author Alex Heneveld <alex.heneveld@cloudsoftcorp.com> Mon Jan 20 13:12:15 2020 +0000
committer Alex Heneveld <alex.heneveld@cloudsoftcorp.com> Mon Jan 20 13:12:15 2020 +0000
tree eccb642c7d2823ee603de7ff88d96f076e172f0f
parent 1f961b769bf6804fe917f4866482d0d0f8b682bf

Revert "allow relative path to parent to be configured"

This reverts commit e8dec48eae0b07d1d2918c7315b1090e5c856345.

Seems maven doesn't actually respect a variable in relative path. I must have been taking some cached or downloaded item when i tested, as when we change the version it breaks.

Also irritating, seems maven won't look in the local reactor model so we need either relative path to work or the upstream item to have been built.

pom.xml

diff --git a/pom.xml b/pom.xml
index 538b55f..3114d25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <groupId>org.apache.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
-        <relativePath>${brooklyn.ui.relativePath.to.brooklyn.server.parent}</relativePath>
+        <relativePath>../brooklyn-server/parent/</relativePath>
     </parent>
 
     <groupId>org.apache.brooklyn.ui</groupId>
@@ -84,8 +84,6 @@
         <brooklyn.version>1.0.0-SNAPSHOT</brooklyn.version><!-- BROOKLYN_VERSION -->
         <build.version>${revision}</build.version>
         <build.name>Apache Brooklyn</build.name>
-        <brooklyn.ui.relativePath.to.brooklyn.server.parent>../brooklyn-server/parent/</brooklyn.ui.relativePath.to.brooklyn.server.parent>
-
         <buildnumber-maven-plugin.version>1.4</buildnumber-maven-plugin.version>
 
         <!-- versions from brooklyn server which have a different var name here -->