You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2018/08/06 09:58:15 UTC
[camel] branch java-10-test updated (d7f9d9f -> 217aac5)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git.
discard d7f9d9f CAMEL-12618: Additional dependencies needed on ...
discard 80b15a1 CAMEL-12618: Use fork of maven-plugin-plugin th...
discard 9638fec CAMEL-12618: Use fork of MVEL that supports Jav...
discard 693b653 Temporary disable JDK 9 and karaf-itest builds
add 65bc219 Upgrade Chronicle Core to version 1.16.14
add 6def9cf Fixed the camel-braintree Karaf feature
add 324591f Upgrade Brave Zipkin to version 5.1.3
add 8559c9e Added a Spring-boot Itests stage to the Jenkinsfile.daily pipeline
add 8de48b3 Add XML schemas for release 2.20.4
add acac02a Camel-Nats: Polish
add 7af1dfc Camel-Nats: Fixed CS
add 01422c2 Camel-Nats: refactored some tests
add a5d14e4 Fixed Maven Wrapper path in Jenkinsfile.daily pipeline for SB itests
add 8d43cf6 Remove unused import
add 074d199 CAMEL-12690: Annotation processors used in buil...
add 188d204 Upgrade ElSql to version 1.3
add bb84485 Add camel-service karaf feature
add efd7aaa Regen
add 6512ee0 [CAMEL-12689] EndpointRegistry, TransformerRegistry and ValidatorRegistry use wrong generics
add 8d7eee4 [CAMEL-12688] Add specific implementation of getShortName() to avoid reflection during route setup
add ff41e9f [CAMEL-12688] Add protected methods to allow subclass to provide specific implementations
add 2a8432d [CAMEL-12688] Possibility to use a simple LRUCache
add 9fc335f [CAMEL-12688] Avoid lamba
add 0e9830d [CAMEL-12688] Improve Scanner performances
add 7af6206 [CAMEL-12688] Improve introspection performances
add 0a88d13 [CAMEL-12688] Generate a fallback converter containing all core converters for performances
add 63be5a1 CAMEL-12674 - upgrade sshd-core and replace it specific ones by version 2.0.0
add 0929fd8 Upgrade Web3J to version 3.5.0
add a036d13 Upgrade Zipkin to version 2.10.4
add 441128b Upgrade Bouncycastle to version 1.60
add e1a7130 Upgrade Brave Zipkin to version 5.1.4
add 1a2dc4f CAMEL-12692: Add camel-as2 to camel-parent POM
add 7b9a14d [CAMEL-12693] Upgraded camel-dozer to dozer v6.3.0
add 34191fa CAMEL-12693 - Upgraded camel-dozer to dozer v6.3.0
add 0df9a3c CAMEL-12693 - Fix CS
add ec8765e [CAMEL-12696] Updated docs for dozer
add 7b75b74 Upgrade Chronicle Core to version 1.16.15
add 65458ed Upgrade Chronicle Wire to version 1.16.13
add acc38a2 Upgrade maven-compiler-plugin to version 3.8.0
add f81716e Fixed minor typos
add 31b8a7e Updated Javadoc to fix the docs generation
add 34aa0d1 Regen with new json docs for include
add a78bfc7 Upgrade Hazelcast to version 3.10.4
add 699ec91 CAMEL-12697: Add hapi-structures-v21 to camel-parent POM
add 190051c Use latest Hazelcast-Kubernetes docker image 3.10.4
add 6426b0d Bump Jnats to version 2.0.1
add c4447f9 Jnats 2.0.1 is again a bundle, lets use it in the karaf feature
add 932c417 Fixed typos
add 05eb6ca Upgrade Log4j2 to version 2.11.1
add 231e6af Regen
add 65868cf Component docs for camel-fhir
add d94a58e Fixed adoc warning
add a39e39d Component docs
add 05632f2 Component docs
add e29dd91 Polished
add 17adf9b Component docs
add faae58f Upgrade Spring-boot to version 2.0.4.RELEASE
add 18cb61c Upgrade Spring to version 5.0.8.RELEASE
add b4b3943 Regen
add 938487d Upgrade Spring Boot
add 9e4d580 Upgrade JackRabbit to version 2.17.5
add 1b5040f CAMEL-6840 - add more regression which is similar to already existing ThrottlerTests where grouping is added and fix some CS errors in camel-core
add a5b1957 CAMEL-12687 - upgrade shrinkwrap and arquillian versions
add 7d2dc92 Upgrade RXJava to version 2.2.0
add 1f1fe58 Upgrade Flink to version 1.5.2
add 92a090e CAMEL-12701: servicenow: meta data serivce ignores tables without parent when retrieving table list
add 0253d09 Upgrade testcontainers-java to v1.8.2
add 5212a7e CAMEL-12691: XmlConverter should use logger api when reporting parsin… (#2445)
add 0056199 Upgrade testcontainers-java to v1.8.2
add ffa5063 CAMEL-12702: Improved spring boot docs
add 338d058 CAMEL-6840 - add more regression which is similar to already existing ThrottlerTests where grouping is added and fix some CS errors in camel-core
add ad2b04d Regen
add ddc94d1 CAMEL-12575:NPE on GET request with Content-Type header
add 80c5c3b CAMEL-12703: camel-salesforce - Added JSON as a valid contentType
add 35577b8 Upgrade Brave to version 5.1.5
add 83e8d12 CAMEL-12656: Fixed root span id for multiple routes. (#2448)
add 6ce65d6 Upgrade PdfBox 1.8.x to version 1.8.15
add 01c43a2 Regen
add 5412cfd Upgrade Spring-Cloud-Commons to version 2.0.1.RELEASE
add 2a918c0 Upgrade Spring-Cloud-Consul to version 2.0.1.RELEASE
add c6a6edc Upgrade Spring-Cloud-Netflix to version 2.0.1.RELEASE
add f109764 Lets clean the workspace on each Karaf itests when using run-tests script
add bebdd67 CAMEL-12702: Improved spring boot docs
add 9c66be0 CAMEL-12702: Improved spring boot docs
add c4e4d9e CAMEL-12702: Improved spring boot docs
add c3ba586 Lets use a single version of Libthrift everywhere (0.11.0)
add ed7a3e6 CAMEL-12702: Improved spring boot docs
add ecbc815 CAMEL-12702: Improved spring boot docs
add d614666 CAMEL-12702: Enable validation during built that all the spring boot auto configuration option has documentation for camel-spring-boot module
add 0f04241 Disable check until we get camel-as2-starter added its missing docs
add 3ce3cce Upgrade Chronicle Bytes to version 1.16.21
add c5e647f Upgrade Chronicle Wire to version 1.16.14
add 9d6f8b9 Fix asciidoc format
add 5c920c8 CAMEL-12705: Added unit test to reproduce the issue, ignored until fixed.
add 162b751 Upgrade Jgit to version 5.0.2.201807311906-r
add 355b848 Upgrade Fabric8 Maven Plugin to version 3.5.41
add abb1611 CAMEL-11497: Update user guide toc in summary and migrate some pages
add b0f4cb5 CAMEL-12705: Fixed camel-catalog syntax parser issue with hostname and dots such as when parsing the netty4-http endpoints.
add ce9b887 CAMEL-12705: Remove unused imports
add c9dc100 Upgrade Xchange to version 4.3.9
add e02997f Upgrade Univocity Parsers to version 2.7.3
add 1994519 CAMEL-12707: Make docker integration test profiles respect skipTests property
add 671d1a4 testcontainers(-spring).adoc: minimal improvement
add 954d875 CS fixes
add 1fb62e9 Regen
add 050950b Upgrade Chronicle Core to version 1.16.15
add 59424fa Upgrade Chronicle Wire to version 1.16.15
add ad7f206 Upgrade Weld 3 to version 3.0.5.Final
add 15a5714 Lets use the same general jackson version for camel-vertx Karaf feature too
add 0fae25a Upgrade Netty to version 4.1.28.Final
add 2e69ead CAMEL-11497: Migrate error handling related guides and EIPs
add bbd58e6 Upgrade Smack to version 4.3.0
add 6911756 Upgrade Zipkin to version 2.11.0
add 2e2fd2b CAMEL-12710: Kept a single version of hamcrest classes on the classpath
add 33bae98 CAMEL-12699: Allow hystrix EIP to inherit error handler so you can combine Camels error handler for redeliveries with the circuit breaker.
new e24218d Temporary disable JDK 9 and karaf-itest builds
new 3f2666c CAMEL-12618: Use fork of MVEL that supports Jav...
new b23dba9 CAMEL-12618: Use fork of maven-plugin-plugin th...
new 217aac5 CAMEL-12618: Additional dependencies needed on ...
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 (d7f9d9f)
\
N -- N -- N refs/heads/java-10-test (217aac5)
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 4 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:
Jenkinsfile.daily | 16 +-
bom/camel-bom/pom.xml | 5 +
camel-core/pom.xml | 20 +-
.../main/docs/eips/content-based-router-eip.adoc | 79 ++
.../src/main/docs/eips/dead-letter-channel.adoc | 18 +-
camel-core/src/main/docs/eips/hystrix-eip.adoc | 33 +
.../src/main/docs/eips/transactional-client.adoc | 265 +++++++
camel-core/src/main/docs/validator.adoc | 10 +-
.../main/java/org/apache/camel/CamelContext.java | 7 +-
.../apache/camel/builder/ExpressionBuilder.java | 11 +-
.../apache/camel/component/bean/BeanComponent.java | 7 +-
.../camel/component/dataset/FileDataSet.java | 8 +-
.../camel/component/file/GenericFileProducer.java | 4 +-
.../apache/camel/converter/jaxp/XmlConverter.java | 46 +-
.../java/org/apache/camel/impl/ConsumerCache.java | 2 +-
.../org/apache/camel/impl/DefaultCamelContext.java | 237 ++++--
.../apache/camel/impl/DefaultEndpointRegistry.java | 105 ++-
.../impl/DefaultEndpointUtilizationStatistics.java | 7 +-
.../apache/camel/impl/DefaultFactoryFinder.java | 29 +-
.../camel/impl/DefaultTransformerRegistry.java | 105 +--
.../camel/impl/DefaultValidatorRegistry.java | 106 ++-
.../java/org/apache/camel/impl/EndpointKey.java | 11 +-
.../org/apache/camel/impl/FileStateRepository.java | 15 +-
.../java/org/apache/camel/impl/ProducerCache.java | 2 +-
.../impl/converter/BaseTypeConverterRegistry.java | 3 +-
.../language/simple/SimpleExpressionParser.java | 6 +-
.../camel/language/simple/SimpleLanguage.java | 16 +-
.../language/simple/SimplePredicateParser.java | 5 +-
.../simple/ast/SimpleFunctionExpression.java | 6 +-
.../language/simple/ast/SimpleFunctionStart.java | 6 +-
.../camel/management/MBeanInfoAssembler.java | 5 +-
.../java/org/apache/camel/model/AOPDefinition.java | 5 +
.../apache/camel/model/AggregateDefinition.java | 5 +
.../org/apache/camel/model/BeanDefinition.java | 5 +
.../org/apache/camel/model/CatchDefinition.java | 5 +
.../org/apache/camel/model/ChoiceDefinition.java | 5 +
.../apache/camel/model/ClaimCheckDefinition.java | 5 +
.../apache/camel/model/ConvertBodyDefinition.java | 5 +
.../org/apache/camel/model/DelayDefinition.java | 5 +
.../camel/model/DynamicRouterDefinition.java | 5 +
.../org/apache/camel/model/EnrichDefinition.java | 5 +
.../org/apache/camel/model/FilterDefinition.java | 5 +
.../org/apache/camel/model/FinallyDefinition.java | 5 +
.../org/apache/camel/model/FromDefinition.java | 6 +
.../org/apache/camel/model/HystrixDefinition.java | 5 +
.../camel/model/IdempotentConsumerDefinition.java | 5 +
.../org/apache/camel/model/InOnlyDefinition.java | 5 +
.../org/apache/camel/model/InOutDefinition.java | 5 +
.../apache/camel/model/InputTypeDefinition.java | 5 +
.../apache/camel/model/InterceptDefinition.java | 5 +
.../camel/model/InterceptFromDefinition.java | 5 +
.../model/InterceptSendToEndpointDefinition.java | 5 +
.../apache/camel/model/LoadBalanceDefinition.java | 5 +
.../java/org/apache/camel/model/LogDefinition.java | 5 +
.../org/apache/camel/model/LoopDefinition.java | 5 +
.../org/apache/camel/model/MarshalDefinition.java | 5 +
.../apache/camel/model/MulticastDefinition.java | 5 +
.../apache/camel/model/NoOutputExpressionNode.java | 2 +-
.../apache/camel/model/OnCompletionDefinition.java | 5 +
.../apache/camel/model/OnExceptionDefinition.java | 5 +
.../apache/camel/model/OnFallbackDefinition.java | 5 +
.../camel/model/OptionalIdentifiedDefinition.java | 22 -
.../apache/camel/model/OtherwiseDefinition.java | 5 +
.../org/apache/camel/model/OutputDefinition.java | 5 +
.../apache/camel/model/OutputTypeDefinition.java | 5 +
.../org/apache/camel/model/PipelineDefinition.java | 5 +
.../apache/camel/model/PollEnrichDefinition.java | 5 +
.../org/apache/camel/model/ProcessDefinition.java | 5 +
.../apache/camel/model/ProcessorDefinition.java | 10 +-
.../camel/model/RecipientListDefinition.java | 5 +
.../apache/camel/model/RemoveHeaderDefinition.java | 5 +
.../camel/model/RemoveHeadersDefinition.java | 5 +
.../camel/model/RemovePropertiesDefinition.java | 5 +
.../camel/model/RemovePropertyDefinition.java | 5 +
.../apache/camel/model/ResequenceDefinition.java | 5 +
.../org/apache/camel/model/RollbackDefinition.java | 5 +
.../org/apache/camel/model/RouteDefinition.java | 5 +
.../org/apache/camel/model/RoutesDefinition.java | 5 +
.../apache/camel/model/RoutingSlipDefinition.java | 5 +
.../org/apache/camel/model/ScriptDefinition.java | 5 +
.../org/apache/camel/model/SetBodyDefinition.java | 5 +
.../camel/model/SetExchangePatternDefinition.java | 5 +
.../apache/camel/model/SetFaultBodyDefinition.java | 5 +
.../apache/camel/model/SetHeaderDefinition.java | 5 +
.../apache/camel/model/SetOutHeaderDefinition.java | 5 +
.../apache/camel/model/SetPropertyDefinition.java | 5 +
.../org/apache/camel/model/SortDefinition.java | 5 +
.../org/apache/camel/model/SplitDefinition.java | 5 +
.../org/apache/camel/model/StopDefinition.java | 5 +
.../camel/model/ThreadPoolProfileDefinition.java | 5 +
.../org/apache/camel/model/ThreadsDefinition.java | 5 +
.../org/apache/camel/model/ThrottleDefinition.java | 5 +
.../camel/model/ThrowExceptionDefinition.java | 5 +
.../java/org/apache/camel/model/ToDefinition.java | 5 +
.../apache/camel/model/ToDynamicDefinition.java | 5 +
.../apache/camel/model/TransactedDefinition.java | 5 +
.../apache/camel/model/TransformDefinition.java | 5 +
.../java/org/apache/camel/model/TryDefinition.java | 5 +
.../apache/camel/model/UnmarshalDefinition.java | 5 +
.../org/apache/camel/model/ValidateDefinition.java | 5 +
.../org/apache/camel/model/WhenDefinition.java | 5 +
.../model/WhenSkipSendToEndpointDefinition.java | 4 +
.../org/apache/camel/model/WireTapDefinition.java | 5 +
.../camel/model/cloud/ServiceCallDefinition.java | 5 +
.../model/dataformat/JacksonXMLDataFormat.java | 2 +-
.../camel/model/dataformat/JsonDataFormat.java | 2 +-
.../camel/model/rest/RestBindingDefinition.java | 5 +
.../apache/camel/model/rest/RestDefinition.java | 5 +
.../apache/camel/model/rest/RestsDefinition.java | 5 +
.../apache/camel/model/rest/VerbDefinition.java | 5 +
.../java/org/apache/camel/processor/Splitter.java | 15 +-
.../idempotent/FileIdempotentRepository.java | 42 +-
.../camel/runtimecatalog/AbstractCamelCatalog.java | 4 +-
.../camel/support/TokenPairExpressionIterator.java | 4 +-
.../support/TokenXMLPairExpressionIterator.java | 4 +-
.../org/apache/camel/util/CompoundIterator.java | 64 ++
.../java/org/apache/camel/util/GroupIterator.java | 13 +-
.../org/apache/camel/util/GroupTokenIterator.java | 14 +-
.../main/java/org/apache/camel/util/IOHelper.java | 23 +
.../apache/camel/util/IntrospectionSupport.java | 30 +-
.../org/apache/camel/util/LRUCacheFactory.java | 92 ++-
.../java/org/apache/camel/util/ObjectHelper.java | 59 +-
.../main/java/org/apache/camel/util/Scanner.java | 303 +++++++
.../java/org/apache/camel/util/SkipIterator.java | 13 +-
.../camel/processor/ThrottlingGroupingTest.java | 134 ++++
.../apache/camel/util/GroupTokenIteratorTest.java | 10 +-
.../src/main/docs/ahc-ws-component.adoc | 31 +-
.../camel-ahc/src/main/docs/ahc-component.adoc | 31 +-
.../camel-amqp/src/main/docs/amqp-component.adoc | 407 ++--------
.../camel-apns/src/main/docs/apns-component.adoc | 8 +-
.../src/main/docs/as2-component.adoc | 53 +-
.../camel-asn1/src/main/docs/asn1-dataformat.adoc | 12 +-
.../src/main/docs/asterisk-component.adoc | 4 +-
.../camel-atmos/src/main/docs/atmos-component.adoc | 4 +-
.../main/docs/atmosphere-websocket-component.adoc | 31 +-
.../camel-atom/src/main/docs/atom-component.adoc | 4 +-
components/camel-atomix/pom.xml | 6 +
.../src/main/docs/atomix-map-component.adoc | 13 +-
.../src/main/docs/atomix-messaging-component.adoc | 10 +-
.../src/main/docs/atomix-multimap-component.adoc | 13 +-
.../src/main/docs/atomix-queue-component.adoc | 10 +-
.../src/main/docs/atomix-set-component.adoc | 10 +-
.../src/main/docs/atomix-value-component.adoc | 10 +-
.../camel-avro/src/main/docs/avro-component.adoc | 16 +-
.../camel-avro/src/main/docs/avro-dataformat.adoc | 16 +-
.../camel-aws/src/main/docs/aws-cw-component.adoc | 4 +-
.../camel-aws/src/main/docs/aws-ddb-component.adoc | 13 +-
.../src/main/docs/aws-ddbstream-component.adoc | 13 +-
.../camel-aws/src/main/docs/aws-ec2-component.adoc | 9 +-
.../camel-aws/src/main/docs/aws-iam-component.adoc | 7 +-
.../src/main/docs/aws-kinesis-component.adoc | 14 +-
.../main/docs/aws-kinesis-firehose-component.adoc | 7 +-
.../camel-aws/src/main/docs/aws-kms-component.adoc | 7 +-
.../src/main/docs/aws-lambda-component.adoc | 10 +-
.../camel-aws/src/main/docs/aws-mq-component.adoc | 10 +-
.../camel-aws/src/main/docs/aws-s3-component.adoc | 59 +-
.../camel-aws/src/main/docs/aws-sdb-component.adoc | 4 +-
.../camel-aws/src/main/docs/aws-ses-component.adoc | 16 +-
.../camel-aws/src/main/docs/aws-sns-component.adoc | 7 +-
.../camel-aws/src/main/docs/aws-sqs-component.adoc | 63 +-
.../camel-aws/src/main/docs/aws-swf-component.adoc | 17 +-
.../src/main/docs/azure-blob-component.adoc | 4 +-
.../src/main/docs/azure-queue-component.adoc | 4 +-
.../src/main/docs/barcode-dataformat.adoc | 5 +-
.../src/main/docs/base64-dataformat.adoc | 12 +-
.../src/main/docs/bean-validator-component.adoc | 4 +-
.../src/main/docs/beanio-dataformat.adoc | 20 +-
.../src/main/docs/beanstalk-component.adoc | 10 +-
.../src/main/docs/bindy-dataformat.adoc | 33 +-
.../src/main/docs/bonita-component.adoc | 4 +-
.../camel-boon/src/main/docs/boon-dataformat.adoc | 5 +-
.../src/main/docs/box-component.adoc | 11 +-
.../src/main/docs/braintree-component.adoc | 8 +-
.../camel-cache/src/main/docs/cache-component.adoc | 32 +-
.../src/main/docs/caffeine-cache-component.adoc | 22 +-
.../main/docs/caffeine-loadcache-component.adoc | 22 +-
.../src/main/docs/cql-component.adoc | 4 +-
.../src/main/docs/castor-dataformat.adoc | 19 +-
components/camel-cdi/pom.xml | 6 +
components/camel-cdi/src/main/docs/cdi.adoc | 1 +
.../src/main/docs/chronicle-engine-component.adoc | 4 +-
.../camel-chunk/src/main/docs/chunk-component.adoc | 4 +-
.../src/main/docs/cm-sms-component.adoc | 4 +-
.../camel-cmis/src/main/docs/cmis-component.adoc | 8 +-
.../camel-coap/src/main/docs/coap-component.adoc | 4 +-
.../src/main/docs/cometd-component.adoc | 13 +-
components/camel-consul/pom.xml | 4 +-
.../src/main/docs/consul-component.adoc | 21 +-
.../src/main/docs/context-component.adoc | 4 +-
.../src/main/docs/couchbase-component.adoc | 4 +-
.../src/main/docs/couchdb-component.adoc | 4 +-
.../src/main/docs/crypto-cms-component.adoc | 17 +-
.../src/main/docs/crypto-component.adoc | 84 +-
.../src/main/docs/crypto-dataformat.adoc | 84 +-
.../camel-csv/src/main/docs/csv-dataformat.adoc | 22 +-
.../camel-cxf/src/main/docs/cxf-component.adoc | 13 +-
.../camel-cxf/src/main/docs/cxfrs-component.adoc | 8 +-
.../component/cxf/jaxrs/DefaultCxfRsBinding.java | 9 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/docs/digitalocean-component.adoc | 4 +-
.../src/main/docs/disruptor-component.adoc | 26 +-
.../camel-dns/src/main/docs/dns-component.adoc | 4 +-
.../src/main/docs/docker-component.adoc | 7 +-
.../camel-dozer/src/main/docs/dozer-component.adoc | 4 +-
.../camel/component/dozer/BaseConverter.java | 2 +-
.../camel/component/dozer/DozerConfiguration.java | 2 +-
.../camel/component/dozer/DozerEndpoint.java | 6 +-
.../dozer/DozerBeanMapperConfiguration.java | 14 +-
.../dozer/DozerThreadContextClassLoader.java | 6 +-
.../camel/converter/dozer/DozerTypeConverter.java | 6 +-
.../converter/dozer/DozerTypeConverterLoader.java | 14 +-
.../camel/converter/dozer/MapperFactory.java | 24 +-
.../converter/dozer/DozerTestArtifactsFactory.java | 3 +-
.../converter/dozer/DozerTypeConverterDTOTest.java | 4 +-
.../converter/dozer/DozerTypeConverterTest.java | 4 +-
.../test/resources/application-context-map-id.xml | 2 +-
.../src/test/resources/application-context.xml | 2 +-
.../camel-drill/src/main/docs/drill-component.adoc | 4 +-
.../src/main/docs/dropbox-component.adoc | 4 +-
components/camel-ehcache/pom.xml | 6 +
.../src/main/docs/ehcache-component.adoc | 27 +-
.../main/docs/elasticsearch-rest-component.adoc | 22 +-
.../src/main/docs/elasticsearch-component.adoc | 8 +-
.../src/main/docs/elasticsearch5-component.adoc | 9 +-
.../camel-elsql/src/main/docs/elsql-component.adoc | 17 +-
.../camel-etcd/src/main/docs/etcd-component.adoc | 7 +-
.../camel-exec/src/main/docs/exec-component.adoc | 4 +-
.../src/main/docs/facebook-component.adoc | 8 +-
.../src/main/docs/json-fastjson-dataformat.adoc | 74 +-
.../src/main/docs/fhir-component.adoc | 34 +-
.../src/main/docs/fhirJson-dataformat.adoc | 89 +--
.../src/main/docs/fhirXml-dataformat.adoc | 89 +--
.../apache/camel/component/fhir/FhirEndpoint.java | 4 +-
.../src/main/docs/flatpack-component.adoc | 24 +-
.../src/main/docs/flatpack-dataformat.adoc | 24 +-
.../camel-flink/src/main/docs/flink-component.adoc | 16 +-
.../camel-fop/src/main/docs/fop-component.adoc | 4 +-
.../src/main/docs/freemarker-component.adoc | 7 +-
components/camel-ftp/pom.xml | 8 +-
.../camel-ftp/src/main/docs/ftp-component.adoc | 4 +-
.../camel-ftp/src/main/docs/ftps-component.adoc | 4 +-
.../src/main/docs/ganglia-component.adoc | 18 +-
.../src/main/docs/geocoder-component.adoc | 4 +-
.../camel-git/src/main/docs/git-component.adoc | 4 +-
.../src/main/docs/github-component.adoc | 4 +-
.../src/main/docs/google-bigquery-component.adoc | 7 +-
.../src/main/docs/google-calendar-component.adoc | 31 +-
.../src/main/docs/google-drive-component.adoc | 22 +-
.../src/main/docs/google-mail-component.adoc | 15 +-
.../main/docs/google-mail-stream-component.adoc | 21 +-
.../src/main/docs/google-pubsub-component.adoc | 4 +-
.../camel-gora/src/main/docs/gora-component.adoc | 4 +-
.../src/main/docs/groovy-language.adoc | 3 +-
.../camel-grpc/src/main/docs/grpc-component.adoc | 4 +-
.../src/main/docs/json-gson-dataformat.adoc | 71 +-
.../src/main/docs/guava-eventbus-component.adoc | 13 +-
components/camel-hawtdb/src/main/docs/hawtdb.adoc | 2 +-
.../main/docs/hazelcast-atomicvalue-component.adoc | 12 +-
.../main/docs/hazelcast-instance-component.adoc | 12 +-
.../src/main/docs/hazelcast-list-component.adoc | 12 +-
.../src/main/docs/hazelcast-map-component.adoc | 12 +-
.../main/docs/hazelcast-multimap-component.adoc | 12 +-
.../src/main/docs/hazelcast-queue-component.adoc | 12 +-
.../docs/hazelcast-replicatedmap-component.adoc | 12 +-
.../main/docs/hazelcast-ringbuffer-component.adoc | 12 +-
.../src/main/docs/hazelcast-seda-component.adoc | 12 +-
.../src/main/docs/hazelcast-set-component.adoc | 12 +-
.../src/main/docs/hazelcast-topic-component.adoc | 12 +-
.../camel-hbase/src/main/docs/hbase-component.adoc | 10 +-
.../camel-hdfs/src/main/docs/hdfs-component.adoc | 7 +-
.../camel-hdfs2/src/main/docs/hdfs2-component.adoc | 7 +-
.../src/main/docs/hessian-dataformat.adoc | 5 +-
components/camel-hipchat/pom.xml | 6 +
.../src/main/docs/hipchat-component.adoc | 4 +-
.../camel-hl7/src/main/docs/hl7-dataformat.adoc | 8 +-
.../camel-http/src/main/docs/http-component.adoc | 28 +-
.../camel-http4/src/main/docs/http4-component.adoc | 70 +-
.../camel-hystrix/src/main/docs/hystrix.adoc | 4 +-
.../processor/HystrixInheritErrorHandlerTest.java} | 44 +-
.../camel-ical/src/main/docs/ical-dataformat.adoc | 5 +-
.../src/main/docs/iec60870-client-component.adoc | 7 +-
.../src/main/docs/iec60870-server-component.adoc | 23 +-
.../src/main/docs/ignite-cache-component.adoc | 10 +-
.../src/main/docs/ignite-compute-component.adoc | 10 +-
.../src/main/docs/ignite-events-component.adoc | 10 +-
.../src/main/docs/ignite-idgen-component.adoc | 10 +-
.../src/main/docs/ignite-messaging-component.adoc | 10 +-
.../src/main/docs/ignite-queue-component.adoc | 10 +-
.../src/main/docs/ignite-set-component.adoc | 10 +-
.../src/main/docs/infinispan-component.adoc | 34 +-
.../src/main/docs/influxdb-component.adoc | 4 +-
.../camel-irc/src/main/docs/irc-component.adoc | 4 +-
.../src/main/docs/ironmq-component.adoc | 4 +-
.../src/main/docs/json-jackson-dataformat.adoc | 71 +-
.../src/main/docs/jacksonxml-dataformat.adoc | 54 +-
.../src/main/docs/javaspace-component.adoc | 4 +-
.../camel-jaxb/src/main/docs/jaxb-dataformat.adoc | 49 +-
.../camel-jbpm/src/main/docs/jbpm-component.adoc | 4 +-
components/camel-jcache/pom.xml | 6 +
.../src/main/docs/jcache-component.adoc | 10 +-
.../camel-jcr/src/main/docs/jcr-component.adoc | 4 +-
.../camel-jdbc/src/main/docs/jdbc-component.adoc | 7 +-
.../src/main/docs/jetty-component.adoc | 102 +--
.../src/main/docs/jgroups-component.adoc | 8 +-
.../camel-jibx/src/main/docs/jibx-dataformat.adoc | 5 +-
.../camel-jing/src/main/docs/jing-component.adoc | 4 +-
.../camel-jira/src/main/docs/jira-component.adoc | 4 +-
.../camel-jms/src/main/docs/jms-component.adoc | 869 ++++-----------------
.../camel-jmx/src/main/docs/jmx-component.adoc | 4 +-
.../src/main/docs/json-johnzon-dataformat.adoc | 71 +-
.../camel-jolt/src/main/docs/jolt-component.adoc | 8 +-
.../camel-josql/src/main/docs/sql-language.adoc | 3 +-
.../camel-jpa/src/main/docs/jpa-component.adoc | 21 +-
components/camel-jsch/pom.xml | 8 +-
.../camel-jsch/src/main/docs/scp-component.adoc | 8 +-
.../src/main/docs/json-validator-component.adoc | 7 +-
.../src/main/docs/jsonpath-language.adoc | 6 +-
.../camel-jt400/src/main/docs/jt400-component.adoc | 7 +-
.../camel-juel/src/main/docs/el-language.adoc | 3 +-
.../src/main/docs/jxpath-language.adoc | 7 +-
.../camel-kafka/src/main/docs/kafka-component.adoc | 429 ++--------
.../src/main/docs/kestrel-component.adoc | 4 +-
.../camel-krati/src/main/docs/krati-component.adoc | 4 +-
.../src/main/docs/kubernetes-component.adoc | 10 +-
.../docs/kubernetes-config-maps-component.adoc | 7 +-
.../docs/kubernetes-deployments-component.adoc | 7 +-
.../src/main/docs/kubernetes-hpa-component.adoc | 7 +-
.../src/main/docs/kubernetes-job-component.adoc | 7 +-
.../main/docs/kubernetes-namespaces-component.adoc | 7 +-
.../src/main/docs/kubernetes-nodes-component.adoc | 7 +-
...rnetes-persistent-volumes-claims-component.adoc | 8 +-
.../kubernetes-persistent-volumes-component.adoc | 7 +-
.../src/main/docs/kubernetes-pods-component.adoc | 7 +-
...bernetes-replication-controllers-component.adoc | 7 +-
.../docs/kubernetes-resources-quota-component.adoc | 7 +-
.../main/docs/kubernetes-secrets-component.adoc | 7 +-
.../kubernetes-service-accounts-component.adoc | 7 +-
.../main/docs/kubernetes-services-component.adoc | 7 +-
.../camel-ldap/src/main/docs/ldap-component.adoc | 4 +-
.../camel-ldif/src/main/docs/ldif-component.adoc | 7 +-
.../src/main/docs/linkedin-component.adoc | 24 +-
.../src/main/docs/lucene-component.adoc | 16 +-
.../src/main/docs/lumberjack-component.adoc | 8 +-
.../camel-lzf/src/main/docs/lzf-dataformat.adoc | 5 +-
.../camel-mail/src/main/docs/mail-component.adoc | 136 +---
.../src/main/docs/master-component.adoc | 14 +-
components/camel-metrics/pom.xml | 6 +
.../src/main/docs/metrics-component.adoc | 7 +-
components/camel-micrometer/pom.xml | 6 +
.../src/main/docs/micrometer-component.adoc | 10 +-
.../src/main/docs/milo-client-component.adoc | 13 +-
.../src/main/docs/milo-server-component.adoc | 25 +-
.../camel-mina2/src/main/docs/mina2-component.adoc | 71 +-
.../camel-mllp/src/main/docs/mllp-component.adoc | 85 +-
.../src/main/docs/mongodb-gridfs-component.adoc | 4 +-
.../src/main/docs/mongodb-component.adoc | 4 +-
.../src/main/docs/mongodb3-component.adoc | 4 +-
.../camel-mqtt/src/main/docs/mqtt-component.adoc | 7 +-
.../camel-msv/src/main/docs/msv-component.adoc | 12 +-
.../src/main/docs/mustache-component.adoc | 7 +-
.../camel-mvel/src/main/docs/mvel-component.adoc | 7 +-
.../camel-mvel/src/main/docs/mvel-language.adoc | 7 +-
.../src/main/docs/mybatis-bean-component.adoc | 13 +-
.../src/main/docs/mybatis-component.adoc | 10 +-
.../src/main/docs/nagios-component.adoc | 4 +-
components/camel-nats/pom.xml | 4 +-
.../camel-nats/src/main/docs/nats-component.adoc | 4 +-
.../apache/camel/component/nats/NatsConsumer.java | 11 +-
.../apache/camel/component/nats/NatsProducer.java | 11 +-
.../camel/component/nats/NatsConsumerLoadTest.java | 1 -
.../nats/NatsConsumerWithConnectionLoadTest.java | 2 +-
.../src/main/docs/netty-http-component.adoc | 115 +--
.../camel-netty/src/main/docs/netty-component.adoc | 185 ++---
.../src/main/docs/netty4-http-component.adoc | 119 +--
.../src/main/docs/netty4-component.adoc | 227 ++----
.../camel-ognl/src/main/docs/ognl-language.adoc | 3 +-
.../src/main/docs/olingo2-component.adoc | 26 +-
.../src/main/docs/olingo4-component.adoc | 26 +-
.../src/main/docs/openshift-component.adoc | 8 +-
.../src/main/docs/openstack-cinder-component.adoc | 4 +-
.../src/main/docs/openstack-glance-component.adoc | 4 +-
.../main/docs/openstack-keystone-component.adoc | 4 +-
.../src/main/docs/openstack-neutron-component.adoc | 4 +-
.../src/main/docs/openstack-nova-component.adoc | 4 +-
.../src/main/docs/openstack-swift-component.adoc | 4 +-
.../src/main/docs/optaplanner-component.adoc | 4 +-
.../camel-paho/src/main/docs/paho-component.adoc | 7 +-
components/camel-pdf/pom.xml | 6 +
.../camel-pdf/src/main/docs/pdf-component.adoc | 4 +-
.../src/main/docs/pgevent-component.adoc | 4 +-
.../camel-printer/src/main/docs/lpr-component.adoc | 4 +-
.../src/main/docs/protobuf-dataformat.adoc | 10 +-
.../src/main/docs/pubnub-component.adoc | 4 +-
.../src/main/docs/quartz2-component.adoc | 32 +-
.../src/main/docs/quickfix-component.adoc | 18 +-
.../src/main/docs/rabbitmq-component.adoc | 110 +--
.../src/main/docs/reactive-streams-component.adoc | 21 +-
.../src/main/docs/rest-swagger-component.adoc | 41 +-
.../src/main/docs/restlet-component.adoc | 49 +-
.../camel-rmi/src/main/docs/rmi-component.adoc | 4 +-
.../src/main/docs/routebox-component.adoc | 4 +-
.../camel-rss/src/main/docs/rss-component.adoc | 9 +-
.../camel-rss/src/main/docs/rss-dataformat.adoc | 9 +-
.../docs/{rxjava2-component.adoc => rxjava2.adoc} | 6 +-
.../src/main/docs/salesforce-component.adoc | 176 ++---
.../salesforce/api/dto/bulk/ContentType.java | 6 +-
.../src/main/docs/sap-netweaver-component.adoc | 4 +-
.../src/main/docs/xquery-component.adoc | 19 +-
.../camel-saxon/src/main/docs/xquery-language.adoc | 19 +-
.../src/main/docs/schematron-component.adoc | 4 +-
.../src/main/docs/javaScript-language.adoc | 12 +-
.../src/main/docs/service-component.adoc | 13 +-
.../src/main/docs/servicenow-component.adoc | 70 +-
.../servicenow/ServiceNowMetaDataExtension.java | 51 +-
.../src/main/docs/servlet-component.adoc | 31 +-
.../camel-sip/src/main/docs/sip-component.adoc | 4 +-
.../src/main/docs/sjms-batch-component.adoc | 26 +-
.../camel-sjms/src/main/docs/sjms-component.adoc | 60 +-
.../camel-sjms2/src/main/docs/sjms2-component.adoc | 63 +-
.../camel-slack/src/main/docs/slack-component.adoc | 4 +-
.../camel-smpp/src/main/docs/smpp-component.adoc | 143 +---
.../src/main/docs/yaml-snakeyaml-dataformat.adoc | 8 +-
.../camel-snmp/src/main/docs/snmp-component.adoc | 4 +-
.../src/main/docs/soapjaxb-dataformat.adoc | 33 +-
.../camel-solr/src/main/docs/solr-component.adoc | 4 +-
.../camel-spark/src/main/docs/spark-component.adoc | 10 +-
.../src/main/docs/splunk-component.adoc | 7 +-
.../src/main/docs/spring-batch-component.adoc | 10 +-
components/camel-spring-boot/pom.xml | 2 +-
.../src/main/docs/spring-boot.adoc | 315 +++-----
.../spring/boot/CamelConfigurationProperties.java | 95 +--
.../cloud/CamelCloudConfigurationProperties.java | 49 +-
.../ClusteredRouteControllerConfiguration.java | 7 +-
.../health/AbstractHealthCheckConfiguration.java | 10 +-
.../health/HealthCheckRoutesConfiguration.java | 13 +-
.../HealthCheckServiceAutoConfiguration.java | 1 -
.../health/HealthCheckServiceConfiguration.java | 6 +-
.../security/CamelSSLConfigurationProperties.java | 204 ++++-
.../security/CamelSSLAutoConfigurationTest.java | 1 -
components/camel-spring-cloud-consul/pom.xml | 4 +-
.../main/docs/spring-integration-component.adoc | 4 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/docs/spring-ldap-component.adoc | 4 +-
.../src/main/docs/spring-redis-component.adoc | 4 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/docs/spring-ws-component.adoc | 4 +-
.../src/main/docs/spring-event-component.adoc | 7 +-
components/camel-spring/src/main/docs/spring.adoc | 1 +
.../src/main/resources/META-INF/spring.schemas | 1 +
.../processor/SpringThrottlerGroupingTest.java | 2 -
.../spring/processor/ThrottlerGroupingTest.xml | 39 +
.../camel-sql/src/main/docs/sql-component.adoc | 10 +-
.../src/main/docs/sql-stored-component.adoc | 7 +-
.../stored/CallableStatementWrapperFactory.java | 6 +-
.../camel-ssh/src/main/docs/ssh-component.adoc | 73 +-
.../camel/component/ssh/EchoCommandFactory.java | 4 +-
.../component/ssh/TestEchoCommandFactory.java | 2 +-
.../camel-stax/src/main/docs/stax-component.adoc | 4 +-
.../camel-stomp/src/main/docs/stomp-component.adoc | 8 +-
.../src/main/docs/stream-component.adoc | 4 +-
.../src/main/docs/string-template-component.adoc | 4 +-
.../src/main/docs/syslog-dataformat.adoc | 5 +-
.../src/main/docs/tidyMarkup-dataformat.adoc | 8 +-
.../src/main/docs/tarfile-dataformat.adoc | 15 +-
.../src/main/docs/telegram-component.adoc | 7 +-
components/camel-testcontainers-spring/pom.xml | 2 +-
.../src/main/docs/testcontainers-spring.adoc | 9 +
.../src/main/docs/testcontainers.adoc | 2 +-
.../src/main/docs/thrift-component.adoc | 20 +-
.../src/main/docs/thrift-dataformat.adoc | 20 +-
components/camel-tika/pom.xml | 6 +
.../camel-tika/src/main/docs/tika-component.adoc | 4 +-
.../src/main/docs/twilio-component.adoc | 7 +-
.../src/main/docs/twitter-component.adoc | 4 +-
.../main/docs/twitter-directmessage-component.adoc | 7 +-
.../src/main/docs/twitter-search-component.adoc | 7 +-
.../src/main/docs/twitter-streaming-component.adoc | 7 +-
.../src/main/docs/twitter-timeline-component.adoc | 7 +-
.../src/main/docs/undertow-component.adoc | 11 +-
.../src/main/docs/univocity-csv-dataformat.adoc | 32 +-
.../src/main/docs/univocity-fixed-dataformat.adoc | 35 +-
.../src/main/docs/univocity-tsv-dataformat.adoc | 32 +-
.../src/main/docs/velocity-component.adoc | 7 +-
.../camel-vertx/src/main/docs/vertx-component.adoc | 16 +-
.../src/main/docs/weather-component.adoc | 7 +-
.../camel-web3j/src/main/docs/web3j-component.adoc | 25 +-
.../src/main/docs/websocket-component.adoc | 35 +-
.../src/main/docs/wordpress-component.adoc | 7 +-
.../src/main/docs/xchange-component.adoc | 7 +-
.../src/main/docs/xmlBeans-dataformat.adoc | 5 +-
.../src/main/docs/xmljson-dataformat.adoc | 54 +-
.../src/main/docs/xmlrpc-component.adoc | 9 +-
.../src/main/docs/xmlrpc-dataformat.adoc | 9 +-
.../src/main/docs/xmlsecurity-component.adoc | 310 ++------
.../camel-xmpp/src/main/docs/xmpp-component.adoc | 4 +-
.../apache/camel/component/xmpp/XmppEndpoint.java | 8 +-
.../apache/camel/component/xmpp/XmppLogger.java | 2 +-
.../src/main/docs/json-xstream-dataformat.adoc | 2 +-
.../src/main/docs/xstream-dataformat.adoc | 113 +--
.../src/main/docs/yammer-component.adoc | 30 +-
components/camel-yql/pom.xml | 6 +
.../camel-yql/src/main/docs/yql-component.adoc | 10 +-
.../src/main/docs/zendesk-component.adoc | 7 +-
.../src/main/docs/zipfile-dataformat.adoc | 15 +-
components/camel-zipkin/src/main/docs/zipkin.adoc | 22 +-
.../java/org/apache/camel/zipkin/ZipkinTracer.java | 29 +-
.../src/main/docs/zookeeper-master-component.adoc | 15 +-
.../src/main/docs/zookeeper-component.adoc | 7 +-
components/readme.adoc | 11 +-
docs/user-manual/en/SUMMARY.md | 33 +-
docs/user-manual/en/async.adoc | 11 +-
docs/user-manual/en/camel-boot.adoc | 37 +
docs/user-manual/en/camel-jar-dependencies.adoc | 55 ++
docs/user-manual/en/defaulterrorhandler.adoc | 66 ++
docs/user-manual/en/dozer-type-conversion.adoc | 68 +-
docs/user-manual/en/error-handling-in-camel.adoc | 235 ++++++
docs/user-manual/en/exception-clause.adoc | 766 ++++++++++++++++++
docs/user-manual/en/predicate.adoc | 222 ++++++
docs/user-manual/en/transactionerrorhandler.adoc | 178 +++++
docs/user-manual/en/try-catch-finally.adoc | 132 ++++
examples/camel-example-cdi-metrics/pom.xml | 6 +
examples/camel-example-cdi-properties/pom.xml | 6 +
examples/camel-example-cdi-rest-servlet/pom.xml | 6 +
examples/camel-example-cdi-test/pom.xml | 6 +
examples/camel-example-cdi-xml/pom.xml | 12 +
.../main/java/sample/camel/MyCamelApplication.java | 1 +
.../src/main/java/sample/camel/MyCamelRouter.java | 12 +-
.../resources/fabric8/hazelcast-deployment.yaml | 2 +-
parent/pom.xml | 82 +-
.../apache/camel/catalog/AbstractCamelCatalog.java | 4 +-
.../org/apache/camel/catalog/CamelCatalogTest.java | 11 +
.../karaf/features/src/main/resources/features.xml | 16 +-
.../FastjsonDataFormatConfiguration.java | 2 +-
.../springboot/FhirComponentConfiguration.java | 2 +-
.../springboot/GsonDataFormatConfiguration.java | 2 +-
.../springboot/JacksonDataFormatConfiguration.java | 2 +-
.../JacksonXMLDataFormatConfiguration.java | 2 +-
.../springboot/JohnzonDataFormatConfiguration.java | 2 +-
.../springboot/JsonDataFormatConfiguration.java | 2 +-
platforms/spring-boot/components-starter/pom.xml | 2 +-
.../camel-spring-boot-dependencies/pom.xml | 18 +-
platforms/spring-boot/spring-boot-dm/pom.xml | 4 +-
pom.xml | 2 +-
tests/camel-itest-karaf/run-tests.sh | 2 +-
tests/camel-itest-spring-boot/pom.xml | 12 +
.../apache/camel/itest/springboot/ITestConfig.java | 50 +-
.../itest/springboot/util/ArquillianPackager.java | 6 +-
.../camel/itest/springboot/util/BOMResolver.java | 22 +-
.../apache/camel/tools/apt/ConverterProcessor.java | 198 +++++
.../tools/apt/EndpointAnnotationProcessor.java | 3 +-
.../camel/tools/apt/ModelAnnotationProcessor.java | 3 +-
.../services/javax.annotation.processing.Processor | 1 +
.../pom.xml | 6 +
.../camel/maven/packaging/PrepareCatalogMojo.java | 9 +-
...pdateSpringBootAutoConfigurationReadmeMojo.java | 17 +-
.../model/SpringBootAutoConfigureOptionModel.java | 2 -
.../src/it/simple-xml/pom.xml | 4 +-
557 files changed, 6616 insertions(+), 7199 deletions(-)
create mode 100644 camel-core/src/main/docs/eips/content-based-router-eip.adoc
create mode 100644 camel-core/src/main/docs/eips/transactional-client.adoc
create mode 100644 camel-core/src/main/java/org/apache/camel/util/CompoundIterator.java
create mode 100644 camel-core/src/main/java/org/apache/camel/util/Scanner.java
copy components/{camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerLoadTest.java => camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixInheritErrorHandlerTest.java} (50%)
rename components/camel-rxjava2/src/main/docs/{rxjava2-component.adoc => rxjava2.adoc} (66%)
create mode 100644 components/camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc
create mode 100644 docs/user-manual/en/camel-boot.adoc
create mode 100644 docs/user-manual/en/camel-jar-dependencies.adoc
create mode 100644 docs/user-manual/en/defaulterrorhandler.adoc
create mode 100644 docs/user-manual/en/error-handling-in-camel.adoc
create mode 100644 docs/user-manual/en/exception-clause.adoc
create mode 100644 docs/user-manual/en/predicate.adoc
create mode 100644 docs/user-manual/en/transactionerrorhandler.adoc
create mode 100644 docs/user-manual/en/try-catch-finally.adoc
create mode 100644 tooling/apt/src/main/java/org/apache/camel/tools/apt/ConverterProcessor.java
[camel] 02/04: CAMEL-12618: Use fork of MVEL that supports Jav...
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3f2666c740fe13a8689a2786112a29cb757dd9d0
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jul 13 11:43:54 2018 +0200
CAMEL-12618: Use fork of MVEL that supports Jav...
...a 11
Try to fix Java 10 build with MVEL dependency built by jitpack.io.
See mvel/mvel#159[2]
[1] http://openjdk.java.net/jeps/320
[2] https://github.com/mvel/mvel/issues/159
---
tooling/maven/camel-package-maven-plugin/pom.xml | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 50afd0f..47cf92a 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -44,6 +44,17 @@
</dependencies>
</dependencyManagement>
+ <!-- added to allow for Java 10+ compatibility in MVEL
+ there is no release that includes this fix
+ https://github.com/mvel/mvel/issues/159
+ -->
+ <repositories>
+ <repository>
+ <id>jitpack.io</id>
+ <url>https://jitpack.io</url>
+ </repository>
+ </repositories>
+
<dependencies>
<!-- use our patched ordered json-simple parser -->
@@ -53,10 +64,11 @@
<version>${project.version}</version>
</dependency>
+ <!-- see above, targeting MVEL with Java 10+ support -->
<dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- <version>${mvel-version}</version>
+ <groupId>com.github.mvel</groupId>
+ <artifactId>mvel</artifactId>
+ <version>97071e83fb</version>
</dependency>
<dependency>
[camel] 03/04: CAMEL-12618: Use fork of maven-plugin-plugin th...
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b23dba9435c05894f1681384b94f63b76041f0a8
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Jul 18 14:56:45 2018 +0200
CAMEL-12618: Use fork of maven-plugin-plugin th...
...at supports Java 11
Changes the maven-plugin-plugin version used to a fork built by
jitpack.io that contains the Java 11 compatibility needed.
---
tooling/maven/camel-api-component-maven-plugin/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml
index 0070fd6..ff85641 100644
--- a/tooling/maven/camel-api-component-maven-plugin/pom.xml
+++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml
@@ -174,9 +174,9 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>com.github.zregvart.maven-plugin-tools</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
+ <version>MPLUGIN-336-SNAPSHOT</version>
<configuration>
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
[camel] 04/04: CAMEL-12618: Additional dependencies needed on ...
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 217aac532eca237935a0a5ebe4c369dbcecb330b
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Jul 26 16:08:48 2018 +0200
CAMEL-12618: Additional dependencies needed on ...
...Java 11
Adds additional dependencies needed to compile on Java 11. Java 11
stopped shipping Java EE classes[1], we need to add them as dependencies
now.
[1] http://openjdk.java.net/jeps/320
---
.../src/main/resources/archetype-resources/pom.xml | 17 +++-
camel-core/pom.xml | 35 ++++++++-
components/camel-bam/pom.xml | 34 +++++++-
components/camel-bindy/pom.xml | 17 +++-
components/camel-blueprint/pom.xml | 67 ++++++++++++++--
components/camel-bonita/pom.xml | 17 +++-
components/camel-cdi/pom.xml | 29 ++++++-
components/camel-context/pom.xml | 17 +++-
components/camel-cxf-transport/pom.xml | 31 +++++++-
components/camel-dozer/pom.xml | 15 ++++
components/camel-grpc/pom.xml | 22 ++++++
components/camel-guice/pom.xml | 16 ++++
components/camel-hl7/pom.xml | 17 +++-
components/camel-jetty9/pom.xml | 22 +++++-
components/camel-jmx/pom.xml | 80 ++++++-------------
components/camel-mail/pom.xml | 17 +++-
components/camel-netty-http/pom.xml | 16 ++++
components/camel-netty4/pom.xml | 47 +++++++----
components/camel-ruby/pom.xml | 17 +++-
components/camel-soap/pom.xml | 91 ++++++----------------
components/camel-spring-boot/pom.xml | 17 +++-
components/camel-spring-javaconfig/pom.xml | 17 +++-
components/camel-spring-redis/pom.xml | 16 ++++
components/camel-spring-ws/pom.xml | 26 ++++++-
components/camel-spring/pom.xml | 66 +++++++++++++---
components/camel-syslog/pom.xml | 17 +++-
components/camel-telegram/pom.xml | 17 +++-
components/camel-test-blueprint/pom.xml | 17 +++-
components/camel-test-spring/pom.xml | 17 +++-
components/camel-test/pom.xml | 17 +++-
components/camel-testcontainers-spring/pom.xml | 18 ++++-
components/camel-testcontainers/pom.xml | 18 ++++-
components/camel-testng/pom.xml | 17 +++-
components/camel-thrift/pom.xml | 16 ++++
components/camel-undertow/pom.xml | 16 ++++
components/camel-wordpress/pom.xml | 17 +++-
connectors/camel-connector-maven-plugin/pom.xml | 17 ++++
connectors/examples/beverage-component/pom.xml | 17 +++-
connectors/examples/foo-bar-wine-example/pom.xml | 17 +++-
connectors/examples/petstore-example/pom.xml | 17 +++-
examples/camel-example-cafe/pom.xml | 17 +++-
examples/camel-example-cdi-metrics/pom.xml | 17 +++-
examples/camel-example-cdi-properties/pom.xml | 17 +++-
examples/camel-example-cdi-rest-servlet/pom.xml | 21 ++++-
examples/camel-example-cdi-test/pom.xml | 17 +++-
examples/camel-example-cxf-blueprint/pom.xml | 17 +++-
examples/camel-example-cxf-proxy/pom.xml | 17 +++-
examples/camel-example-cxf-tomcat/pom.xml | 15 +++-
.../hello-camel-grpc-server-kubernetes/pom.xml | 15 +++-
examples/camel-example-loan-broker-cxf/pom.xml | 17 +++-
examples/camel-example-loan-broker-jms/pom.xml | 17 +++-
examples/camel-example-management/pom.xml | 17 +++-
examples/camel-example-pojo-messaging/pom.xml | 17 +++-
examples/camel-example-rabbitmq/pom.xml | 17 +++-
examples/camel-example-reportincident/pom.xml | 17 +++-
examples/camel-example-rest-producer/pom.xml | 17 +++-
.../camel-example-spring-boot-activemq/pom.xml | 17 +++-
.../pom.xml | 17 +++-
.../hello-camel-grpc-server/pom.xml | 18 +++++
.../pom.xml | 17 +++-
examples/camel-example-spring-boot-master/pom.xml | 17 +++-
examples/camel-example-spring-boot-pojo/pom.xml | 17 +++-
.../camel-example-spring-boot-rest-jpa/pom.xml | 17 +++-
.../pom.xml | 17 +++-
examples/camel-example-spring-boot-xml/pom.xml | 17 +++-
examples/camel-example-spring-boot/pom.xml | 17 +++-
examples/camel-example-spring-jms/pom.xml | 17 +++-
examples/camel-example-spring-ws/pom.xml | 15 ++++
examples/camel-example-transformer-demo/pom.xml | 17 +++-
.../camel-example-validator-spring-boot/pom.xml | 17 +++-
parent/pom.xml | 67 ++++++++++++++--
platforms/camel-catalog-rest/pom.xml | 4 +-
platforms/spring-boot/components-starter/pom.xml | 17 +++-
tests/camel-blueprint-test/pom.xml | 17 +++-
tooling/apt/pom.xml | 16 ++++
.../pom.xml | 2 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 7 +-
tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 2 +-
.../src/it/simple-xml/pom.xml | 41 ++++++++++
tooling/swagger-rest-dsl-generator/pom.xml | 15 ++++
80 files changed, 1438 insertions(+), 280 deletions(-)
diff --git a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
index c439407..b584ec6 100644
--- a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
@@ -152,9 +152,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -167,5 +167,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index f5d1c43..274bbb4 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -672,9 +672,9 @@
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>9</jdk>
</activation>
<dependencies>
@@ -727,6 +727,37 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>jdk10+-build</id>
+ <activation>
+ <jdk>[10,)</jdk>
+ </activation>
+ <dependencies>
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>apt</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ <version>${soap-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
</project>
diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml
index 790bc26..450f3ce 100644
--- a/components/camel-bam/pom.xml
+++ b/components/camel-bam/pom.xml
@@ -210,9 +210,9 @@
</profile>
<profile>
- <id>jdk9+-hibernate</id>
+ <id>jdk9-10-hibernate</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<testResources>
@@ -243,5 +243,35 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/profiles/hibernate</directory>
+ </testResource>
+ </testResources>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index 413f63e..b19ce8e 100644
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -105,9 +105,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -121,5 +121,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 86711ce..a62d8c3 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -412,10 +412,10 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<executions>
<execution>
<id>generate-schema</id>
@@ -489,9 +489,9 @@
</build>
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
<property>
<name>!os.unsupported.schemagen</name>
</property>
@@ -502,7 +502,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -553,6 +553,63 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <version>2.4</version>
+ <dependencies>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>include-sources</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <echo>Including source code from camel-core-xml in the camel-blueprint-sources.jar</echo>
+ <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar"
+ update="true">
+ <fileset dir="${basedir}/../camel-core-osgi/src/main/java" includes="**/*"/>
+ <fileset dir="${basedir}/../camel-core-xml/src/main/java" includes="**/*"/>
+ </jar>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<reporting>
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index 585565f..eb5efd5 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -92,9 +92,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -107,5 +107,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 2f7c7cf..c37a9bb 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -507,13 +507,20 @@
</dependencies>
+ </profile>
+
+ <profile>
+ <id>jdk9-10--build</id>
+ <activation>
+ <jdk>[9,10]</jdk>
+ </activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>true</reuseForks>
- <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar --patch-module java.xml.bind=${project.basedir}/target/java9 ${camel.surefire.fork.vmargs} --add-opens java.base/java.lang=java.xml.bind</argLine>
+ <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${annotation-api-version}.jar --patch-module java.xml.bind=${project.basedir}/target/java9 ${camel.surefire.fork.vmargs} --add-opens java.base/java.lang=java.xml.bind</argLine>
</configuration>
</plugin>
<plugin>
@@ -532,7 +539,7 @@
<artifactItem>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>${annotation-api-version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.basedir}/target/java9</outputDirectory>
@@ -574,6 +581,24 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-context/pom.xml b/components/camel-context/pom.xml
index 9148299..2b96631 100644
--- a/components/camel-context/pom.xml
+++ b/components/camel-context/pom.xml
@@ -86,9 +86,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -101,5 +101,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 02e1480..a978cff 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -203,15 +203,22 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>6.2</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -225,6 +232,26 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>webservices-api</artifactId>
+ <version>${webservices-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index a7440c4..d2cd69f 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -99,4 +99,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index a9b3cad..3566a65 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -228,4 +228,26 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-guice/pom.xml b/components/camel-guice/pom.xml
index dcda484..5dc6d4a 100644
--- a/components/camel-guice/pom.xml
+++ b/components/camel-guice/pom.xml
@@ -91,4 +91,20 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 6982cd3..6b3b108 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -149,9 +149,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -164,5 +164,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index 101bed7..ddac318 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -190,9 +190,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -205,6 +205,24 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 10aebc4..a73f7fe 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -76,67 +76,33 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
- <id>jdk8-build</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- TODO: This is a temporary workaround until org.codehaus.mojo:jaxb2-maven-plugin supports JDK9.
- (https://github.com/mojohaus/jaxb2-maven-plugin/issues/43). We need to add the plugin back
- once we are sure it works on both JDK8 and JDK9.
- See https://issues.apache.org/jira/browse/CAMEL-10141 for more info. -->
- <id>jdk9+-build</id>
+ <id>jdk11+-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[11,)</jdk>
</activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-plugin</artifactId>
- <version>${cxf-xjc-plugin-version}</version>
- <configuration>
- <extensions>
- <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
- </extensions>
- </configuration>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
- <sourceRoot>${basedir}/target/xjc</sourceRoot>
- <xsdOptions>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/notifications.xsd</xsd>
- <packagename>org.apache.camel.component.jmx.jaxb</packagename>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
</project>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 4c9cc48..ce64948 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -142,9 +142,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -158,5 +158,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml
index f6e558f..a00043b 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -95,4 +95,20 @@
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index dca3ecf..6fe12c1 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -84,23 +84,36 @@
</dependencies>
<profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <profile>
+ <id>jdk9-10-build</id>
+ <activation>
+ <jdk>[9,10]</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
+ <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-ruby/pom.xml b/components/camel-ruby/pom.xml
index c3cd5a4..f7e680f 100644
--- a/components/camel-ruby/pom.xml
+++ b/components/camel-ruby/pom.xml
@@ -80,9 +80,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -95,5 +95,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index c210462..c07d890 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -104,6 +104,10 @@
<build>
<plugins>
<plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-plugin</artifactId>
<version>${cxf-xjc-plugin-version}</version>
@@ -202,76 +206,27 @@
<profiles>
<profile>
- <id>jdk8-build</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- TODO: This is a temporary workaround until org.codehaus.mojo:jaxb2-maven-plugin supports JDK9.
- (https://github.com/mojohaus/jaxb2-maven-plugin/issues/43). We need to add the plugin back
- once we are sure it works on both JDK8 and JDK9.
- See https://issues.apache.org/jira/browse/CAMEL-10141 for more info. -->
- <id>jdk9+-build</id>
+ <id>jdk11+-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[11,)</jdk>
</activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-plugin</artifactId>
- <version>${cxf-xjc-plugin-version}</version>
- <configuration>
- <extensions>
- <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
- </extensions>
- </configuration>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
- <sourceRoot>${basedir}/target/xjc</sourceRoot>
- <xsdOptions>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/soap.xsd</xsd>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/soap12.xsd</xsd>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/xml.xsd</xsd>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>webservices-api</artifactId>
+ <version>${webservices-api-version}</version>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
</project>
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index b1a0676..e2a7028 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -159,9 +159,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -175,5 +175,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml
index c8a40d6..7f0e46a 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -96,9 +96,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -112,5 +112,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml
index 372bd46..b6eda35 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -84,4 +84,20 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index bb7cea9..e1d2927 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -188,16 +188,16 @@
<profiles>
<profile>
- <id>java9+</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>--patch-module java.xml.bind=${project.basedir}/target/java9/stax-ex-1.7.8.jar --patch-module java.xml.ws=${project.basedir}/target/java9/saaj-impl-1.3.28.jar --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar ${camel.surefire.fork.vmargs} --add-exports=java.xml/com.sun.org.apache.xerces.internal.dom=java.xml.ws --add-exports=java.xml.bind/org.jvnet.staxex.util=java.xml.ws</argLine>
+ <argLine>--patch-module java.xml.bind=${project.basedir}/target/java9/stax-ex-1.7.8.jar --patch-module java.xml.ws=${project.basedir}/target/java9/saaj-impl-1.3.28.jar --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${annotation-api-version}.jar ${camel.surefire.fork.vmargs} --add-exports=java.xml/com.sun.org.apache.xerces.internal.dom=java.xml.ws --add-exports=java.xml.bind/org.jvnet.staxex.util=java.xml.ws</argLine>
</configuration>
</plugin>
<plugin>
@@ -224,7 +224,7 @@
<artifactItem>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>${annotation-api-version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.basedir}/target/java9</outputDirectory>
@@ -247,5 +247,23 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 72f88e0..e9e1134 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -575,7 +575,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<executions>
<execution>
<id>generate schema</id>
@@ -598,9 +598,9 @@
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<dependencies>
<!-- xmltokenizer using woodstox -->
@@ -614,15 +614,9 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -652,6 +646,58 @@
<createJavaDocAnnotations>false</createJavaDocAnnotations>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>generate schema</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>schemagen</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>${project.build.directory}/schema</outputDirectory>
+ <sources>
+ <source>${project.build.directory}/schema-src</source>
+ </sources>
+ <createJavaDocAnnotations>false</createJavaDocAnnotations>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index d032fc2..60308de 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -87,9 +87,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -102,5 +102,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml
index c5f740e..97544a2 100644
--- a/components/camel-telegram/pom.xml
+++ b/components/camel-telegram/pom.xml
@@ -141,9 +141,9 @@
</build>
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -156,6 +156,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index 175073b..931f953 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -178,9 +178,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -193,5 +193,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml
index a406a50..0a6be29 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -76,9 +76,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -92,5 +92,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml
index 545d167..63ca268 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -72,9 +72,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -87,5 +87,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-testcontainers-spring/pom.xml b/components/camel-testcontainers-spring/pom.xml
index ceb0f51..c15f87e 100644
--- a/components/camel-testcontainers-spring/pom.xml
+++ b/components/camel-testcontainers-spring/pom.xml
@@ -75,9 +75,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -91,6 +91,20 @@
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
<!-- activate integration test if the docker socket file is accessible -->
<profile>
<id>testcontainers-spring-integration-tests-docker-file</id>
diff --git a/components/camel-testcontainers/pom.xml b/components/camel-testcontainers/pom.xml
index 4f95cbd..4a07ea6 100644
--- a/components/camel-testcontainers/pom.xml
+++ b/components/camel-testcontainers/pom.xml
@@ -77,9 +77,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -93,6 +93,20 @@
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
<!-- activate integration test if the docker socket file is accessible -->
<profile>
<id>testcontainers-integration-tests-docker-file</id>
diff --git a/components/camel-testng/pom.xml b/components/camel-testng/pom.xml
index 1ad175d..3bced62 100644
--- a/components/camel-testng/pom.xml
+++ b/components/camel-testng/pom.xml
@@ -84,9 +84,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -100,5 +100,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-thrift/pom.xml b/components/camel-thrift/pom.xml
index 09bfba1..16bb2ce 100644
--- a/components/camel-thrift/pom.xml
+++ b/components/camel-thrift/pom.xml
@@ -107,4 +107,20 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 7dc8d48..68576eb 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -115,4 +115,20 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index 41b560b..d80c62a 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -127,9 +127,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -142,6 +142,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/connectors/camel-connector-maven-plugin/pom.xml b/connectors/camel-connector-maven-plugin/pom.xml
index a77590c..6cd3190 100644
--- a/connectors/camel-connector-maven-plugin/pom.xml
+++ b/connectors/camel-connector-maven-plugin/pom.xml
@@ -123,4 +123,21 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/connectors/examples/beverage-component/pom.xml b/connectors/examples/beverage-component/pom.xml
index 48d41e2..89d3329 100644
--- a/connectors/examples/beverage-component/pom.xml
+++ b/connectors/examples/beverage-component/pom.xml
@@ -95,9 +95,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -110,5 +110,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/connectors/examples/foo-bar-wine-example/pom.xml b/connectors/examples/foo-bar-wine-example/pom.xml
index 270dd0e..39466c8 100644
--- a/connectors/examples/foo-bar-wine-example/pom.xml
+++ b/connectors/examples/foo-bar-wine-example/pom.xml
@@ -107,9 +107,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -122,5 +122,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/connectors/examples/petstore-example/pom.xml b/connectors/examples/petstore-example/pom.xml
index cb495e9..9a050ca 100644
--- a/connectors/examples/petstore-example/pom.xml
+++ b/connectors/examples/petstore-example/pom.xml
@@ -110,9 +110,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -125,5 +125,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cafe/pom.xml b/examples/camel-example-cafe/pom.xml
index 969c662..818fdbf 100644
--- a/examples/camel-example-cafe/pom.xml
+++ b/examples/camel-example-cafe/pom.xml
@@ -123,9 +123,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -138,5 +138,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml
index 6528b12..607febc 100644
--- a/examples/camel-example-cdi-metrics/pom.xml
+++ b/examples/camel-example-cdi-metrics/pom.xml
@@ -137,9 +137,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -152,5 +152,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml
index 7a3b533..22402f7 100644
--- a/examples/camel-example-cdi-properties/pom.xml
+++ b/examples/camel-example-cdi-properties/pom.xml
@@ -134,9 +134,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -149,5 +149,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml
index b202c9a..9dfa724 100644
--- a/examples/camel-example-cdi-rest-servlet/pom.xml
+++ b/examples/camel-example-cdi-rest-servlet/pom.xml
@@ -178,7 +178,7 @@
</dependencies>
</profile>
<profile>
- <id>jdk9+-build-jetty</id>
+ <id>jdk9+-jetty</id>
<activation>
<jdk>[9,)</jdk>
</activation>
@@ -208,6 +208,12 @@
</exclusions>
</dependency>
</dependencies>
+ </profile>
+ <profile>
+ <id>jdk9-10-build</id>
+ <activation>
+ <jdk>[9,10]</jdk>
+ </activation>
<build>
<plugins>
<plugin>
@@ -219,6 +225,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml
index 35b7e86..7e4cdb9 100644
--- a/examples/camel-example-cdi-test/pom.xml
+++ b/examples/camel-example-cdi-test/pom.xml
@@ -118,9 +118,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -133,5 +133,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cxf-blueprint/pom.xml b/examples/camel-example-cxf-blueprint/pom.xml
index 32652cb..22c98a1 100644
--- a/examples/camel-example-cxf-blueprint/pom.xml
+++ b/examples/camel-example-cxf-blueprint/pom.xml
@@ -102,9 +102,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -117,5 +117,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cxf-proxy/pom.xml b/examples/camel-example-cxf-proxy/pom.xml
index 49dfa31..d7e58bf 100644
--- a/examples/camel-example-cxf-proxy/pom.xml
+++ b/examples/camel-example-cxf-proxy/pom.xml
@@ -154,9 +154,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -169,5 +169,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cxf-tomcat/pom.xml b/examples/camel-example-cxf-tomcat/pom.xml
index fd50281..7af41ff 100644
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -138,7 +138,7 @@
</properties>
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
<jdk>[9,)</jdk>
</activation>
@@ -153,6 +153,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
index b526418..535e77b 100644
--- a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
+++ b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
@@ -165,5 +165,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/camel-example-loan-broker-cxf/pom.xml b/examples/camel-example-loan-broker-cxf/pom.xml
index 3be3754..789a221 100644
--- a/examples/camel-example-loan-broker-cxf/pom.xml
+++ b/examples/camel-example-loan-broker-cxf/pom.xml
@@ -172,9 +172,9 @@
</properties>
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -187,6 +187,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-loan-broker-jms/pom.xml b/examples/camel-example-loan-broker-jms/pom.xml
index 38ff034..a93fc08 100644
--- a/examples/camel-example-loan-broker-jms/pom.xml
+++ b/examples/camel-example-loan-broker-jms/pom.xml
@@ -180,9 +180,9 @@
</properties>
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -195,6 +195,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-management/pom.xml b/examples/camel-example-management/pom.xml
index f60ff98..12d56ca 100644
--- a/examples/camel-example-management/pom.xml
+++ b/examples/camel-example-management/pom.xml
@@ -140,9 +140,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -155,5 +155,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/camel-example-pojo-messaging/pom.xml
index d4a4d99..986a083 100644
--- a/examples/camel-example-pojo-messaging/pom.xml
+++ b/examples/camel-example-pojo-messaging/pom.xml
@@ -158,9 +158,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -173,5 +173,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-rabbitmq/pom.xml b/examples/camel-example-rabbitmq/pom.xml
index 00c88dc..0f83223 100644
--- a/examples/camel-example-rabbitmq/pom.xml
+++ b/examples/camel-example-rabbitmq/pom.xml
@@ -138,9 +138,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -153,5 +153,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml
index 0cffa44..a164b1c 100644
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -198,9 +198,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -213,5 +213,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-rest-producer/pom.xml b/examples/camel-example-rest-producer/pom.xml
index d3a88e7..4f1edf1 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -134,9 +134,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -149,5 +149,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-activemq/pom.xml b/examples/camel-example-spring-boot-activemq/pom.xml
index 6ab6da6..9ddc478 100644
--- a/examples/camel-example-spring-boot-activemq/pom.xml
+++ b/examples/camel-example-spring-boot-activemq/pom.xml
@@ -127,9 +127,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -143,6 +143,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-clustered-route-controller/pom.xml b/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
index fac7c9c..54d9fe9 100644
--- a/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
@@ -48,9 +48,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -63,5 +63,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
index a12ec56..0b3c47a 100644
--- a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
+++ b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
@@ -108,4 +108,22 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/camel-example-spring-boot-health-checks/pom.xml b/examples/camel-example-spring-boot-health-checks/pom.xml
index ecbb3bb..55e68c9 100644
--- a/examples/camel-example-spring-boot-health-checks/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/pom.xml
@@ -49,9 +49,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -64,5 +64,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-master/pom.xml b/examples/camel-example-spring-boot-master/pom.xml
index 034e6f9..7e6b8f5 100644
--- a/examples/camel-example-spring-boot-master/pom.xml
+++ b/examples/camel-example-spring-boot-master/pom.xml
@@ -114,9 +114,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -129,5 +129,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-pojo/pom.xml b/examples/camel-example-spring-boot-pojo/pom.xml
index 7920fe0..2785969 100644
--- a/examples/camel-example-spring-boot-pojo/pom.xml
+++ b/examples/camel-example-spring-boot-pojo/pom.xml
@@ -112,9 +112,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -127,5 +127,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-rest-jpa/pom.xml b/examples/camel-example-spring-boot-rest-jpa/pom.xml
index a79b32d..5c94611 100644
--- a/examples/camel-example-spring-boot-rest-jpa/pom.xml
+++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml
@@ -145,9 +145,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -160,6 +160,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
index 6210564..42a9c0f 100644
--- a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
@@ -141,9 +141,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -156,5 +156,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-xml/pom.xml b/examples/camel-example-spring-boot-xml/pom.xml
index 29e6a0a..1055a66 100644
--- a/examples/camel-example-spring-boot-xml/pom.xml
+++ b/examples/camel-example-spring-boot-xml/pom.xml
@@ -139,9 +139,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -154,5 +154,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot/pom.xml b/examples/camel-example-spring-boot/pom.xml
index 64808c4..4c3e662 100644
--- a/examples/camel-example-spring-boot/pom.xml
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -138,9 +138,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -153,5 +153,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml
index 64fd1e4..2c9f819 100644
--- a/examples/camel-example-spring-jms/pom.xml
+++ b/examples/camel-example-spring-jms/pom.xml
@@ -145,9 +145,9 @@
</properties>
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -160,6 +160,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
diff --git a/examples/camel-example-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml
index 02e896b..33ecaea 100644
--- a/examples/camel-example-spring-ws/pom.xml
+++ b/examples/camel-example-spring-ws/pom.xml
@@ -129,4 +129,19 @@
</build>
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/examples/camel-example-transformer-demo/pom.xml b/examples/camel-example-transformer-demo/pom.xml
index a85874b..37a9939 100644
--- a/examples/camel-example-transformer-demo/pom.xml
+++ b/examples/camel-example-transformer-demo/pom.xml
@@ -106,9 +106,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -121,5 +121,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-validator-spring-boot/pom.xml b/examples/camel-example-validator-spring-boot/pom.xml
index 417f2b4..b3bde27 100644
--- a/examples/camel-example-validator-spring-boot/pom.xml
+++ b/examples/camel-example-validator-spring-boot/pom.xml
@@ -127,9 +127,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -142,5 +142,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index d236086..73895b1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,10 +40,12 @@
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
- <activemq-version>5.15.4</activemq-version>
+ <activation-api-version>1.2.0</activation-api-version>
<activemq-artemis-version>2.6.2</activemq-artemis-version>
+ <activemq-version>5.15.4</activemq-version>
<aether-version>1.0.2.v20150114</aether-version>
<ahc-version>2.5.2</ahc-version>
+ <annotation-api-version>1.3.2</annotation-api-version>
<ant-bundle-version>1.7.0_6</ant-bundle-version>
<antlr-bundle-version>3.5.2_1</antlr-bundle-version>
<antlr-runtime-bundle-version>3.5.2_1</antlr-runtime-bundle-version>
@@ -170,7 +172,7 @@
<couchbase-client-version>1.4.13</couchbase-client-version>
<couchbase-client-bundle-version>1.4.13_1</couchbase-client-bundle-version>
<curator-version>2.12.0</curator-version>
- <cxf-version>3.2.5</cxf-version>
+ <cxf-version>3.3.0-SNAPSHOT</cxf-version><!-- we need SNAPSHOT version for Java 11 support, see CXF-7741 -->
<cxf-version-range>[3.1,4.0)</cxf-version-range>
<cxf-xjc-plugin-version>3.2.0</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.2.0</cxf-xjc-utils-version>
@@ -625,6 +627,7 @@
<snakeyaml-version>1.21</snakeyaml-version>
<snappy-version>1.1.4</snappy-version>
<snmp4j-version>2.6.2_1</snmp4j-version>
+ <soap-api-version>1.4.0</soap-api-version>
<solr-bundle-version>7.2.1_1</solr-bundle-version>
<!-- solr version aligned with lucene -->
<solr-version>7.2.1</solr-version>
@@ -703,6 +706,8 @@
<vertx-version>3.5.3</vertx-version>
<vysper-version>0.7</vysper-version>
<web3j-version>3.5.0</web3j-version>
+ <web3j-version>3.4.0</web3j-version>
+ <webservices-api-version>2.1-b16</webservices-api-version>
<weld1-version>1.1.28.Final</weld1-version>
<weld2-version>2.4.7.Final</weld2-version>
<weld3-version>3.0.5.Final</weld3-version>
@@ -5245,7 +5250,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.8.3</version>
+ <version>0.14.0</version>
<executions>
<execution>
<goals>
@@ -5718,9 +5723,9 @@
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<properties>
<cxf.codegen.jvmArgs>--add-modules java.activation,java.xml.bind,java.xml.ws --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.marshaller=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-open [...]
@@ -5774,5 +5779,57 @@
</pluginManagement>
</build>
</profile>
+
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <properties>
+ <cxf.codegen.jvmArgs>--add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED</cxf.codegen.jvmArgs>
+ <cxf.xjc.jvmArgs>--add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED</cxf.xjc.jvmArgs>
+ <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
+ <camel.surefire.fork.vmargs>--add-modules java.sql --add-opens java.base/javax.net=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add [...]
+ </properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-package-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin-version}</version>
+ <configuration>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ <maxmem>512M</maxmem>
+ <fork>true</fork>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!--lets avoid polluting every pom.xml as these settings are almost always needed-->
+ <configuration>
+ <argLine>${camel.surefire.fork.vmargs}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/platforms/camel-catalog-rest/pom.xml b/platforms/camel-catalog-rest/pom.xml
index f9c4c3b..332ce41 100644
--- a/platforms/camel-catalog-rest/pom.xml
+++ b/platforms/camel-catalog-rest/pom.xml
@@ -184,7 +184,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar ${camel.surefire.fork.vmargs}</argLine>
+ <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${annotation-api-version}.jar ${camel.surefire.fork.vmargs}</argLine>
</configuration>
</plugin>
<plugin>
@@ -203,7 +203,7 @@
<artifactItem>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>${annotation-api-version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.basedir}/target/java9</outputDirectory>
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index d961b69..b20c97b 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -370,9 +370,9 @@
</modules>
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -385,5 +385,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/tests/camel-blueprint-test/pom.xml b/tests/camel-blueprint-test/pom.xml
index af08026..939129b 100644
--- a/tests/camel-blueprint-test/pom.xml
+++ b/tests/camel-blueprint-test/pom.xml
@@ -64,9 +64,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -79,5 +79,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/tooling/apt/pom.xml b/tooling/apt/pom.xml
index 6afd3aa..c5aefbc 100644
--- a/tooling/apt/pom.xml
+++ b/tooling/apt/pom.xml
@@ -97,4 +97,20 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
index 95b9b29..97a5cec 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
@@ -156,7 +156,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
+ <version>3.6-SNAPSHOT</version>
<configuration>
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 47cf92a..c49ba61 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -196,7 +196,12 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
</dependency>
</dependencies>
</profile>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index 9c7e449..aa0d93c 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -114,7 +114,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
+ <version>${annotation-api-version}</version>
</dependency>
</dependencies>
</profile>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
index 95307f0..64de3d5 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
@@ -54,4 +54,45 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jdk10+-build</id>
+ <activation>
+ <jdk>[10,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>@project.groupId@</groupId>
+ <artifactId>@project.artifactId@</artifactId>
+ <version>@project.version@</version>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>@jaxb-version@</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>@activation-api-version@</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>@jaxb-version@</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>@jaxb-version@</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index ca8acb5..6053779 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -80,4 +80,19 @@
</dependencies>
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
[camel] 01/04: Temporary disable JDK 9 and karaf-itest builds
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e24218d76690999126093ad1185f731c9884f65d
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jul 20 16:46:23 2018 +0200
Temporary disable JDK 9 and karaf-itest builds
---
Jenkinsfile.daily | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 86051db..3e444ee 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -59,9 +59,9 @@ pipeline {
}
steps {
dir("tests/camel-itest-karaf/") {
- sh "./kill-karaf.sh"
+ sh "true || ./kill-karaf.sh"
script {
- karaf_itests_result = sh script: "./run-tests.sh", returnStatus: true
+ karaf_itests_result = sh script: "true || ./run-tests.sh", returnStatus: true
}
}
}
@@ -86,7 +86,7 @@ pipeline {
}
steps {
script {
- jdk9_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
+ jdk9_result = sh script: "true || ./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
}
}
post {