This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
The following commit(s) were added to refs/heads/master by this push:
new 43ad448 extra properties to ensure right library for soap is pulled in
43ad448 is described below
commit 43ad44843b8852f7d80fe103245e1a2dba339d1f
Author: Alex Heneveld <[email protected]>
AuthorDate: Mon Nov 28 15:40:59 2022 +0000
extra properties to ensure right library for soap is pulled in
to avoid timeouts eg winrm long-running processes
---
.../filtered-resources/resources/etc/org.apache.karaf.features.xml | 4 ++++
karaf/features/src/main/resources/resources/etc/custom.properties | 3 +++
2 files changed, 7 insertions(+)
diff --git
a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
index 232f583..1c857e0 100644
---
a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
+++
b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
@@ -228,6 +228,10 @@
<bundle>mvn:javax.ws.rs/javax.ws.rs-api/[0,999]</bundle> <!-- use
jakarta above -->
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/[0,999]</bundle>
<!-- use javax above -->
+ <!-- for soap this should be excluded -->
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.4/[0,999]</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.3/[0,999]</bundle>
+
<!-- we supply wrapped versions -->
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/3.12.1_1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/1.15.0_1</bundle>
diff --git a/karaf/features/src/main/resources/resources/etc/custom.properties
b/karaf/features/src/main/resources/resources/etc/custom.properties
index be50ce2..eb04c66 100644
--- a/karaf/features/src/main/resources/resources/etc/custom.properties
+++ b/karaf/features/src/main/resources/resources/etc/custom.properties
@@ -31,6 +31,7 @@ karaf.framework=felix
# javax.xml.ws -- could come from servicemix jaxws
# javax.activation -- could be declared, if using jakarta's bind
# but karaf gets unhappy if we try to use those instead of the java
1.8-supplied ones
+# javax.xml.soap needs 1.4 to avoid timeout errors, and javax.jws.soap needs
to be visible
jre-1.8= \
javax.accessibility, \
@@ -47,6 +48,7 @@ jre-1.8= \
javax.imageio.spi, \
javax.imageio.stream, \
javax.jws, \
+ javax.jws.soap, \
javax.lang.model, \
javax.lang.model.element, \
javax.lang.model.type, \
@@ -126,6 +128,7 @@ jre-1.8= \
javax.xml.datatype, \
javax.xml.namespace, \
javax.xml.parsers, \
+ javax.xml.soap;version="1.4", \
javax.xml.stream;version="1.2", \
javax.xml.stream.events;version="1.2", \
javax.xml.stream.util;version="1.2", \
