You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2015/03/20 12:55:59 UTC

[1/2] servicemix-bundles git commit: [SM-2477] Extend hbase import version range

Repository: servicemix-bundles
Updated Branches:
  refs/heads/master 55f3edb5e -> e815af98c


[SM-2477] Extend hbase import version range


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

Branch: refs/heads/master
Commit: c774b6b5a0847c2c9b3416912f1262006bc8bdba
Parents: 6df3b37
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Mar 20 12:55:00 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Mar 20 12:55:00 2015 +0100

----------------------------------------------------------------------
 hbase-0.98.0-hadoop2/pom.xml | 4 ++--
 hbase-0.98.5-hadoop2/pom.xml | 4 ++--
 hbase-0.99.0/pom.xml         | 4 ++--
 hbase-0.99.2/pom.xml         | 4 ++--
 hbase-1.0.0/pom.xml          | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/c774b6b5/hbase-0.98.0-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.98.0-hadoop2/pom.xml b/hbase-0.98.0-hadoop2/pom.xml
index 8730e81..7ac50f4 100644
--- a/hbase-0.98.0-hadoop2/pom.xml
+++ b/hbase-0.98.0-hadoop2/pom.xml
@@ -52,7 +52,7 @@
             org.apache.hadoop.hbase
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            com.google.common*,
+            com.google.common*;version="[12,20)",
             com.google.protobuf,
             com.ibm.uvm.tools;resolution:=optional,
             com.kenai.jnr.x86asm;resolution:=optional,
@@ -128,7 +128,7 @@
             org.apache.zookeeper*;version="[3.4,4)";resolution:=optional,
             org.cliffc.high_scale_lib;resolution:=optional,
             org.cloudera*;resolution:=optional,
-            org.codehaus.jackson*,
+            org.codehaus.jackson*;version="[1.4,2)",
             org.codehaus.jettison.json;version="[1.1,2)",
             org.eclipse.core.resources;resolution:=optional,
             org.eclipse.jface.text;resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/c774b6b5/hbase-0.98.5-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.98.5-hadoop2/pom.xml b/hbase-0.98.5-hadoop2/pom.xml
index 2c9840e..5d4e69b 100644
--- a/hbase-0.98.5-hadoop2/pom.xml
+++ b/hbase-0.98.5-hadoop2/pom.xml
@@ -64,7 +64,7 @@
             org.junit.runners;resolution:=optional, 
             org.mockito;resolution:=optional, 
             org.mockito.stubbing;resolution:=optional,
-            com.google.common*,
+            com.google.common*;version="[12,20)",
             com.google.protobuf,
             com.ibm.uvm.tools;resolution:=optional,
             com.kenai.jnr.x86asm;resolution:=optional,
@@ -140,7 +140,7 @@
             org.apache.zookeeper*;version="[3.4,4)";resolution:=optional,
             org.cliffc.high_scale_lib;resolution:=optional,
             org.cloudera*;resolution:=optional,
-            org.codehaus.jackson*,
+            org.codehaus.jackson*;version="[1.4,2)",
             org.codehaus.jettison.json;version="[1.1,2)",
             org.eclipse.core.resources;resolution:=optional,
             org.eclipse.jface.text;resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/c774b6b5/hbase-0.99.0/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.99.0/pom.xml b/hbase-0.99.0/pom.xml
index 1a0553d..c534e0e 100644
--- a/hbase-0.99.0/pom.xml
+++ b/hbase-0.99.0/pom.xml
@@ -69,7 +69,7 @@
             org.junit.runners;resolution:=optional, 
             org.mockito;resolution:=optional, 
             org.mockito.stubbing;resolution:=optional,
-            com.google.common*,
+            com.google.common*;version="[12,20)",
             com.google.protobuf,
             com.ibm.uvm.tools;resolution:=optional,
             com.kenai.jnr.x86asm;resolution:=optional,
@@ -145,7 +145,7 @@
             org.apache.zookeeper*;version="[3.4,4)";resolution:=optional,
             org.cliffc.high_scale_lib;resolution:=optional,
             org.cloudera*;resolution:=optional,
-            org.codehaus.jackson*,
+            org.codehaus.jackson*;version="[1.4,2)",
             org.codehaus.jettison.json;version="[1.1,2)",
             org.eclipse.core.resources;resolution:=optional,
             org.eclipse.jface.text;resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/c774b6b5/hbase-0.99.2/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.99.2/pom.xml b/hbase-0.99.2/pom.xml
