servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject servicemix-bundles git commit: [SM-2437] OSGi bundles embed hbase-default.xml and hbase-webapps files
Date Mon, 02 Mar 2015 20:35:47 GMT
Repository: servicemix-bundles
Updated Branches:
  refs/heads/master c462c4d01 -> 7377e30c1


[SM-2437] OSGi bundles embed hbase-default.xml and hbase-webapps files


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

Branch: refs/heads/master
Commit: 7377e30c1a8fd9ae44444b3549f3383a0b52d137
Parents: c462c4d
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Mon Mar 2 21:34:43 2015 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon Mar 2 21:34:43 2015 +0100

----------------------------------------------------------------------
 hbase-0.94.2/pom.xml           |  9 +++++----
 hbase-0.94.3/pom.xml           |  9 +++++----
 hbase-0.94.6/pom.xml           |  9 +++++----
 hbase-0.94/pom.xml             |  9 +++++----
 hbase-0.95.0/pom.xml           | 14 +++++++-------
 hbase-0.95.1-hadoop1/pom.xml   | 14 +++++++-------
 hbase-0.95.2-hadoop2/pom.xml   | 14 +++++++-------
 hbase-0.96.0-hadoop2/pom.xml   | 14 +++++++-------
 hbase-0.96.1.1-hadoop2/pom.xml | 12 ++++++------
 hbase-0.98.0-hadoop2/pom.xml   | 12 ++++++------
 hbase-0.98.5-hadoop2/pom.xml   | 12 ++++++------
 hbase-0.99.0/pom.xml           | 12 ++++++------
 hbase-0.99.2/pom.xml           | 17 ++++++-----------
 pom.xml                        | 13 +++++++++++++
 14 files changed, 91 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/hbase-0.94.2/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.94.2/pom.xml b/hbase-0.94.2/pom.xml
index 44e3336..ca53e5a 100644
--- a/hbase-0.94.2/pom.xml
+++ b/hbase-0.94.2/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>10</version>
+        <version>11</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -188,9 +188,10 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                             </filters>
                             <createDependencyReducedPom>true</createDependencyReducedPom>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/hbase-0.94.3/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.94.3/pom.xml b/hbase-0.94.3/pom.xml
index 2c05a51..6cf8ef2 100644
--- a/hbase-0.94.3/pom.xml
+++ b/hbase-0.94.3/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>10</version>
+        <version>11</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -188,9 +188,10 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                             </filters>
                             <createDependencyReducedPom>true</createDependencyReducedPom>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/hbase-0.94.6/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.94.6/pom.xml b/hbase-0.94.6/pom.xml
index 9fd8b4d..de18761 100644
--- a/hbase-0.94.6/pom.xml
+++ b/hbase-0.94.6/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>10</version>
+        <version>11</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -189,9 +189,10 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                             </filters>
                             <createDependencyReducedPom>true</createDependencyReducedPom>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/hbase-0.94/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.94/pom.xml b/hbase-0.94/pom.xml
index ad66274..17c655c 100644
--- a/hbase-0.94/pom.xml
+++ b/hbase-0.94/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>10</version>
+        <version>11</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -186,9 +186,10 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                             </filters>
                             <createDependencyReducedPom>true</createDependencyReducedPom>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/hbase-0.95.0/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.95.0/pom.xml b/hbase-0.95.0/pom.xml
