cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [cxf] 02/16: Make sure osgi version range is set for java.jws* packages
Date Tue, 03 Nov 2020 16:48:38 GMT
This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit eb466dd6768898a72156c83d7080307898ace303
Author: Daniel Kulp <dkulp@apache.org>
AuthorDate: Tue Jul 21 09:06:28 2020 -0400

    Make sure osgi version range is set for java.jws* packages
    
    (cherry picked from commit 8d10e2ed1a2b2d56b0d1ad750bf576a1f06bb084)
    
    # Conflicts:
    #	parent/pom.xml
---
 parent/pom.xml                                 | 2 +-
 rt/bindings/soap/pom.xml                       | 1 +
 rt/databinding/aegis/pom.xml                   | 1 +
 rt/frontend/jaxws/pom.xml                      | 1 +
 rt/ws/eventing/pom.xml                         | 1 +
 rt/ws/mex/pom.xml                              | 1 +
 rt/ws/security/pom.xml                         | 1 +
 services/ws-discovery/ws-discovery-api/pom.xml | 1 +
 services/wsn/wsn-api/pom.xml                   | 6 +++---
 services/wsn/wsn-core/pom.xml                  | 6 +++---
 services/wsn/wsn-osgi/pom.xml                  | 6 +++---
 services/xkms/xkms-common/pom.xml              | 1 +
 testutils/pom.xml                              | 1 +
 tools/common/pom.xml                           | 1 +
 tools/javato/ws/pom.xml                        | 1 +
 tools/validator/pom.xml                        | 4 ++++
 tools/wsdlto/frontend/jaxws/pom.xml            | 1 +
 17 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 9dfbabe..f0a9c50 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -70,7 +70,6 @@
         <cxf.osgi.javax.bind.version>[0,3)</cxf.osgi.javax.bind.version>
         <cxf.osgi.javax.stream.version>[0,2)</cxf.osgi.javax.stream.version>
         <cxf.osgi.javax.activation.version>[0,2)</cxf.osgi.javax.activation.version>
-        <cxf.osgi.javax.jws.version>[2,3)</cxf.osgi.javax.jws.version>
         <cxf.osgi.javax.mail.version>[0,2)</cxf.osgi.javax.mail.version>
         <cxf.osgi.javax.servlet.version>[0,4.1)</cxf.osgi.javax.servlet.version>
         <cxf.osgi.javax.xml.ws.version>[0,3)</cxf.osgi.javax.xml.ws.version>
@@ -245,6 +244,7 @@
         <cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
         <cxf.oro.bundle.version>2.0.8_6</cxf.oro.bundle.version>
         <cxf.osgi.saaj.version>[1.3,2)</cxf.osgi.saaj.version>
+        <cxf.osgi.jws.version>[0,2)</cxf.osgi.jws.version>
         <cxf.osgi.version>5.0.0</cxf.osgi.version>
         <cxf.pax.exam.version>4.13.4</cxf.pax.exam.version>
         <cxf.reflections.bundle.version>0.9.11_2</cxf.reflections.bundle.version>
diff --git a/rt/bindings/soap/pom.xml b/rt/bindings/soap/pom.xml
index c73c39f..757dfcc 100644
--- a/rt/bindings/soap/pom.xml
+++ b/rt/bindings/soap/pom.xml
@@ -34,6 +34,7 @@
         <cxf.module.name>org.apache.cxf.binding.soap</cxf.module.name>
         <cxf.osgi.import>
             javax.xml.soap;version="${cxf.osgi.saaj.version}",
+            javax.jws*;version="${cxf.osgi.jws.version}",
             javax.activation;version="${cxf.osgi.javax.activation.version}",
             org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
             org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml
index a62c2ae..2a8a767 100644
--- a/rt/databinding/aegis/pom.xml
+++ b/rt/databinding/aegis/pom.xml
@@ -34,6 +34,7 @@
     <properties>
         <cxf.module.name>org.apache.cxf.databinding.aegis</cxf.module.name>
         <cxf.osgi.import>
