[brooklyn-ui] branch 1.0.0 updated: Revert "allow relative path to parent to be configured"

[tb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tbouron pushed a commit to branch 1.0.0
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git


The following commit(s) were added to refs/heads/1.0.0 by this push:
     new 395e21f  Revert "allow relative path to parent to be configured"
     new 4fa5a09  Merge pull request #169 from nakomis/1.0.0-cherry-picks
395e21f is described below

commit 395e21f63574f446d6d27ccbd5e866a83719d52b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Mon Jan 20 13:12:15 2020 +0000

    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 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 303c9e9..223f950 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <groupId>org.apache.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
         <version>1.0.0</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</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 -->