index a27573d..19f0ef0 100644
--- a/hbase-0.95.0/pom.xml
+++ b/hbase-0.95.0/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>10</version>
+        <version>11</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -262,9 +262,9 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-common</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-client</artifact>
@@ -286,9 +286,9 @@
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-server</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-hadoop-compat</artifact>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/hbase-0.95.1-hadoop1/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.95.1-hadoop1/pom.xml b/hbase-0.95.1-hadoop1/pom.xml
index ff7ac61..2d57dc7 100644
--- a/hbase-0.95.1-hadoop1/pom.xml
+++ b/hbase-0.95.1-hadoop1/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>10</version>
+        <version>11</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -261,9 +261,9 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-common</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-client</artifact>
@@ -285,9 +285,9 @@
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-server</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-hadoop-compat</artifact>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/hbase-0.95.2-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.95.2-hadoop2/pom.xml b/hbase-0.95.2-hadoop2/pom.xml
index 81d8883..1243823 100644
--- a/hbase-0.95.2-hadoop2/pom.xml
+++ b/hbase-0.95.2-hadoop2/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>10</version>
+        <version>11</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -261,9 +261,9 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-common</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-client</artifact>
@@ -285,9 +285,9 @@
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-server</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-hadoop-compat</artifact>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/hbase-0.96.0-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.96.0-hadoop2/pom.xml b/hbase-0.96.0-hadoop2/pom.xml
index 65ab7fa..eee757e 100644
--- a/hbase-0.96.0-hadoop2/pom.xml
+++ b/hbase-0.96.0-hadoop2/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>10</version>
+        <version>11</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -261,9 +261,9 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-common</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-client</artifact>
@@ -285,9 +285,9 @@
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-server</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-hadoop-compat</artifact>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/hbase-0.96.1.1-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.96.1.1-hadoop2/pom.xml b/hbase-0.96.1.1-hadoop2/pom.xml
index c99e3f8..cae78a6 100644
--- a/hbase-0.96.1.1-hadoop2/pom.xml
+++ b/hbase-0.96.1.1-hadoop2/pom.xml
@@ -261,9 +261,9 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-common</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-client</artifact>
@@ -285,9 +285,9 @@
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-server</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-hadoop-compat</artifact>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/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 bf9590f..106cae3 100644
--- a/hbase-0.98.0-hadoop2/pom.xml
+++ b/hbase-0.98.0-hadoop2/pom.xml
@@ -259,9 +259,9 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-common</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-client</artifact>
@@ -283,9 +283,9 @@
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-server</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-hadoop-compat</artifact>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/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 71dcec0..b927ab1 100644
--- a/hbase-0.98.5-hadoop2/pom.xml
+++ b/hbase-0.98.5-hadoop2/pom.xml
@@ -271,9 +271,9 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-common</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-client</artifact>
@@ -295,9 +295,9 @@
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-server</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-hadoop-compat</artifact>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/hbase-0.99.0/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.99.0/pom.xml b/hbase-0.99.0/pom.xml
index d9c5bd3..433fc52 100644
--- a/hbase-0.99.0/pom.xml
+++ b/hbase-0.99.0/pom.xml
@@ -276,9 +276,9 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-common</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-client</artifact>
@@ -300,9 +300,9 @@
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-server</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-hadoop-compat</artifact>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/hbase-0.99.2/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-0.99.2/pom.xml b/hbase-0.99.2/pom.xml
index f92f86c..9c8898e 100644
--- a/hbase-0.99.2/pom.xml
+++ b/hbase-0.99.2/pom.xml
@@ -113,7 +113,6 @@
             javax.security.cert,
             javax.servlet*,
             javax.sql;resolution:=optional,
-            javax.xml.bind*,
             javax.xml.datatype,
             javax.xml.namespace,
             javax.xml.parsers,
@@ -123,7 +122,6 @@
             javax.xml.transform.stream,
             javax.xml.validation,
             javax.xml.xpath,
-            javax.ws.rs*,
             joptsimple,
             org.apache.avalon.framework.logger;resolution:=optional,
             org.apache.bsf,
@@ -131,7 +129,6 @@
             org.apache.commons.cli;version="[1.2,2)";resolution:=optional,
             org.apache.commons.codec*;version="[1.4,2)",
             org.apache.commons.collections*,
-            org.apache.commons.httpclient*,
             org.apache.commons.io*,
             org.apache.commons.lang*;version="[2.5,3)",
             org.apache.commons.logging*;resolution:=optional,
@@ -143,7 +140,6 @@
             org.apache.oro.text.regex,
             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.jettison.json;version="[1.1,2)",
             org.eclipse.core.resources;resolution:=optional,
@@ -151,7 +147,6 @@
             org.eclipse.osgi.util;resolution:=optional,
             org.eclipse.text.edits;resolution:=optional,
             org.jamon*;resolution:=optional,
-            org.jboss.netty*;resolution:=optional,
             org.jets3t.service,
             org.jets3t.service.impl.rest.httpclient,
             org.jets3t.service.model,
@@ -282,9 +277,9 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-common</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-default.xml</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-client</artifact>
@@ -306,9 +301,9 @@
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-server</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>hbase-webapps/**/*</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:hbase-hadoop-compat</artifact>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7377e30c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7971731..aca4198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,19 @@
         <module>spring-test-4.1.1.RELEASE</module>
         <module>spring-test-4.1.2.RELEASE</module>
         <module>spring-test-4.1.4.RELEASE</module>
+        <module>hbase-0.94</module>
+        <module>hbase-0.94.2</module>
+        <module>hbase-0.94.3</module>
+        <module>hbase-0.94.6</module>
+        <module>hbase-0.95.0</module>
+        <module>hbase-0.95.1-hadoop1</module>
+        <module>hbase-0.95.2-hadoop2</module>
+        <module>hbase-0.96.0-hadoop2</module>
+        <module>hbase-0.96.1.1-hadoop2</module>
+        <module>hbase-0.98.0-hadoop2</module>
+        <module>hbase-0.98.5-hadoop2</module>
+        <module>hbase-0.99.0</module>
+        <module>hbase-0.99.2</module>
     </modules>
 
 </project>


Mime
View raw message