brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [1/2] brooklyn-server git commit: Remove net.java.dev.jna dependency exclusion
Date Tue, 29 Nov 2016 07:07:18 GMT
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 <aled.sage@gmail.com>
Authored: Mon Nov 28 21:17:10 2016 +0000
Committer: Aled Sage <aled.sage@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>


Mime
View raw message