You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/10/08 02:54:04 UTC
[1/3] git commit: Move hadoop version to parent pom,
add to javadoc to allow javadoc to be generated
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes f3012dc1f -> 00d6e397e
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/cf74acdd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cf74acdd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cf74acdd
Branch: refs/heads/3.0.x-fixes
Commit: cf74acdd7358dd3501026c292961c8c3ce8d14e8
Parents: f3012dc
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 7 19:51:26 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 19:52: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/cf74acdd/distribution/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 681b17a..5e7d364 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/cf74acdd/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 407b560..d8a7b64 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -640,6 +640,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/cf74acdd/rt/rs/extensions/search/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index 0250970..976ec15 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>
[2/3] git commit: DOn't javadoc the wsn-osgi stuff
Posted by dk...@apache.org.
DOn't javadoc the wsn-osgi stuff
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/59f62e55
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/59f62e55
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/59f62e55
Branch: refs/heads/3.0.x-fixes
Commit: 59f62e5593cf32a3c7bfa2e54c91e2e7c9ccd5dd
Parents: cf74acd
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 7 20:45:14 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 20:50:49 2014 -0400
----------------------------------------------------------------------
distribution/javadoc/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/59f62e55/distribution/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 5e7d364..72bd349 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -413,7 +413,7 @@
<fileset dir="../../services">
<include name="**/src/main/java/**/*.java" />
-
+ <exclude name="**/wsn-osgi/**" />
<exclude name="**/systests/**" />
<exclude name="**/sts-war/**" />
<exclude name="**/xkms-war/**" />
[3/3] git commit: Remove a duplicate dep
Posted by dk...@apache.org.
Remove a duplicate dep
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/00d6e397
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/00d6e397
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/00d6e397
Branch: refs/heads/3.0.x-fixes
Commit: 00d6e397ea2392ae64e8087f6b35fbd6152596ac
Parents: 59f62e5
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 7 20:52:17 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 20:52:17 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/00d6e397/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d8a7b64..60a7a2d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -945,11 +945,6 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${cxf.jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${cxf.jetty.version}</version>
</dependency>