+            javax.jws*;version="${cxf.osgi.jws.version}",
             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
             javax.activation;version="${cxf.osgi.javax.activation.version}",
             javax.xml.stream*;version="${cxf.osgi.javax.stream.version}"
diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml
index a576fd5..977147f 100644
--- a/rt/frontend/jaxws/pom.xml
+++ b/rt/frontend/jaxws/pom.xml
@@ -34,6 +34,7 @@
         <cxf.module.name>org.apache.cxf.frontend.jaxws</cxf.module.name>
         <cxf.osgi.import>
             javax.xml.soap;version="${cxf.osgi.saaj.version}",
+            javax.jws*;version="${cxf.osgi.jws.version}",
             javax.activation;version="${cxf.osgi.javax.activation.version}",
             javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
             org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml
index 41445c4..1305e62 100644
--- a/rt/ws/eventing/pom.xml
+++ b/rt/ws/eventing/pom.xml
@@ -18,6 +18,7 @@
             javax.xml.soap;version="${cxf.osgi.saaj.version}",
             javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+            javax.jws*;version="${cxf.osgi.jws.version}",
             javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
         </cxf.osgi.import>
     </properties>
diff --git a/rt/ws/mex/pom.xml b/rt/ws/mex/pom.xml
index 3ad1a9d..cc27e1f 100644
--- a/rt/ws/mex/pom.xml
+++ b/rt/ws/mex/pom.xml
@@ -33,6 +33,7 @@
     <properties>
         <cxf.module.name>org.apache.cxf.ws.mex</cxf.module.name>
         <cxf.osgi.import>
+            javax.jws*;version="${cxf.osgi.jws.version}",
             javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
         </cxf.osgi.import>
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index e60ee92..62e2210 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -34,6 +34,7 @@
         <cxf.module.name>org.apache.cxf.ws.security</cxf.module.name>
         <cxf.osgi.import>
             javax.xml.soap;version="${cxf.osgi.saaj.version}",
+            javax.jws*;version="${cxf.osgi.jws.version}",
             javax.activation;version="${cxf.osgi.javax.activation.version}",
             net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)",
             org.opensaml*;version="${cxf.opensaml.osgi.version.range}",
diff --git a/services/ws-discovery/ws-discovery-api/pom.xml b/services/ws-discovery/ws-discovery-api/pom.xml
index 283873b..933b67d 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -38,6 +38,7 @@
             org.apache.cxf.ws.discovery.*,
         </cxf.osgi.export>
         <cxf.osgi.import>
+            javax.jws*;version="${cxf.osgi.jws.version}",
             javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
         </cxf.osgi.import>
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index ff736a0..f3ae2ec 100644
--- a/services/wsn/wsn-api/pom.xml
+++ b/services/wsn/wsn-api/pom.xml
@@ -94,9 +94,9 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            javax.xml.bind*;version="[0.0,3)",
-                            javax.jws*;version="[0.0,3)",
-                            javax.xml.ws*;version="[0.0,3)",
+                            javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+                            javax.jws*;version="${cxf.osgi.jws.version}",
+                            javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
                             org.apache.cxf*;version="[3.0,4)",
                             *
                         </Import-Package>
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 6ca5f5e..99c5d1e 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -156,9 +156,9 @@
                         <Import-Package>
                             org.apache.cxf.wsn.util.*;version=${cxf.osgi.version.clean},
                             !org.apache.cxf.wsn*,
-                            javax.xml.bind*;version="[0.0,3)",
-                            javax.jws*;version="[0.0,3)",
-                            javax.xml.ws*;version="[0.0,3)",
+                            javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+                            javax.jws*;version="${cxf.osgi.jws.version}",
+                            javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
                             org.apache.cxf*;version="[3.0,4)",
                             *
                         </Import-Package>
