servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject servicemix-bundles git commit: [SM-3602] Make the org.json dependency in braintree-java bundle optional
Date Wed, 10 Jan 2018 14:19:48 GMT
Repository: servicemix-bundles
Updated Branches:
  refs/heads/master d62d30715 -> 5cdfbd190


[SM-3602] Make the org.json dependency in braintree-java bundle optional


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/5cdfbd19
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/5cdfbd19
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/5cdfbd19

Branch: refs/heads/master
Commit: 5cdfbd1901096b73fda34361ea0f9d8720a33f67
Parents: d62d307
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Wed Jan 10 15:19:09 2018 +0100
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Wed Jan 10 15:19:09 2018 +0100

----------------------------------------------------------------------
 braintree-java-2.74.0/pom.xml | 2 +-
 pom.xml                       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5cdfbd19/braintree-java-2.74.0/pom.xml
----------------------------------------------------------------------
diff --git a/braintree-java-2.74.0/pom.xml b/braintree-java-2.74.0/pom.xml
index 2788d2e..6cdd6d3 100644
--- a/braintree-java-2.74.0/pom.xml
+++ b/braintree-java-2.74.0/pom.xml
@@ -56,7 +56,7 @@
             com.braintreegateway.org.*;-split-package:=merge-first
         </servicemix.osgi.private.pkg>
         <servicemix.osgi.import.pkg>
-            *
+            org.json;resolution:=optional,
         </servicemix.osgi.import.pkg>
     </properties>
 

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5cdfbd19/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c86349..fd4ad39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
 
     <modules>
         <module>snmp4j-2.5.11</module>
+        <module>braintree-java-2.74.0</module>
     </modules>
 
 </project>


Mime
View raw message