You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by rdowner <gi...@git.apache.org> on 2015/05/06 11:31:29 UTC
[GitHub] incubator-brooklyn pull request: Fix version conflicts in brooklyn...
GitHub user rdowner opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/631
Fix version conflicts in brooklyn-downstream-parent
Previously caused an issue if an external project inherits from brooklyn-downstream-parent and depends on brooklyn-rest-client, as these had conflicting jersey.version properties.
First commit reorganises version properties in root pom.xml to make it easier to compare with brooklyn-downstream-parent pom.xml, but does not *change* any versions.
Second commit updates brooklyn-downstream-parent pom.xml with the same versions as the root pom.xml.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/rdowner/incubator-brooklyn downstream-parent-pom-versions
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/631.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #631
----
commit 9215c12e22ad2828901906bd2824cbc14eb2a6e3
Author: Richard Downer <ri...@apache.org>
Date: 2015-05-06T09:25:06Z
Reorganise version properties in root pom.xml
No changes to versions, simply a re-order and a comment to keep versions
synchronised with usage/downstream-parent/pom.xml
commit 0d5d79ddcca1ee90f893bb8b65c850a147e2962b
Author: Richard Downer <ri...@apache.org>
Date: 2015-05-06T09:27:09Z
Version conflicts in usage/downstream-parent/pom.xml
Synchronise version properties so that brooklyn-downstream-parent
depends on the same version dependencies as brooklyn.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix version conflicts in brooklyn...
Posted by sjcorbett <gi...@git.apache.org>.
Github user sjcorbett commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/631#issuecomment-99794161
Looks good to me.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix version conflicts in brooklyn...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-brooklyn/pull/631
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---