Don't put 2 versions of servlet jar in lib

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

Branch: refs/heads/master
Commit: e036bbd0c595514677ef1c28eb47bed3e427b709
Parents: 1cbfd0c
Author: Daniel Kulp <[email protected]>
Authored: Wed May 14 11:48:14 2014 -0400
Committer: Daniel Kulp <[email protected]>
Committed: Wed May 14 11:50:00 2014 -0400

----------------------------------------------------------------------
 distribution/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e036bbd0/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 9caba0b..ecbc14d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -167,6 +167,12 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>cxf-rt-transports-http-netty-server</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

Reply via email to