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/09/18 13:01:38 UTC

[4/5] git commit: exclude JNA (as that is LGPL licensed), as per BROOKLYN-17

exclude JNA (as that is LGPL licensed), as per BROOKLYN-17


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

Branch: refs/heads/master
Commit: 72e955c4196a4368437dc7bb7dc9d1133affbf50
Parents: 01c1688
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 17 11:27:12 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 17 14:56:35 2014 +0100

----------------------------------------------------------------------
 locations/jclouds/pom.xml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/72e955c4/locations/jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index 26052a9..fd3841e 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -110,15 +110,20 @@
         <dependency>
             <groupId>${jclouds.groupId}.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.jcraft</groupId>
+                    <artifactId>jsch.agentproxy.usocket-jna</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.jcraft</groupId>
+                    <artifactId>jsch.agentproxy.pageant</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>${jclouds.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
-            <version>${jclouds.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${jclouds.groupId}</groupId>
             <artifactId>jclouds-allblobstore</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
@@ -128,6 +133,7 @@
             <artifactId>jclouds-allcompute</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
+
         <dependency>
             <groupId>${jclouds.groupId}.labs</groupId>
             <artifactId>abiquo</artifactId>
@@ -143,6 +149,7 @@
             <artifactId>docker</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
+
         <!-- these two seem needed here to prevent Eclipse IDE from getting wrong version of logback-core -->
         <dependency>
             <groupId>ch.qos.logback</groupId>