You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/09/22 17:12:16 UTC
[1/2] git commit: Use ASL'ed version of JNA
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master d3d2abd0f -> 888afd075
Use ASL'ed version of JNA
Instead of excluding dependencies that pull in LGPL only version of JNA force a version which is dual licensed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/23563433
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/23563433
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/23563433
Branch: refs/heads/master
Commit: 2356343378a29bc2a18e5e1d0c80f05537b0bc61
Parents: c9fe10e
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Sep 22 16:24:11 2014 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Sep 22 16:24:11 2014 +0300
----------------------------------------------------------------------
locations/jclouds/pom.xml | 18 ++++++++++++++----
pom.xml | 11 +++++++++++
2 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/23563433/locations/jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index fd3841e..aa1a2be 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -111,16 +111,26 @@
<groupId>${jclouds.groupId}.driver</groupId>
<artifactId>jclouds-sshj</artifactId>
<exclusions>
+ <!-- provided versions are LGPL-only -->
<exclusion>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch.agentproxy.usocket-jna</artifactId>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
</exclusion>
<exclusion>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch.agentproxy.pageant</artifactId>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>platform</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <!-- dual-licensed under LGPL and ASL 2 -->
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ </dependency>
<dependency>
<groupId>${jclouds.groupId}</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/23563433/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b54f58..1f94f89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,7 @@
<hamcrest.version>1.1</hamcrest.version>
<jsr311-api.version>1.1.1</jsr311-api.version>
<maxmind.version>0.8.1</maxmind.version>
+ <jna.version>4.0.0</jna.version>
<includedTestGroups />
<excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
@@ -596,6 +597,16 @@
<artifactId>geoip2</artifactId>
<version>${maxmind.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>${jna.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ <version>${jna.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
[2/2] git commit: This closes #184
Posted by he...@apache.org.
This closes #184
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/888afd07
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/888afd07
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/888afd07
Branch: refs/heads/master
Commit: 888afd0759f4cd876037918413aa8dfbfc35471a
Parents: d3d2abd 2356343
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Sep 22 16:12:04 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Sep 22 16:12:04 2014 +0100
----------------------------------------------------------------------
locations/jclouds/pom.xml | 18 ++++++++++++++----
pom.xml | 11 +++++++++++
2 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------