You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/12/12 13:06:17 UTC

[2/7] incubator-brooklyn git commit: remove duplicate dependencies (causes warnings in maven build)

remove duplicate dependencies (causes warnings in maven build)


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/eacfe137
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/eacfe137
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/eacfe137

Branch: refs/heads/master
Commit: eacfe137d91491657fa4fd76d526b576ec5cfd14
Parents: c631d0a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Dec 12 11:21:44 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Dec 12 11:21:44 2014 +0000

----------------------------------------------------------------------
 camp/camp-server/pom.xml | 6 ------
 usage/launcher/pom.xml   | 4 ----
 2 files changed, 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/eacfe137/camp/camp-server/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index 6e6ee72..45c4117 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -57,12 +57,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.brooklyn</groupId>
-            <artifactId>brooklyn-utils-test-support</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/eacfe137/usage/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml
index d105375..16a5bbf 100644
--- a/usage/launcher/pom.xml
+++ b/usage/launcher/pom.xml
@@ -117,10 +117,6 @@
             <artifactId>javax.servlet</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>