index d2e5e52..2901030 100644
--- a/hbase-0.99.2/pom.xml
+++ b/hbase-0.99.2/pom.xml
@@ -75,7 +75,7 @@
             org.junit.runners;resolution:=optional, 
             org.mockito;resolution:=optional, 
             org.mockito.stubbing;resolution:=optional,
-            com.google.common*,
+            com.google.common*;version="[12,20)",
             com.google.protobuf,
             com.ibm.uvm.tools;resolution:=optional,
             com.kenai.jnr.x86asm;resolution:=optional,
@@ -147,7 +147,7 @@
             org.apache.oro.text.regex,
             org.apache.zookeeper*;version="[3.4,4)";resolution:=optional,
             org.cliffc.high_scale_lib;resolution:=optional,
-            org.codehaus.jackson*,
+            org.codehaus.jackson*;version="[1.4,2)",
             org.codehaus.jettison.json;version="[1.1,2)",
             org.eclipse.core.resources;resolution:=optional,
             org.eclipse.jface.text;resolution:=optional,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/c774b6b5/hbase-1.0.0/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-1.0.0/pom.xml b/hbase-1.0.0/pom.xml
index ed72d1d..8fee4bf 100644
--- a/hbase-1.0.0/pom.xml
+++ b/hbase-1.0.0/pom.xml
@@ -75,7 +75,7 @@
             org.junit.runners;resolution:=optional, 
             org.mockito;resolution:=optional, 
             org.mockito.stubbing;resolution:=optional,
-            com.google.common*,
+            com.google.common*;version="[12,20)",
             com.google.protobuf,
             com.ibm.uvm.tools;resolution:=optional,
             com.kenai.jnr.x86asm;resolution:=optional,
@@ -147,7 +147,7 @@
             org.apache.oro.text.regex,
             org.apache.zookeeper*;version="[3.4,4)";resolution:=optional,
             org.cliffc.high_scale_lib;resolution:=optional,
-            org.codehaus.jackson*,
+            org.codehaus.jackson*;version="[1.4,2)",
             org.codehaus.jettison.json;version="[1.1,2)",
             org.eclipse.core.resources;resolution:=optional,
             org.eclipse.jface.text;resolution:=optional,


[2/2] servicemix-bundles git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/servicemix-bundles

Posted by jb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/servicemix-bundles


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

Branch: refs/heads/master
Commit: e815af98cb7cf759fc14ad66f54cb48ee888e488
Parents: c774b6b 55f3edb
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Mar 20 12:55:48 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Mar 20 12:55:48 2015 +0100

----------------------------------------------------------------------
 jersey-core-1.19/pom.xml                        | 124 +++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  13 ++
 pom.xml                                         |  11 +-
 swagger-jaxrs-1.3.10/pom.xml                    |  27 +++
 .../swagger/jaxrs/listing/ApiListing.scala      | 176 +++++++++++++++++++
 swagger-jaxrs-1.3.11/pom.xml                    |  27 +++
 .../swagger/jaxrs/listing/ApiListing.scala      | 176 +++++++++++++++++++
 swagger-jaxrs-1.3.12/pom.xml                    |  27 +++
 .../swagger/jaxrs/listing/ApiListing.scala      | 176 +++++++++++++++++++
 swagger-jaxrs-1.3.2/pom.xml                     |  26 +++
 .../swagger/jaxrs/listing/ApiListing.scala      | 176 +++++++++++++++++++
 swagger-jaxrs-1.3.4/pom.xml                     |  27 +++
 .../swagger/jaxrs/listing/ApiListing.scala      | 176 +++++++++++++++++++
 swagger-jaxrs-1.3.5/pom.xml                     |  27 +++
 .../swagger/jaxrs/listing/ApiListing.scala      | 176 +++++++++++++++++++
 swagger-jaxrs-1.3.7/pom.xml                     |  27 +++
 .../swagger/jaxrs/listing/ApiListing.scala      | 176 +++++++++++++++++++
 swagger-jaxrs-1.3.8/pom.xml                     |  27 +++
 .../swagger/jaxrs/listing/ApiListing.scala      | 176 +++++++++++++++++++
 19 files changed, 1770 insertions(+), 1 deletion(-)
----------------------------------------------------------------------