diff --git a/services/wsn/wsn-osgi/pom.xml b/services/wsn/wsn-osgi/pom.xml
index 0c167ed..c3081dd 100644
--- a/services/wsn/wsn-osgi/pom.xml
+++ b/services/wsn/wsn-osgi/pom.xml
@@ -63,9 +63,9 @@
                             !org.apache.activemq*,
                             !org.apache.log4j.*,
                             !org.slf4j.*,
-                            javax.xml.bind*;version="[0.0,3)",
-                            javax.jws*;version="[0.0,3)",
-                            javax.xml.ws*;version="[0.0,3)",
+                            javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+                            javax.jws*;version="${cxf.osgi.jws.version}",
+                            javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
                             *
                         </Import-Package>
                         <Export-Package>
diff --git a/services/xkms/xkms-common/pom.xml b/services/xkms/xkms-common/pom.xml
index 801b77a..7ae794e 100644
--- a/services/xkms/xkms-common/pom.xml
+++ b/services/xkms/xkms-common/pom.xml
@@ -33,6 +33,7 @@
     <properties>
         <cxf.module.name>org.apache.cxf.xkms.common</cxf.module.name>
         <cxf.osgi.import>
+            javax.jws*;version="${cxf.osgi.jws.version}",
             javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
         </cxf.osgi.import>
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 3abe3e0..2104233 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -34,6 +34,7 @@
         <cxf.module.name>org.apache.cxf.testutils</cxf.module.name>
         <cxf.osgi.import>
             javax.xml.soap;version="${cxf.osgi.saaj.version}",
+            javax.jws*;version="${cxf.osgi.jws.version}",
             javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
             javax.annotation*;version="${cxf.osgi.javax.annotation.version}",
diff --git a/tools/common/pom.xml b/tools/common/pom.xml
index 4849e58..57ba8fa 100644
--- a/tools/common/pom.xml
+++ b/tools/common/pom.xml
@@ -33,6 +33,7 @@
     <properties>
         <cxf.module.name>org.apache.cxf.tools.common</cxf.module.name>
         <cxf.osgi.import>
+            javax.jws*;version="${cxf.osgi.jws.version}",
             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
         </cxf.osgi.import>
     </properties>
diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml
index 7934a3c..e0b2e7a 100644
--- a/tools/javato/ws/pom.xml
+++ b/tools/javato/ws/pom.xml
@@ -33,6 +33,7 @@
     <properties>
         <cxf.module.name>org.apache.cxf.tools.java2ws</cxf.module.name>
         <cxf.osgi.import>
+            javax.jws*;version="${cxf.osgi.jws.version}",
             javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
         </cxf.osgi.import>
diff --git a/tools/validator/pom.xml b/tools/validator/pom.xml
index d231dcb..db1f38e 100644
--- a/tools/validator/pom.xml
+++ b/tools/validator/pom.xml
@@ -36,6 +36,10 @@
             =org.apache.cxf.tools.validator.internal,
             org.apache.cxf.tools.validator.*,
         </cxf.osgi.export>
+        <cxf.osgi.import>
+            javax.jws*;version="${cxf.osgi.jws.version}",
+            javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+        </cxf.osgi.import>
     </properties>
     <dependencies>
         <dependency>
diff --git a/tools/wsdlto/frontend/jaxws/pom.xml b/tools/wsdlto/frontend/jaxws/pom.xml
index 6b6d3d9..c871a88 100644
--- a/tools/wsdlto/frontend/jaxws/pom.xml
+++ b/tools/wsdlto/frontend/jaxws/pom.xml
@@ -33,6 +33,7 @@
     <properties>
         <cxf.module.name>org.apache.cxf.tools.wsdl.jaxws</cxf.module.name>
         <cxf.osgi.import>
+            javax.jws*;version="${cxf.osgi.jws.version}",
             javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
         </cxf.osgi.import>


Mime
View raw message