[cxf] branch master updated: cxf-systests-jaxrs: cleanup dependencies

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch master updated: cxf-systests-jaxrs: cleanup dependencies

buhhunyx
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new f6d5026  cxf-systests-jaxrs: cleanup dependencies
f6d5026 is described below

commit f6d5026ce93ed9bd2169e004680b8749d1afd809
Author: Alexey Markevich <[hidden email]>
AuthorDate: Thu Sep 10 11:07:32 2020 +0300

    cxf-systests-jaxrs: cleanup dependencies
---
 systests/jaxrs/pom.xml                                       | 12 ------------
 .../cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java   |  4 +---
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 4231dbe..cee84c7 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -31,7 +31,6 @@
     <description>Apache CXF JAX-RS System Tests</description>
     <url>https://cxf.apache.org</url>
     <properties>
-        <cxf.glassfish.el.version>3.0.1-b11</cxf.glassfish.el.version>
         <cxf.module.name>org.apache.cxf.systests.jaxrs</cxf.module.name>
     </properties>
     <dependencies>
@@ -79,11 +78,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.el</artifactId>
-            <version>${cxf.glassfish.el.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.web</artifactId>
             <version>1.1.1</version>
@@ -91,12 +85,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>blueprint-parser</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.noosgi</artifactId>
             <version>1.2.0</version>
             <scope>test</scope>
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
index 21110ff..9d23bbb 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
@@ -30,7 +30,6 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -482,8 +481,7 @@ public class JAXRSClientServerSpringBookTest extends AbstractBusClientServerTest
         wc.accept("application/xhtml+xml").path(666).matrix("name2", 2).query("name", "Action - ");
         XMLSource source = wc.get(XMLSource.class);
         source.setBuffering();
-        Map<String, String> namespaces = new HashMap<>();
-        namespaces.put("xhtml", "http://www.w3.org/1999/xhtml");
+        Map<String, String> namespaces = Collections.singletonMap("xhtml", "http://www.w3.org/1999/xhtml");
         Book2 b = source.getNode("xhtml:html/xhtml:body/xhtml:ul/xhtml:Book", namespaces, Book2.class);
         assertEquals(666, b.getId());
         assertEquals("CXF in Action - 2", b.getName());