You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/08/23 07:17:05 UTC

[camel] branch CAMEL-13826 updated (ba32bf4 -> 124646a)

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

aldettinger pushed a change to branch CAMEL-13826
in repository https://gitbox.apache.org/repos/asf/camel.git.


 discard ba32bf4  CAMEL-13826: Added a comment in the doc about the possibility to migrate per camel test
 discard ee69256  CAMEL-13826: Migrated half of the camel-xstream tests to JUnit 5 (testing coexistence of JUnit 4 and JUnit 5)
 discard 12013fc  CAMEL-13826: Merged CamelTestSupport.isCreateCamelContextPerClass() into JUnit 5 Lifecycle.PER_CLASS
     add e5bb417  [CAMEL-13898]ensure camel-cxf consumer can propagate protocol headers from camel exchange headers when throwing a soap fault
     add 516ea5b  CAMEL-13893: disable configurations
     add 4cfac37  Remove unused imports
     add fd5dbbc  Fix typo in aws-cw doc
     add 7d58f78  Merge pull request #3119 from rrhartjr/master
     add b660b52  Regen
     add ed22f2c  CAMEL-13893: cleanup
     add fa0a21a  CAMEL-13893: reintroduce configuration options ...
     add ea84ffa  CAMEL-13893: use XML API to modify REST XML DSL
     add 158fcf0  Regen
     add 124646a  camel-http-common - Fix typos in HttpHelper

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   (ba32bf4)
            \
             N -- N -- N   refs/heads/CAMEL-13826 (124646a)

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.

No new revisions were added by this update.

Summary of changes:
 components/camel-any23/pom.xml                     |   1 -
 .../src/main/docs/any23-dataformat.adoc            |   6 +-
 .../camel/dataformat/any23/Any23DataFormat.java    |   2 -
 .../any23/spring/SpringAny23DataFormatTest.xml     |  11 +--
 .../src/main/docs/aws-cw-component.adoc            |   2 +-
 components/camel-blueprint/pom.xml                 |   7 ++
 .../apache/camel/component/cxf/CxfConsumer.java    |   1 +
 .../camel/component/cxf/DefaultCxfBinding.java     |  41 ++++++++
 .../org/apache/camel/http/common/HttpHelper.java   |  11 ++-
 components/camel-spring/pom.xml                    |   7 ++
 .../src/main/docs/test-junit5.adoc                 |   5 -
 .../apache/camel/test/junit5/CamelTestSupport.java |  25 ++---
 .../CreateCamelContextPerTestFalseTest.java        |   7 +-
 .../CreateCamelContextPerTestTrueTest.java         |   5 +
 .../FilterCreateCamelContextPerClassTest.java      |  10 +-
 components/camel-test/pom.xml                      |   4 -
 components/camel-xstream/pom.xml                   |   5 -
 .../xstream/MarshalDomainObjectJSONTest.java       |   4 +-
 .../xstream/MarshalDomainObjectTest.java           |   8 +-
 .../xstream/XStreamDataFormatOmitFieldsTest.java   |  15 ++-
 ...eamDataFormatPermissionsSystemPropertyTest.java |  13 +--
 .../xstream/XStreamDataFormatPermissionsTest.java  |   7 +-
 components/readme.adoc                             |   2 +-
 .../apache/camel/converter/ObjectConverter.java    |   1 -
 .../impl/engine/DefaultDataFormatResolver.java     |   1 -
 .../camel/impl/engine/DefaultProcessorFactory.java |   1 -
 .../org/apache/camel/processor/PipelineHelper.java |   1 -
 .../camel/processor/RemoveHeaderProcessor.java     |   1 -
 .../camel/processor/RemoveHeadersProcessor.java    |   1 -
 .../org/apache/camel/processor/SortProcessor.java  |   1 -
 .../DefaultExceptionPolicyStrategy.java            |   1 -
 .../processor/errorhandler/ExceptionPolicy.java    |   1 -
 core/camel-core/readme-eip.adoc                    |  12 +--
 .../apache/camel/builder/ErrorHandlerBuilder.java  |   4 -
 .../camel/builder/ErrorHandlerBuilderRef.java      |   5 -
 .../camel/impl/AbstractModelCamelContext.java      |   1 -
 ...rtyDefinition.java => ConfigurationOption.java} |  37 +++----
 ...nsDefinition.java => ConfigurationOptions.java} |  32 +++---
 .../model/InterceptSendToEndpointDefinition.java   |   1 -
 .../apache/camel/model/LoadBalancerDefinition.java |   1 -
 .../apache/camel/model/OnCompletionDefinition.java |   1 -
 .../camel/model/dataformat/Any23DataFormat.java    |  18 ++--
 .../reifier/InterceptSendToEndpointReifier.java    |   2 -
 .../reifier/dataformat/Any23DataFormatReifier.java |   4 +-
 .../camel/builder/TransformerBuilderTest.java      |   1 -
 .../camel/component/bean/BeanInvokeStaticTest.java |   1 -
 .../camel/component/mock/MockPredicateTest.java    |   2 -
 .../PropertiesComponentEndpointTest.java           |   1 -
 ...meSedaQueueMultipleConsumersDifferenceTest.java |   1 -
 .../ValidatorEndpointClearCachedSchemaTest.java    |   1 -
 .../camel/impl/RouteSetRouteIdTwoTimesTest.java    |   2 -
 .../impl/health/DefaultHealthCheckServiceTest.java |   1 -
 .../apache/camel/issues/XPathSplitStreamTest.java  |   1 -
 .../processor/MessageHistoryStepOnlyTest.java      |   1 -
 .../AggregateEagerCheckCompletionTest.java         |   2 -
 .../interceptor/AdviceWithMockEndpointsTest.java   |   1 -
 ...dviceWithMockMultipleEndpointsWithSkipTest.java |   3 +-
 .../modules/ROOT/pages/any23-dataformat.adoc       |   8 +-
 .../modules/ROOT/pages/aws-cw-component.adoc       |   2 +-
 .../org/apache/camel/processor/TransformTest.java  |   1 +
 .../camel/processor/TransformViaDSLTest.java       |   1 +
 parent/pom.xml                                     |   4 +-
 .../springboot/Any23DataFormatConfiguration.java   |  16 ---
 .../pom.xml                                        |   1 -
 .../camel-spring-boot-dependencies/pom.xml         |   2 +-
 .../generator/swagger/AbstractGenerateMojo.java    | 108 ++++++++++-----------
 .../maven/generator/swagger/GenerateXmlMojo.java   |  26 +++--
 .../generator/swagger/GenerateXmlWithDtoMojo.java  |   1 -
 .../generator/swagger/RestDslXmlGenerator.java     |  74 ++++++++++----
 .../generator/swagger/RestDslXmlGeneratorTest.java |  39 ++++++--
 70 files changed, 322 insertions(+), 305 deletions(-)
 copy core/camel-core/src/main/java/org/apache/camel/model/{PropertyDefinition.java => ConfigurationOption.java} (75%)
 copy core/camel-core/src/main/java/org/apache/camel/model/{GlobalOptionsDefinition.java => ConfigurationOptions.java} (62%)