You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2017/07/28 14:41:26 UTC
[1/2] brooklyn-client git commit: Move Resteasy dependency management
to java module pom
Repository: brooklyn-client
Updated Branches:
refs/heads/master 7ec86f494 -> e6b7090a7
Move Resteasy dependency management to java module pom
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/7b5453d0
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/7b5453d0
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/7b5453d0
Branch: refs/heads/master
Commit: 7b5453d0a463df6c59ca21d8cafe5e347af54bd7
Parents: be80516
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Fri Jul 28 12:53:17 2017 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Fri Jul 28 12:53:17 2017 +0100
----------------------------------------------------------------------
java/pom.xml | 6 ++++++
pom.xml | 19 -------------------
2 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7b5453d0/java/pom.xml
----------------------------------------------------------------------
diff --git a/java/pom.xml b/java/pom.xml
index 84528e4..0590019 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -33,6 +33,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <properties>
+ <resteasy.version>3.0.19.Final</resteasy.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.brooklyn</groupId>
@@ -47,6 +51,7 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
+ <version>${resteasy.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -57,6 +62,7 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
+ <version>${resteasy.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/7b5453d0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8fa5ee5..dadaec1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,25 +66,6 @@
</mailingList>
</mailingLists>
- <properties>
- <resteasy.version>3.0.19.Final</resteasy.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson2-provider</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<repositories>
<!--
Same as in the parent apache pom. Repeated here in case
[2/2] brooklyn-client git commit: Closes #59
Posted by ge...@apache.org.
Closes #59
Move Resteasy dependency management to java module pom
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/e6b7090a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/e6b7090a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/e6b7090a
Branch: refs/heads/master
Commit: e6b7090a7bf239cf1d207c3d4896dc06b1f3eefe
Parents: 7ec86f4 7b5453d
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Fri Jul 28 15:41:16 2017 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Fri Jul 28 15:41:16 2017 +0100
----------------------------------------------------------------------
java/pom.xml | 6 ++++++
pom.xml | 19 -------------------
2 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------