cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: Move hadoop version to parent pom, add to javadoc to allow javadoc to be generated
Date Tue, 07 Oct 2014 23:52:34 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 5a4fdd1f9 -> 0dc377c74


Move hadoop version to parent pom, add to javadoc to allow javadoc to be generated


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0dc377c7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0dc377c7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0dc377c7

Branch: refs/heads/master
Commit: 0dc377c747798b7ee1a7b7a85965cc776fc822b8
Parents: 5a4fdd1
Author: Daniel Kulp <dkulp@apache.org>
Authored: Tue Oct 7 19:51:26 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Tue Oct 7 19:51:57 2014 -0400

----------------------------------------------------------------------
 distribution/javadoc/pom.xml    |  4 +++
 parent/pom.xml                  | 48 ++++++++++++++++++++++++++++++++++++
 rt/rs/extensions/search/pom.xml | 43 --------------------------------
 3 files changed, 52 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/0dc377c7/distribution/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 9f77f01..e683878 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -370,6 +370,10 @@
             <artifactId>logback-classic</artifactId>
             <version>${cxf.logback.classic.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-client</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

http://git-wip-us.apache.org/repos/asf/cxf/blob/0dc377c7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index eb5f0c4..c42cd58 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -637,6 +637,54 @@
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>org.apache.hbase</groupId>
+                <artifactId>hbase-client</artifactId>
+                <version>0.98.3-hadoop2</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.netty</groupId>
+                        <artifactId>netty</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.jersey</groupId>
+                        <artifactId>jersey-server</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.jersey</groupId>
+                        <artifactId>jersey-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.jersey</groupId>
+                        <artifactId>jersey-json</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.jersey.contribs</groupId>
+                        <artifactId>jersey-guice</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.google.inject</groupId>
+                        <artifactId>guice</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.google.inject.extensions</groupId>
+                        <artifactId>guice-servlet</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty-util</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-httpclient</groupId>
+                        <artifactId>commons-httpclient</artifactId>         
  	
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            
+            <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>${cxf.junit.version}</version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/0dc377c7/rt/rs/extensions/search/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index 5a27f62..d063027 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -78,51 +78,8 @@
         <dependency>
            <groupId>org.apache.hbase</groupId>
            <artifactId>hbase-client</artifactId>
-           <version>0.98.3-hadoop2</version>
            <optional>true</optional>
            <scope>provided</scope>
-           <exclusions>
-                <exclusion>
-            	   <groupId>io.netty</groupId>
-            	   <artifactId>netty</artifactId>            	
-            	</exclusion>
-                <exclusion>
-            	   <groupId>com.sun.jersey</groupId>
-            	   <artifactId>jersey-server</artifactId>            	
-            	</exclusion>
-                <exclusion>
-            	   <groupId>com.sun.jersey</groupId>
-            	   <artifactId>jersey-core</artifactId>            	
-            	</exclusion>
-                <exclusion>
-            	   <groupId>com.sun.jersey</groupId>
-            	   <artifactId>jersey-json</artifactId>            	
-            	</exclusion>
-                <exclusion>
-            	   <groupId>com.sun.jersey.contribs</groupId>
-            	   <artifactId>jersey-guice</artifactId>            	
-            	</exclusion>
-                <exclusion>
-            	   <groupId>com.google.inject</groupId>
-            	   <artifactId>guice</artifactId>            	
-            	</exclusion>
-                <exclusion>
-            	   <groupId>com.google.inject.extensions</groupId>
-            	   <artifactId>guice-servlet</artifactId>            	
-            	</exclusion>    
-                <exclusion>
-            	   <groupId>org.mortbay.jetty</groupId>
-            	   <artifactId>jetty</artifactId>            	
-            	</exclusion>
-                <exclusion>
-            	   <groupId>org.mortbay.jetty</groupId>
-            	   <artifactId>jetty-util</artifactId>            	
-            	</exclusion>
-                <exclusion>
-            	   <groupId>commons-httpclient</groupId>
-            	   <artifactId>commons-httpclient</artifactId>            	
-            	</exclusion>
-           </exclusions>
         </dependency>
         <dependency>
            <groupId>io.netty</groupId>


Mime
View raw message