[cxf] branch master updated: [CXF-7899]use com.sun.activation:javax.activation which has both api and impl

[ffang]

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

ffang 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 87865b1  [CXF-7899]use com.sun.activation:javax.activation which has 
both api and impl
     new b0755d0  Merge branch 'master' of github.com:apache/cxf
87865b1 is described below

commit 87865b1aec7e5524e5aa5b2e4ad2d2e2704f27b2
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Thu Nov 15 11:55:41 2018 +0800

    [CXF-7899]use com.sun.activation:javax.activation which has both api and 
impl
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 69cbc1d..78fbf75 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2864,8 +2864,8 @@
                     <version>2.3.0</version>
                 </dependency>
                 <dependency>
-                    <groupId>javax.activation</groupId>
-                    <artifactId>javax.activation-api</artifactId>
+                    <groupId>com.sun.activation</groupId>
+                    <artifactId>javax.activation</artifactId>
                     <version>1.2.0</version>
                 </dependency>
                 <dependency>