[cxf] 02/06: [CXF-7949] Remove cxf.servlet-api-2.5.* properties

[deki]

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 daf7c2a073f8ae11613bc8e2f02a2225f6162d5f
Author: Dennis Kieselhorst <d...@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 39e0b26..df8b46d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -186,8 +186,6 @@
         <cxf.rhino.version>1.7R2</cxf.rhino.version>
         <cxf.rxjava.version>1.3.8</cxf.rxjava.version>
         <cxf.rxjava2.version>2.2.19</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>
@@ -2149,11 +2147,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 21a4d14..05ef60b 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>