You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2020/01/19 17:06:07 UTC
[cxf] 02/03: [CXF-7949] Remove cxf.servlet-api-2.5.* properties
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7949_jakarta-servlet
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d4ee4328c4a7fc60ed77af2fccf09ce0e725b436
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Sun Jan 19 18:03:55 2020 +0100
[CXF-7949] Remove cxf.servlet-api-2.5.* properties
---
parent/pom.xml | 7 -------
rt/transports/http-netty/netty-server/pom.xml | 1 +
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index af49137..2f0c415 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -184,8 +184,6 @@
<cxf.rhino.version>1.7R2</cxf.rhino.version>
<cxf.rxjava.version>1.3.8</cxf.rxjava.version>
<cxf.rxjava2.version>2.2.11</cxf.rxjava2.version>
- <cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
- <cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>
<cxf.servlet-api.artifact>jakarta.servlet-api</cxf.servlet-api.artifact>
<cxf.servlet-api.group>jakarta.servlet</cxf.servlet-api.group>
<cxf.servlet-api.version>4.0.3</cxf.servlet-api.version>
@@ -2147,11 +2145,6 @@
<version>${cxf.servlet-api.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>${cxf.servlet-api-2.5.artifact}</artifactId>
- <version>${cxf.servlet-api-2.5.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
<version>1.8.4</version>
diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml
index 99f3867..e0d57b3 100644
--- a/rt/transports/http-netty/netty-server/pom.xml
+++ b/rt/transports/http-netty/netty-server/pom.xml
@@ -65,6 +65,7 @@
<!-- we don't implement the servlet 3.0 specification here -->
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>