servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject [1/2] servicemix-bundles git commit: [SM-2948]Hystrix bundle do not work
Date Wed, 20 Apr 2016 07:25:03 GMT
Repository: servicemix-bundles
Updated Branches:
  refs/heads/master d7c9413ac -> 8a0662433


[SM-2948]Hystrix bundle do not work


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

Branch: refs/heads/master
Commit: a45fb56d93d093f9db1ebabf92c19deb98d2bf01
Parents: 6671047
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Wed Apr 20 15:20:41 2016 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Wed Apr 20 15:20:41 2016 +0800

----------------------------------------------------------------------
 hystrix-1.3.13/pom.xml | 8 ++++----
 hystrix-1.4.23/pom.xml | 6 +++---
 pom.xml                | 2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/a45fb56d/hystrix-1.3.13/pom.xml
----------------------------------------------------------------------
diff --git a/hystrix-1.3.13/pom.xml b/hystrix-1.3.13/pom.xml
index 8075ef6..782d5ac 100644
--- a/hystrix-1.3.13/pom.xml
+++ b/hystrix-1.3.13/pom.xml
@@ -48,11 +48,11 @@
             org.apache.commons.configuration*;resolution:=optional,
             org.junit;resolution:=optional,
             org.slf4j;resolution:=optional,
-            sun.misc;resolution:=optional
+            sun.misc;resolution:=optional,
+            rx*
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
-            com.netflix.config*,
-            rx*
+            com.netflix.config*
         </servicemix.osgi.private.pkg>
     </properties>
 
@@ -109,4 +109,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/a45fb56d/hystrix-1.4.23/pom.xml
----------------------------------------------------------------------
diff --git a/hystrix-1.4.23/pom.xml b/hystrix-1.4.23/pom.xml
index c91a7e7..3afc7f0 100644
--- a/hystrix-1.4.23/pom.xml
+++ b/hystrix-1.4.23/pom.xml
@@ -55,11 +55,11 @@
             org.apache.commons.configuration*;resolution:=optional,
             org.junit;resolution:=optional,
             org.slf4j;resolution:=optional,
-            sun.misc;resolution:=optional
+            sun.misc;resolution:=optional,
+            rx*
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
-            com.netflix.config*,
-            rx*
+            com.netflix.config*
         </servicemix.osgi.private.pkg>
     </properties>
 

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/a45fb56d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 41fef92..4c1738f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,8 @@
     <modules>
         <!-- add modules for all bundles to released in the next batch here -->
         <module>elasticsearch-2.3.0</module>
+        <module>hystrix-1.4.23</module>
+        <module>hystrix-1.3.13</module>
     </modules>
 
 </project>


Mime
View raw message