You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ac...@apache.org on 2017/05/20 11:04:02 UTC

servicemix-bundles git commit: [SM-3356] Docker-java: lets make org.glassfish.jersey optional

Repository: servicemix-bundles
Updated Branches:
  refs/heads/master d7af80509 -> cc32791ed


[SM-3356] Docker-java: lets make org.glassfish.jersey 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/cc32791e
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/cc32791e
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/cc32791e

Branch: refs/heads/master
Commit: cc32791ed2336f5c251576a13ea63cdd80bdcfc4
Parents: d7af805
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sat May 20 13:02:55 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sat May 20 13:02:55 2017 +0200

----------------------------------------------------------------------
 docker-java-3.0.9/pom.xml | 1 +
 pom.xml                   | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/cc32791e/docker-java-3.0.9/pom.xml
----------------------------------------------------------------------
diff --git a/docker-java-3.0.9/pom.xml b/docker-java-3.0.9/pom.xml
index 4e4b371..203a5f2 100644
--- a/docker-java-3.0.9/pom.xml
+++ b/docker-java-3.0.9/pom.xml
@@ -50,6 +50,7 @@
             com.github.dockerjava
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+            org.glassfish.jersey*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
     </properties>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/cc32791e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 37a503c..6e9ba74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,7 @@
         <module>hystrix-event-stream-1.5.12</module>
         <module>avro-1.8.2</module>
         <module>avro-ipc-1.8.2</module>
+        <module>docker-java-3.0.9</module>
     </modules>
 
 </project>