You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/11/29 07:07:18 UTC
[1/2] brooklyn-server git commit: Remove net.java.dev.jna dependency
exclusion
Repository: brooklyn-server
Updated Branches:
refs/heads/master b11c87d94 -> a20fdeac4
Remove net.java.dev.jna dependency exclusion
jclouds now correctly imports the dual-licensed version of jna,
so we can rely on that rather than excluding it ourselves.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/76a5068d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/76a5068d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/76a5068d
Branch: refs/heads/master
Commit: 76a5068d4359f5e38413448676228589a714d14d
Parents: b11c87d
Author: Aled Sage <al...@gmail.com>
Authored: Mon Nov 28 21:17:10 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Nov 28 21:17:10 2016 +0000
----------------------------------------------------------------------
locations/jclouds/pom.xml | 20 --------------------
parent/pom.xml | 10 ----------
pom.xml | 1 -
3 files changed, 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/76a5068d/locations/jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index 3984a0c..4527d9c 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -122,26 +122,6 @@
<dependency>
<groupId>${jclouds.groupId}.driver</groupId>
<artifactId>jclouds-sshj</artifactId>
- <exclusions>
- <!-- provided versions are LGPL-only -->
- <exclusion>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- </exclusion>
- <exclusion>
- <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>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/76a5068d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7ce9d03..5f3ffb6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -480,16 +480,6 @@
<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>
- <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>${jline.version}</version>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/76a5068d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 51618fa..d5edf93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,6 @@
<jax-rs-api.version>2.0.1</jax-rs-api.version>
<maxmind.version>2.8.0-rc1</maxmind.version>
<maxmind-db.version>1.2.1</maxmind-db.version>
- <jna.version>4.0.0</jna.version>
<winrm4j.version>0.4.0</winrm4j.version>
<karaf.version>4.0.4</karaf.version>
<felix-osgi-compendium.version>1.4.0</felix-osgi-compendium.version>
[2/2] brooklyn-server git commit: Closes #469
Posted by sv...@apache.org.
Closes #469
Remove net.java.dev.jna dependency exclusion
jclouds now correctly imports the dual-licensed version of jna,
so we can rely on that rather than excluding it ourselves.
See https://github.com/jclouds/jclouds/commit/b3882cbfed873a5975d4918d1fb8b836b544c421. This is definitely in jclouds 1.9.2. (and 1.9.3 as well): see https://github.com/jclouds/jclouds/blob/rel/jclouds-1.9.2/drivers/sshj/pom.xml#L110.
With this change, looking at `mvn dependency:tree -Dverbose` includes the output below, and shows that the only "jna" dependencies are version 4.1.0.
```
[INFO] | +- com.jcraft:jsch.agentproxy.usocket-jna:jar:0.0.8:compile
[INFO] | | +- net.java.dev.jna:jna:jar:4.1.0:compile
[INFO] | | \- net.java.dev.jna:jna-platform:jar:4.1.0:compile
[INFO] | | \- (net.java.dev.jna:jna:jar:4.1.0:compile - omitted for duplicate)
```
It also confirms that `jna` and `jna-platform` don't pull in any other transitive dependencies, so the upgrade from 4.0.0 to 4.1.0 shouldn't cause any problems (it just brings us in line with the versions that were actually tested in the jclouds releases!).
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a20fdeac
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a20fdeac
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a20fdeac
Branch: refs/heads/master
Commit: a20fdeac42de41f6e781a66b55dfc0a4e175bbb0
Parents: b11c87d 76a5068
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Nov 29 09:07:07 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Nov 29 09:07:07 2016 +0200
----------------------------------------------------------------------
locations/jclouds/pom.xml | 20 --------------------
parent/pom.xml | 10 ----------
pom.xml | 1 -
3 files changed, 31 deletions(-)
----------------------------------------------------------------------