[cxf] 01/01: CXF-8129 - Update to Woodstox 6.0.x
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch CXF-8129 in repository https://gitbox.apache.org/repos/asf/cxf.git commit f3fdbf7af37fbebc9f65b5620fdba4fcd074f97b Author: Colm O hEigeartaigh AuthorDate: Mon Oct 7 17:03:47 2019 +0100 CXF-8129 - Update to Woodstox 6.0.x --- core/pom.xml | 12 .../validation/ResolvingGrammarReaderController.java | 4 ++-- .../cxf/staxutils/validation/W3CMultiSchemaFactory.java | 16 distribution/javadoc/pom.xml | 10 -- parent/pom.xml | 8 +--- rt/databinding/aegis/pom.xml | 5 - .../test/java/org/apache/cxf/javascript/AegisTest.java | 4 +++- systests/databinding/pom.xml | 11 --- systests/jaxws/pom.xml | 11 --- systests/uncategorized/pom.xml | 11 --- 10 files changed, 14 insertions(+), 78 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index a31e89f..0109fee 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -190,18 +190,6 @@ true -net.java.dev.msv -msv-core - - -net.java.dev.msv -msv-testharness - - -true -provided - - org.springframework.osgi spring-osgi-io true diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java b/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java index aeb61a2..ce0cde4 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java +++ b/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java @@ -31,8 +31,8 @@ import org.xml.sax.InputSource; import org.xml.sax.Locator; import org.xml.sax.SAXException; -import com.sun.msv.reader.GrammarReaderController2; -import com.sun.msv.reader.xmlschema.DOMLSInputImpl; +import com.ctc.wstx.shaded.msv_core.reader.GrammarReaderController2; +import com.ctc.wstx.shaded.msv_core.reader.xmlschema.DOMLSInputImpl; import org.apache.cxf.common.logging.LogUtils; diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java b/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java index d2e99e2..9ecc9b0 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java +++ b/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java @@ -37,14 +37,14 @@ import org.xml.sax.Locator; import com.ctc.wstx.msv.BaseSchemaFactory; import com.ctc.wstx.msv.W3CSchema; -import com.sun.msv.grammar.ExpressionPool; -import com.sun.msv.grammar.xmlschema.XMLSchemaGrammar; -import com.sun.msv.grammar.xmlschema.XMLSchemaSchema; -import com.sun.msv.reader.GrammarReaderController; -import com.sun.msv.reader.State; -import com.sun.msv.reader.xmlschema.MultiSchemaReader; -import com.sun.msv.reader.xmlschema.SchemaState; -import com.sun.msv.reader.xmlschema.XMLSchemaReader; +import com.ctc.wstx.shaded.msv_core.grammar.ExpressionPool; +import com.ctc.wstx.shaded.msv_core.grammar.xmlschema.XMLSchemaGrammar; +import com.ctc.wstx.shaded.msv_core.grammar.xmlschema.XMLSchemaSchema; +import com.ctc.wstx.shaded.msv_core.reader.GrammarReaderController; +import com.ctc.wstx.shaded.msv_core.reader.State; +import com.ctc.wstx.shaded.msv_core.reader.xmlschema.MultiSchemaReader; +import com.ctc.wstx.shaded.msv_core.reader.xmlschema.SchemaState; +import com.ctc.wstx.shaded.msv_core.reader.xmlschema.XMLSchemaReader; import org.codehaus.stax2.validation.XMLValidationSchema; diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml index 9d7de33..18d255f 100644 --- a/distribution/javadoc/pom.xml +++ b/distribution/javadoc/pom.xml @@ -151,16 +151,6 @@ slf4j-api -net.java.dev.msv -msv-core - - -net.java.dev.msv -msv-testharness - - - - wsdl4j wsdl4j diff --git a/parent/pom.xml b/parent/pom.xml index 1df0a3b..e658b5f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -166,7 +166,6 @@ 1.1.2 2.0.21 2.28.1 -2013.6.1 3.1.1 [4,5) 4.1.42.Final @@ -215,7 +214,7 @@ 1.1.0.Final 2.1 2.23.2 -5.2.1 +6.0.2 4.2 1.6.3 2.3.0-SNAPSHOT @@ -2413,11 +2412,6 @@ -net.java.dev.msv -
[cxf] branch CXF-8129 updated (25f9b8b -> f3fdbf7)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch CXF-8129 in repository https://gitbox.apache.org/repos/asf/cxf.git. discard 25f9b8b CXF-8129 - Update to Woodstox 6.0.x new f3fdbf7 CXF-8129 - Update to Woodstox 6.0.x This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (25f9b8b) \ N -- N -- N refs/heads/CXF-8129 (f3fdbf7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cxf] branch CXF-8129 updated (a73878d -> 25f9b8b)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch CXF-8129
in repository https://gitbox.apache.org/repos/asf/cxf.git.
discard a73878d CXF-8129 - Update to Woodstox 6.0.x
add 26212d85 cxf-rt-rs-client: set Accept header to wildcard for void
response (#585)
add ef41e00 [CXF-8025]: Fix Wrapper Style for multilevel xsd:extension
elements
add ab708ae Merge pull request #543 from jpoje-gtri/CXF-8025
add af2c8ec CXF-8025 - Specify a max stack depth to prevent recursion
attacks
add ec44234 Updating Karaf
add 7689d88 FileUtils: move test specific getStringFromFile; remove extra
space
add 47ac71e cxf-rt-transports-local: use LocalDestination
add 324e838 cxf-systests-tracing: improve test stability
add 6fbadde osgi.itests: minimize console output
add aabf377 Updating Jetty
add 180fbbb CXF-8131: Upgrade to Jaeger 1.0.0
add 411fb51 examples: update readme according to Jaeger version update
add 424bc7b CXF-8124: CXF metrics - MetricsContext#stop called twice or
without Fault in certain error cases (#587)
new 25f9b8b CXF-8129 - Update to Woodstox 6.0.x
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a73878d)
\
N -- N -- N refs/heads/CXF-8129 (25f9b8b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/cxf/helpers/FileUtils.java | 51
.../jax_rs/tracing_opentracing_osgi/README.txt | 4 +-
.../main/release/samples/jax_rs/websocket/pom.xml | 1 -
distribution/src/main/release/samples/pom.xml | 2 +-
.../apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 10 -
.../test/resources/etc/org.ops4j.pax.logging.cfg | 60 -
osgi/itests/src/test/resources/log4j.properties| 5 -
parent/pom.xml | 7 +-
.../MetricsMessageInPostInvokeInterceptor.java | 3 +-
.../apache/cxf/jaxrs/client/ClientProxyImpl.java | 20 +-
.../jaxrs/client/JAXRSClientFactoryBeanTest.java | 32 ++-
.../org/apache/cxf/jaxrs/resources/BookStore.java | 6 +-
.../cxf/transport/local/LocalTransportFactory.java | 43 +---
.../sts/itests/BasicSTSIntegrationTest.java| 4 +-
.../test/resources/etc/org.ops4j.pax.logging.cfg | 105
.../cxf/xkms/itests/BasicIntegrationTest.java | 4 +-
.../test/resources/etc/org.ops4j.pax.logging.cfg | 25 --
systests/jaxrs/pom.xml | 25 ++
.../apache/cxf/systest/jaxrs/metrics}/Book.java| 28 +-
.../jaxrs/metrics/JAXRSClientMetricsTest.java | 219
.../jaxrs/metrics/JAXRSServerMetricsTest.java | 237 +
.../apache/cxf/systest/jaxrs/metrics/Library.java} | 17 +-
systests/jaxws/pom.xml | 7 +-
.../cxf/systest/jaxws/metrics/BookWebService.java} | 18 +-
.../systest/jaxws/metrics/IBookWebService.java}| 8 +-
.../jaxws/metrics/JAXWSClientMetricsTest.java | 143 +++
.../{beanpostprocessor => metrics}/context.xml | 2 +-
.../apache/cxf/systest/brave/TestSpanReporter.java | 9 +-
.../org/apache/cxf/systest/jaeger/TestSender.java | 65 -
.../jaxrs/tracing/brave/BraveTracingTest.java | 174 ++---
.../opentracing/OpenTracingTracingTest.java| 283 +
.../jaxws/tracing/brave/BraveTracingTest.java | 99 +++
.../opentracing/OpenTracingTracingTest.java| 202 +++
tools/common/pom.xml | 37 ++-
.../org/apache/cxf/tools/common/ToolConstants.java | 3 +-
.../apache/cxf/tools/common/ProcessorTestBase.java | 19 +-
.../org/apache/cxf/tools/common/TestFileUtils.java | 74 ++
.../org/apache/cxf/tools/common/ToolTestBase.java | 0
tools/corba/pom.xml| 18 +-
tools/javato/ws/pom.xml| 35 +--
.../org/apache/cxf/tools/java2ws/JavaToWSTest.java | 53 ++--
.../wsdl11/DateTypeCustomGeneratorTest.java| 15 +-
.../generator/wsdl11/FaultBeanGeneratorTest.java | 7 +-
.../java2wsdl/processor/JavaToProcessorTest.java | 58 ++---
tools/validator/pom.xml| 12
[cxf] 01/01: CXF-8129 - Update to Woodstox 6.0.x
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch CXF-8129 in repository https://gitbox.apache.org/repos/asf/cxf.git commit 25f9b8bd3395e529028e2e7eba906beea97ad208 Author: Colm O hEigeartaigh AuthorDate: Mon Oct 7 17:03:47 2019 +0100 CXF-8129 - Update to Woodstox 6.0.x --- core/pom.xml | 12 .../validation/ResolvingGrammarReaderController.java | 4 ++-- .../cxf/staxutils/validation/W3CMultiSchemaFactory.java | 16 distribution/javadoc/pom.xml | 10 -- parent/pom.xml | 8 +--- rt/databinding/aegis/pom.xml | 5 - .../test/java/org/apache/cxf/javascript/AegisTest.java | 4 +++- systests/databinding/pom.xml | 11 --- systests/jaxws/pom.xml | 11 --- systests/uncategorized/pom.xml | 11 --- 10 files changed, 14 insertions(+), 78 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index a31e89f..0109fee 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -190,18 +190,6 @@ true -net.java.dev.msv -msv-core - - -net.java.dev.msv -msv-testharness - - -true -provided - - org.springframework.osgi spring-osgi-io true diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java b/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java index aeb61a2..ce0cde4 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java +++ b/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java @@ -31,8 +31,8 @@ import org.xml.sax.InputSource; import org.xml.sax.Locator; import org.xml.sax.SAXException; -import com.sun.msv.reader.GrammarReaderController2; -import com.sun.msv.reader.xmlschema.DOMLSInputImpl; +import com.ctc.wstx.shaded.msv_core.reader.GrammarReaderController2; +import com.ctc.wstx.shaded.msv_core.reader.xmlschema.DOMLSInputImpl; import org.apache.cxf.common.logging.LogUtils; diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java b/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java index d2e99e2..9ecc9b0 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java +++ b/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java @@ -37,14 +37,14 @@ import org.xml.sax.Locator; import com.ctc.wstx.msv.BaseSchemaFactory; import com.ctc.wstx.msv.W3CSchema; -import com.sun.msv.grammar.ExpressionPool; -import com.sun.msv.grammar.xmlschema.XMLSchemaGrammar; -import com.sun.msv.grammar.xmlschema.XMLSchemaSchema; -import com.sun.msv.reader.GrammarReaderController; -import com.sun.msv.reader.State; -import com.sun.msv.reader.xmlschema.MultiSchemaReader; -import com.sun.msv.reader.xmlschema.SchemaState; -import com.sun.msv.reader.xmlschema.XMLSchemaReader; +import com.ctc.wstx.shaded.msv_core.grammar.ExpressionPool; +import com.ctc.wstx.shaded.msv_core.grammar.xmlschema.XMLSchemaGrammar; +import com.ctc.wstx.shaded.msv_core.grammar.xmlschema.XMLSchemaSchema; +import com.ctc.wstx.shaded.msv_core.reader.GrammarReaderController; +import com.ctc.wstx.shaded.msv_core.reader.State; +import com.ctc.wstx.shaded.msv_core.reader.xmlschema.MultiSchemaReader; +import com.ctc.wstx.shaded.msv_core.reader.xmlschema.SchemaState; +import com.ctc.wstx.shaded.msv_core.reader.xmlschema.XMLSchemaReader; import org.codehaus.stax2.validation.XMLValidationSchema; diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml index 9d7de33..18d255f 100644 --- a/distribution/javadoc/pom.xml +++ b/distribution/javadoc/pom.xml @@ -151,16 +151,6 @@ slf4j-api -net.java.dev.msv -msv-core - - -net.java.dev.msv -msv-testharness - - - - wsdl4j wsdl4j diff --git a/parent/pom.xml b/parent/pom.xml index 1df0a3b..751256e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -166,7 +166,6 @@ 1.1.2 2.0.21 2.28.1 -2013.6.1 3.1.1 [4,5) 4.1.42.Final @@ -215,7 +214,7 @@ 1.1.0.Final 2.1 2.23.2 -5.2.1 +6.0.2-SNAPSHOT 4.2 1.6.3 2.3.0-SNAPSHOT @@ -2413,11 +2412,6 @@ -
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.2.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit a7c5c3cd6de0fd0c1a3eeec19db540f37ef204b1 Author: Colm O hEigeartaigh AuthorDate: Mon Oct 14 11:04:17 2019 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index ca8bfc6..77f1fc6 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -498,6 +498,7 @@ B bdb110cb7aa2e86e0eb8c673b4d29de32e57c0ea B bdbcea0998141cadd61778f39f74fef082454eaf B bdd121031c94f9b1c25151c99c12973a2a51d360 B be61232f3ecb05686ab1fced52600c9dbd7c69f4 +B bead97b8f50c2fff5cfab29d88354769d726b94e B beba07f0d03592ff7b5208bbbc334db72172a56c B bfa6602337670e70fbc7f215e0c675fe5e1f02ee B bfdf209e171ac16e6ae962fd8ef0bf7356c7898d @@ -725,6 +726,7 @@ M 8e78fae173033a3118e0eb278816fc3088aecbea M 907bfebcffb0d62304bb23a63a4e34540a7981de M 91260c6d9b1404452e8e91ac87e42d2f771d997e M 91f78e0d11ac47b7708c0bf9689d48b83a3da58a +M 961227f92b14856e5477f8f209ad9ced340c56ce M 9a2f1212cd7031c8447ae4294c4c4ccc7322d9e5 M 9ab0d2766695a2ba9f1ed1ca042b5d2a42eb4fd9 M 9bca6952c145b6ec6d2fb5726676ad7c3d67b7f7
[cxf] 01/02: Upgrading Jackson
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.2.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit c078805fbf3ee7421f1e1184d04e0cc44a1706eb Author: Colm O hEigeartaigh AuthorDate: Wed Sep 25 16:50:04 2019 +0100 Upgrading Jackson (cherry picked from commit 961227f92b14856e5477f8f209ad9ced340c56ce) # Conflicts: # parent/pom.xml --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 04a43b2..6874448 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -97,8 +97,8 @@ 4.4.9 [4.3,4.5.0) 2.4.1 -2.9.9 -2.9.9.3 +2.9.10 +2.9.10 0.7.2 1.1.1 1.2.3
[cxf] branch 3.2.x-fixes updated (3902855 -> a7c5c3c)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 3.2.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git. from 3902855 CXF-8124: CXF metrics - MetricsContext#stop called twice or without Fault in certain error cases (#587) new c078805 Upgrading Jackson new a7c5c3c Recording .gitmergeinfo Changes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 2 ++ parent/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)
[cxf] branch 3.3.x-fixes updated: Upgrading Jackson
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.3.x-fixes by this push: new 961227f Upgrading Jackson 961227f is described below commit 961227f92b14856e5477f8f209ad9ced340c56ce Author: Colm O hEigeartaigh AuthorDate: Wed Sep 25 16:50:04 2019 +0100 Upgrading Jackson --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 52c6fff..3cbd9ca 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,8 +128,8 @@ 4.5.10 [4.3,4.5.0) 4.4.12 -2.9.9 -2.9.9.3 +2.9.10 +2.9.10 0.35.5 0.7.2 3.25.0-GA
