Repository: incubator-brooklyn Updated Branches: refs/heads/master e206168af -> 8cdb16666
Adds JCLOUDS_VERSION marker And adds JCLOUDS_GROUPID_VERSION marker. These make it easier to change the version across the board; and for downstream private projects to check / mess with dependencies as required in custom builds! Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9be60caa Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9be60caa Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9be60caa Branch: refs/heads/master Commit: 9be60caa189048b7f5e0c9e95c640ba055e075ed Parents: 906ea25 Author: Aled Sage <[email protected]> Authored: Thu Jul 30 23:29:25 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Thu Jul 30 23:29:25 2015 +0100 ---------------------------------------------------------------------- parent/pom.xml | 4 ++-- usage/downstream-parent/pom.xml | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9be60caa/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2673402..cb900b8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -68,11 +68,11 @@ <!-- Dependencies --> <brooklyn.version>0.8.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> - <jclouds.groupId>org.apache.jclouds</jclouds.groupId> + <jclouds.groupId>org.apache.jclouds</jclouds.groupId> <!-- JCLOUDS_GROUPID_VERSION --> <!-- These dependencies also appear in usage/downstream-parent/pom.xml - - please synchronise versions between these two pom files --> - <jclouds.version>1.9.0</jclouds.version> + <jclouds.version>1.9.0</jclouds.version> <!-- JCLOUDS_VERSION --> <logback.version>1.0.7</logback.version> <slf4j.version>1.6.6</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception --> <guava.version>17.0</guava.version> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9be60caa/usage/downstream-parent/pom.xml ---------------------------------------------------------------------- diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml index 0a429ec..5e403ee 100644 --- a/usage/downstream-parent/pom.xml +++ b/usage/downstream-parent/pom.xml @@ -49,8 +49,10 @@ <!-- Dependencies --> <brooklyn.version>0.8.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> + <jclouds.groupId>org.apache.jclouds</jclouds.groupId> <!-- JCLOUDS_GROUPID_VERSION --> + <!-- versions should match those used by Brooklyn, to avoid conflicts --> - <jclouds.version>1.9.0</jclouds.version> + <jclouds.version>1.9.0</jclouds.version> <!-- JCLOUDS_VERSION --> <logback.version>1.0.7</logback.version> <slf4j.version>1.6.6</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception --> <guava.version>17.0</guava.version>
