commit c9510f97118b64e1e9c7adf8e836d7335630278b
author Thomas Bouron <thomas.bouron@cloudsoftcorp.com> Mon Jan 20 14:56:44 2020 +0000
committer GitHub <noreply@github.com> Mon Jan 20 14:56:44 2020 +0000
tree ee700510ed39be988a732edc110152b426183489
parent b623b8681f6ae99481f50848595ae44253bace6a
parent a0e2e1e474c61f36bb1bb7f27f0b27fde5c12a3d

Merge pull request #167 from ahgittin/relative-path-no-var

Revert "allow relative path to parent to be configured"

pom.xml

diff --git a/pom.xml b/pom.xml
index 140e5f3..24982dc 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 -->