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/12/03 08:47:50 UTC
[camel] branch java-10-test updated (35d51dc -> 0e40e84)
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 35d51dc CAMEL-12618: add JAXB API and Glassfish JAXB im...
discard 1785c63 CAMEL-12618: Fix SimpleTest on Java 11+
discard 5c5ade9 CAMEL-12618: add Glassfish JAXB implementation ...
discard 1ef1a38 CAMEL-12618: upgrade MVEL version and use the r...
discard fb717e4 CAMEL-12618: add Glassfish JAXB implementation ...
discard ba133b2 CAMEL-12618: add Glassfish JAXB implementation ...
discard 3b6b948 CAMEL-12618: add Glassfish JAXB implementation ...
discard 22568df CAMEL-12618: add Glassfish JAXB implementation ...
discard 9ad940a CAMEL-12618: add Glassfish JAXB implementation ...
discard 204d633 CAMEL-12618: replace com.sun.xml.bind with org....
discard 3f14639 CAMEL-12618: Prevent Maven Shade plugin from ha...
discard 1233715 CAMEL-12618: Revert to Groovy 2.5.3
discard 34ea620 CAMEL-12618: Additional dependencies needed on ...
discard 6e41bb5 update velocity/pom.xml
discard 1a16370 Upgrade Scala to 2.12.7
discard 79d4c48 Upgrade Hibernate to 5.3.6.Final
discard 036b6df CAMEL-12618: upgrade Groovy Eclipse compiler
discard ee07015 CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
discard 8b49299 Temporary disable JDK 9 and karaf-itest and spr...
add aa1bd3e2 CAMEL-12926: fixed null pointer exceptions accessing swagger url in blueprint projects
add 5d8ac75 CAMEL-12932 - Camel-AHC-WS: Consumer parameters are not set
add 7ea92b4 CAMEL-12932 - Fixed CS
add 229d37d [IPFS] Add initial support for IPFS
add 16d6aeb CAMEL-12810 - Added explicit repository for Nessus and Spring Boot starter related
add 61517d6 CAMEL-12810 - Added camel-ipfs to kit
add f8b59a5 Regen
add 8e96df6 CAMEL-12810 - Fixed CS
add d0994de CAMEL-12810 - Added a note about the Karaf feature missing
add 047bf5c CAMEL-12810 - Changed the referenced repository for nessus deps
add 92cbacf CAMEL-12940: Fixed an issue where dynamic doneFileName does not manage filename with 2 dots
add e9eea21 Camel-Jbpm: Fixed CS
add 12113b8 Camel-Schematron: Fixed CS
add 0eb34c9 Refactor dopbox tests
add 81b5625 [CAMEL-12942] Fix dropbox put operation
add a954937 CAMEL-12865: camel-restdsl-swagger-plugin - Allow for specifying apiContextPath
add f3a1cb5 CAMEL-12869: ReplyTo destination must match endpoint type (topic or queue) that the message is sent on
add 9ee4dae CAMEL-12908: Add reproducer code
add fb9df2d CAMEL-12908: Cannot start route using rest dsl due to a mysterious duplicate route id
add 1a9b479 CAMEL-12908: Fix CS
add cb6e8c2 Upgrade Ehcache to version 3.6.2
add 732f55a CAMEL-12759 - Misleading documentation for Netty components - Netty4
add c065ce1 CAMEL-12759 - Misleading documentation for Netty components - Netty4-http
add c0ff444 CAMEL-12759 - Misleading documentation for Netty components - Netty
add 69f30d3 CAMEL-12759 - Misleading documentation for Netty components - Netty-http
add 16a7508 CAMEL-12631 - SFTP: Socket timeout overwrites Server Alive Interval
add 4856ecd CAMEL-12631 - Fixed CS
add ca6a1bf Upgrade TestContainers to version 1.10.1
add 4c55060 UPDATED RestBindingAdvice
add c704b6d Camel-Ipfs: Removed html folder from test resources
add ba41842 Camel-RestDsl-Swagger-plugin: Fixed CS
add e490135 Camel-Core: Fixed CS in RestBindingAdvice
add 7cd202e Revert "Camel-Ipfs: Removed html folder from test resources"
add ea00eec Upgrade Qpid JMS client to version 0.38.0
add c90c8d3 Upgrade Proton J to version 0.30.0
add 303c9b8 Upgrade Awaitility to version 3.1.3
add 1ee596d CAMEL-12774 - Error during type conversion from type: java.lang.String to the required type: org.elasticsearch.action.update.UpdateRequest - Take 2
add e665dad Upgrade Infinispan to version 9.4.2.Final
add bf2eb7b Add Camel-NSQ to apache-camel POM
add 613a0fd Added camel-ipfs to Apache-Camel POM
add 886995a Regen
add 9469254 Upgrade AWS Xray to version 2.1.0
add 5f4530c [CAMEL-12688] Fix generation and improve the generated code
add e3cd3dc CAMEL-12943: Rest DSL generates invalid swagger operation Id
add 9c67280 Fix typo.
add 44597eb Avoid constants in interfaces
add 81b4776 Remove gmail related naming from calendar component
add 9353638 Remove unused oauth scopes in google mail component
add 1540303 Use given exchange pattern when creating the exchange for incoming mail events
add d4427da Move integration Maven profile to camel-parent pom.xml in order to enable proper configuration propagation to submodules
add e21f9b4 Regen
add adae140 Refactor irc tests
add 8240ed3 CAMEL-12950: Add google-sheets component
add 7ac296b CAMEL-12950 - Fixed CS
add 2f4a334 CAMEL-12950 - Regen
add edfe92d Upgrade Reactor to version 3.2.3.RELEASE
add f0d6551 CAMEL-12950 - Added camel-google-sheets Spring Boot Integration test
add 43d7721 Upgrade Json Schema Validator to version 0.1.24
add f1ff22d Camel-NSQ: Fixed the NSQ component description and first version
add 46ff5c7 Regen
add 95ea9d3 Upgrade Owasp Dependency Check Maven Plugin to version 4.0.0
add e886f8c Upgrade Brave to version 5.5.1
add d6df2f6 Probably a typo, the builder was configured but always resetted by a new one (#2632)
add f9f170d upgrading johnzon to 1.1.10
add 7a1530a dropping asm to prepare coming spifly upgrade
add 6370c53 Updating CXF
add 07da9c3 Exclude data files of FHIR examples from license check
add 15a7de2 Add missing license information
add bed98e7 Ignore mvel file for license check
add 205570b Ignore KieServerExtension file in license check
add 742ca48 Fix license check excludes
add fa2ab61 Regen
add 8a1dcfb Added a Camel connector for R3's Corda blockchain platform using corda-rpc module
add 45f10a2 CAMEL-12952 Send pong frame as a response to ping frame
add 39e1076 CAMEL-12951 reconnect exception is passed to exception handler
add ba022b4 Camel-AHC WS - Fixed CS
add 562ab25 CAMEL-12958 - Wrong camel context bound in service registry of jbpm/Kie Server
add ccca4e4 Fix camel-corda stuff for kit
add bbe400f Set the secure processing feature on various DocumentBuilderFactory, TransformerFactory, SAXParserFactory instances
add 7bea194 Upgrade TestContainers to version 1.10.2
add f91591f Upgrade Mongodb Java Driver to version 3.9.1
add def6de9 [CAMEL-12605] Added support for compression
add 83e1a4a Added support for rabbitmq x-max-priority
add f804f31 Upgrade Braintree Java to version 2.88.0
add 284fbfe Change download previous file version endpoint (#2642)
add ec635ad Deprecate camel connectors
add 34513fe Deprecate camel connectors related in catalog
add 87b5015 CAMEL-12930 - Ability to execute DML statements in Google Bigquery component, thanks to Roman Lusnikov for the patch
add a8ce423 CAMEL-12930 - Fixed CS and sb starter
add 98c7873 CAMEL-12930 - Regen
add cc7307b Upgrade JackRabbit to version 2.17.7
add 14cfd87 Upgrade Pubnub version to version 4.21.0
add 05c14ba Update version to 2.24.0-SNAPSHOT
add 3c4ba2c Update connector to version 2.24.0-SNAPSHOT
add fb20823 Add version 2.23.0 to XML schema files
add e243bec Regen
add fc3c265 Upgrade Netty to version 4.1.32.Final
add 128f841 CAMEL-12964: Initial import of jBPM CamelWIH and Command.
add 89f1070 CamelCommand splitted in a separate command for Camel DeploymentContext and GlobalContext. WorkItemHandler can now be configured with default route. WIH supports both InOut and InOnly MEPs. Added tests that use a test CamelContext and test-routes to verify behaviour on Exceptions.
add 8672088 Replaced hard-coded strings with constants. Changed WorkItem parameter names to be inline with other WorkItemHandlers.
add 60010cd Removed TODO comments.
add 9201574 CAMEL-12964: Fix CS
add 6c40047 Upgrade Rabbitmq client to version 5.5.1
add 1328be8 [CAMEL-12605] Refactoring for compression support.
add 32a3620 CAMEL-12967 - Adding new option to split value ranges to a stream of rows each represented in a separate exchange
add 56887a0 CAMEL-12967 - Fixed CS
add 09a5710 Upgrade PAX Exam to version 4.13.0
add 5a3eaf1 Regen
add f7a5c43 [CAMEL-12605] Added tests and fixes for compression
add 35c857d Typo
add 530cc4c Polished
add 48465fd Typos
new f97f07b Temporary disable JDK 9 and karaf-itest and spr...
new de585df CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
new 79dfaa2 CAMEL-12618: upgrade Groovy Eclipse compiler
new 1e67557 Upgrade Hibernate to 5.3.6.Final
new 045f9e2 Upgrade Scala to 2.12.7
new 7e31e2e update velocity/pom.xml
new 224298f CAMEL-12618: Additional dependencies needed on ...
new 706b122 CAMEL-12618: Revert to Groovy 2.5.3
new 50fc61c CAMEL-12618: Prevent Maven Shade plugin from ha...
new e6c3564 CAMEL-12618: replace com.sun.xml.bind with org....
new 15dd5ff CAMEL-12618: add Glassfish JAXB implementation ...
new f24b5d1 CAMEL-12618: add Glassfish JAXB implementation ...
new e9ce404 CAMEL-12618: add Glassfish JAXB implementation ...
new 171ee2c CAMEL-12618: add Glassfish JAXB implementation ...
new d58bedb CAMEL-12618: add Glassfish JAXB implementation ...
new 1b102ea CAMEL-12618: upgrade MVEL version and use the r...
new b901574 CAMEL-12618: add Glassfish JAXB implementation ...
new 70f26d3 CAMEL-12618: Fix SimpleTest on Java 11+
new 0e40e84 CAMEL-12618: add JAXB API and Glassfish JAXB im...
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 (35d51dc)
\
N -- N -- N refs/heads/java-10-test (0e40e84)
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 19 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:
apache-camel/pom.xml | 40 +-
apache-camel/src/main/descriptors/common-bin.xml | 8 +-
archetypes/camel-archetype-activemq/pom.xml | 2 +-
archetypes/camel-archetype-api-component/pom.xml | 2 +-
archetypes/camel-archetype-blueprint/pom.xml | 2 +-
archetypes/camel-archetype-cdi/pom.xml | 2 +-
archetypes/camel-archetype-component/pom.xml | 2 +-
archetypes/camel-archetype-connector/pom.xml | 4 +-
archetypes/camel-archetype-dataformat/pom.xml | 2 +-
archetypes/camel-archetype-groovy/pom.xml | 2 +-
archetypes/camel-archetype-java/pom.xml | 2 +-
archetypes/camel-archetype-java8/pom.xml | 2 +-
archetypes/camel-archetype-scala/pom.xml | 2 +-
archetypes/camel-archetype-scr/pom.xml | 2 +-
archetypes/camel-archetype-spring-boot/pom.xml | 2 +-
archetypes/camel-archetype-spring/pom.xml | 2 +-
archetypes/camel-archetype-web/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
bom/camel-bom/pom.xml | 32 +-
bom/pom.xml | 2 +-
buildingtools/pom.xml | 2 +-
camel-core/pom.xml | 2 +-
.../camel/component/file/GenericFileEndpoint.java | 4 +-
.../apache/camel/converter/jaxp/XmlConverter.java | 8 +
.../management/mbean/RouteCoverageXmlParser.java | 5 +-
.../apache/camel/model/RouteDefinitionHelper.java | 60 ++-
.../apache/camel/model/rest/RestDefinition.java | 27 +-
.../apache/camel/model/rest/VerbDefinition.java | 2 +-
.../apache/camel/processor/RestBindingAdvice.java | 14 +-
.../org/apache/camel/util/XmlLineNumberParser.java | 3 +
...eConsumeDynamicDoneFileNameWithTwoDotsTest.java | 68 +++
...meSimpleDynamicDoneFileNameWithTwoDotsTest.java | 68 +++
.../camel/impl/RouteIdRestDefinitionTest.java | 52 +++
components/camel-ahc-ws/pom.xml | 2 +-
.../apache/camel/component/ahc/ws/WsEndpoint.java | 13 +-
components/camel-ahc/pom.xml | 2 +-
components/camel-amqp/pom.xml | 2 +-
components/camel-apns/pom.xml | 2 +-
components/camel-as2/camel-as2-api/pom.xml | 2 +-
.../camel/component/as2/api/AS2ClientManager.java | 122 ++++-
.../as2/api/AS2CompressionAlgorithm.java} | 36 +-
.../camel/component/as2/api/AS2MediaType.java | 8 +-
.../component/as2/api/AS2MessageStructure.java | 10 +-
... ApplicationPkcs7MimeCompressedDataEntity.java} | 57 ++-
...> ApplicationPkcs7MimeEnvelopedDataEntity.java} | 13 +-
.../component/as2/api/entity/EntityParser.java | 139 ++++--
.../component/as2/api/util/CompressionUtils.java} | 25 +-
.../camel/component/as2/api/AS2MessageTest.java | 236 +++++++++-
.../as2/api/entity/CompressedEntityTest.java | 89 ++++
.../component/as2/api/entity/EntityParserTest.java | 2 +-
components/camel-as2/camel-as2-component/pom.xml | 2 +-
.../src/main/docs/as2-component.adoc | 6 +-
.../camel/component/as2/AS2Configuration.java | 17 +-
.../as2/AS2ClientManagerIntegrationTest.java | 6 +-
.../as2/AS2ServerManagerIntegrationTest.java | 4 +-
components/camel-as2/pom.xml | 2 +-
components/camel-asn1/pom.xml | 2 +-
components/camel-asterisk/pom.xml | 2 +-
components/camel-atmos/pom.xml | 2 +-
components/camel-atmosphere-websocket/pom.xml | 2 +-
components/camel-atom/pom.xml | 2 +-
components/camel-atomix/pom.xml | 2 +-
components/camel-avro/pom.xml | 2 +-
components/camel-aws-xray/pom.xml | 2 +-
components/camel-aws/pom.xml | 2 +-
.../camel-aws/src/main/docs/aws-sqs-component.adoc | 3 +-
components/camel-azure/pom.xml | 2 +-
components/camel-bam/pom.xml | 2 +-
components/camel-barcode/pom.xml | 2 +-
components/camel-base64/pom.xml | 2 +-
components/camel-bean-validator/pom.xml | 2 +-
components/camel-beanio/pom.xml | 2 +-
components/camel-beanstalk/pom.xml | 2 +-
components/camel-bindy/pom.xml | 2 +-
components/camel-blueprint/pom.xml | 2 +-
components/camel-bonita/pom.xml | 2 +-
components/camel-boon/pom.xml | 2 +-
components/camel-box/camel-box-api/pom.xml | 2 +-
components/camel-box/camel-box-component/pom.xml | 2 +-
.../src/main/docs/box-component.adoc | 2 +-
components/camel-box/pom.xml | 2 +-
components/camel-braintree/pom.xml | 2 +-
components/camel-cache/pom.xml | 2 +-
components/camel-caffeine/pom.xml | 2 +-
components/camel-cassandraql/pom.xml | 2 +-
components/camel-castor/pom.xml | 2 +-
components/camel-cdi/pom.xml | 2 +-
components/camel-chronicle/pom.xml | 2 +-
components/camel-chunk/pom.xml | 2 +-
components/camel-cm-sms/pom.xml | 2 +-
.../camel/component/cm/CMSenderOneMessageImpl.java | 6 +-
components/camel-cmis/pom.xml | 2 +-
components/camel-coap/pom.xml | 2 +-
components/camel-cometd/pom.xml | 2 +-
components/camel-consul/pom.xml | 2 +-
components/camel-context/pom.xml | 2 +-
components/camel-corda/.gitignore | 6 +
components/camel-corda/README.md | 3 +
components/{camel-snmp => camel-corda}/pom.xml | 43 +-
.../camel-corda/src/main/docs/corda-component.adoc | 139 ++++++
.../camel/component/corda/CordaComponent.java | 54 +++
.../camel/component/corda/CordaConfiguration.java | 168 +++++++
.../camel/component/corda/CordaConstants.java | 69 +++
.../camel/component/corda/CordaConsumer.java | 267 +++++++++++
.../camel/component/corda/CordaEndpoint.java | 101 +++++
.../camel/component/corda/CordaProducer.java | 240 ++++++++++
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../services/org/apache/camel/component/corda | 18 +
.../apache/camel/component/corda/CamelFlow.java | 16 +-
.../corda/CordaConsumerNetworkMapFeedTest.java} | 35 +-
.../CordaConsumerStartTrackedFlowDynamicTest.java} | 41 +-
.../corda/CordaConsumerStateMachineFeedTest.java} | 35 +-
.../component/corda/CordaConsumerTestSupport.java | 62 +++
.../CordaConsumerTransactionMapFeedTest.java} | 35 +-
.../CordaConsumerVaultTrackByCriteriaTest.java} | 37 +-
.../corda/CordaConsumerVaultTrackByTest.java} | 40 +-
...rdaConsumerVaultTrackByWithPagingSpecTest.java} | 39 +-
.../CordaConsumerVaultTrackByWithSortingTest.java} | 38 +-
.../corda/CordaConsumerVaultTrackTest.java} | 35 +-
.../camel/component/corda/CordaProducerTest.java | 498 +++++++++++++++++++++
.../camel/component/corda/CordaTestSupport.java | 74 +++
.../component/corda/IntegrationWhiteList.java} | 24 +-
...corda.core.serialization.SerializationWhitelist | 1 +
.../src/test/resources/log4j2.properties | 19 +-
.../org.mockito.plugins.MockMaker | 0
components/camel-core-osgi/pom.xml | 2 +-
components/camel-core-xml/pom.xml | 2 +-
components/camel-couchbase/pom.xml | 2 +-
components/camel-couchdb/pom.xml | 2 +-
components/camel-crypto-cms/pom.xml | 2 +-
components/camel-crypto/pom.xml | 2 +-
components/camel-csv/pom.xml | 2 +-
components/camel-cxf-transport/pom.xml | 2 +-
components/camel-cxf/pom.xml | 2 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
components/camel-digitalocean/pom.xml | 2 +-
components/camel-disruptor/pom.xml | 2 +-
components/camel-dns/pom.xml | 2 +-
components/camel-docker/pom.xml | 2 +-
components/camel-dozer/pom.xml | 2 +-
components/camel-drill/pom.xml | 2 +-
components/camel-dropbox/pom.xml | 34 +-
.../component/dropbox/core/DropboxAPIFacade.java | 24 +-
.../component/dropbox/DropboxConsumerTest.java | 16 +-
.../dropbox/integration/DropboxTestSupport.java | 66 ++-
.../consumer/DropboxConsumerGetSingleTest.java | 25 +-
.../consumer/DropboxConsumerSearchQueryTest.java | 23 +-
.../producer/DropboxProducerDelTest.java | 54 +--
.../producer/DropboxProducerGetFolderTest.java | 106 ++---
.../producer/DropboxProducerGetSingleTest.java | 61 +--
.../producer/DropboxProducerMoveTest.java | 59 +--
.../producer/DropboxProducerPutSingleFileTest.java | 99 ++--
...boxProducerPutSingleFileWithRemotePathTest.java | 96 ----
.../DropboxProducerPutWithRemotePathTest.java | 95 ----
.../producer/DropboxProducerSearchQueryTest.java | 66 +--
.../producer/DropboxProducerSearchTest.java | 92 ----
.../src/test/resources/test-options.properties | 3 +-
components/camel-eclipse/pom.xml | 2 +-
components/camel-ehcache/pom.xml | 2 +-
components/camel-ejb/pom.xml | 2 +-
components/camel-elasticsearch-rest/pom.xml | 2 +-
.../ElasticsearchActionRequestConverter.java | 2 +-
...asticsearchGetSearchDeleteExistsUpdateTest.java | 6 +-
components/camel-elasticsearch/pom.xml | 2 +-
components/camel-elasticsearch5/pom.xml | 2 +-
components/camel-elsql/pom.xml | 2 +-
components/camel-etcd/pom.xml | 2 +-
components/camel-eventadmin/pom.xml | 2 +-
components/camel-exec/pom.xml | 2 +-
components/camel-facebook/pom.xml | 2 +-
components/camel-fastjson/pom.xml | 2 +-
components/camel-fhir/camel-fhir-api/pom.xml | 2 +-
components/camel-fhir/camel-fhir-component/pom.xml | 2 +-
components/camel-fhir/pom.xml | 2 +-
components/camel-flatpack/pom.xml | 2 +-
.../component/flatpack/FlatpackConverter.java | 5 +-
components/camel-flink/pom.xml | 2 +-
components/camel-fop/pom.xml | 2 +-
.../apache/camel/component/fop/FopProducer.java | 7 +-
components/camel-freemarker/pom.xml | 2 +-
components/camel-ftp/pom.xml | 2 +-
.../component/file/remote/SftpOperations.java | 118 +++--
components/camel-ganglia/pom.xml | 2 +-
components/camel-geocoder/pom.xml | 2 +-
components/camel-git/pom.xml | 2 +-
components/camel-github/pom.xml | 2 +-
components/camel-google-bigquery/pom.xml | 2 +-
.../main/docs/google-bigquery-sql-component.adoc | 151 +++++++
.../google/bigquery/GoogleBigQueryConstants.java | 18 +-
.../bigquery/sql/GoogleBigQuerySQLComponent.java | 82 ++++
.../sql/GoogleBigQuerySQLConfiguration.java | 77 ++++
.../bigquery/sql/GoogleBigQuerySQLEndpoint.java | 78 ++++
.../bigquery/sql/GoogleBigQuerySQLProducer.java | 160 +++++++
.../component/google/bigquery/sql/SqlHelper.java | 101 +++++
.../apache/camel/component/google-bigquery-sql} | 9 +-
.../integration/sql/SqlQueryFromResourceTest.java | 85 ++++
.../bigquery/integration/sql/SqlQueryTest.java | 85 ++++
.../unit/sql/GoogleBigQuerySQLComponentTest.java | 49 ++
.../sql/GoogleBigQuerySQLProducerBaseTest.java | 59 +++
.../GoogleBigQuerySQLProducerWithParamersTest.java | 91 ++++
.../GoogleBigQuerySQLProducerWithPatternTest.java | 69 +++
.../google/bigquery/unit/sql/SqlHelperTest.java | 98 ++++
.../src/test/resources/sql/delete.sql | 1 +
.../src/test/resources/sql/insert.sql | 2 +
components/camel-google-calendar/pom.xml | 2 +-
.../docs/google-calendar-stream-component.adoc | 24 +-
.../calendar/internal/GoogleCalendarConstants.java | 13 +-
.../stream/GoogleCalendarStreamComponent.java | 9 +-
.../stream/GoogleCalendarStreamConfiguration.java | 21 +-
.../stream/GoogleCalendarStreamConstants.java | 16 +-
.../stream/GoogleCalendarStreamEndpoint.java | 23 +-
.../AbstractGoogleCalendarStreamTestSupport.java | 6 +-
components/camel-google-drive/pom.xml | 2 +-
.../drive/internal/GoogleDriveConstants.java | 13 +-
components/camel-google-mail/pom.xml | 2 +-
.../main/docs/google-mail-stream-component.adoc | 10 +-
.../google/mail/internal/GoogleMailConstants.java | 13 +-
.../mail/stream/GoogleMailStreamConfiguration.java | 23 -
.../mail/stream/GoogleMailStreamConstants.java | 21 +-
.../mail/stream/GoogleMailStreamEndpoint.java | 22 +-
components/camel-google-pubsub/pom.xml | 2 +-
.../pom.xml | 122 ++---
.../src/main/docs/google-sheets-component.adoc | 180 ++++++++
.../main/docs/google-sheets-stream-component.adoc} | 98 ++--
.../sheets/BatchGoogleSheetsClientFactory.java | 66 +++
.../google/sheets/GoogleSheetsClientFactory.java | 9 +-
.../google/sheets/GoogleSheetsComponent.java | 102 +++++
.../google/sheets/GoogleSheetsConfiguration.java | 130 ++++++
.../google/sheets/GoogleSheetsConsumer.java | 54 +++
.../google/sheets/GoogleSheetsEndpoint.java | 109 +++++
.../google/sheets/GoogleSheetsProducer.java | 54 +++
.../sheets/GoogleSheetsVerifierExtension.java | 77 ++++
.../sheets/internal/GoogleSheetsConstants.java} | 16 +-
.../internal/GoogleSheetsPropertiesHelper.java} | 32 +-
.../sheets/stream/GoogleSheetsStreamComponent.java | 98 ++++
.../stream/GoogleSheetsStreamConfiguration.java | 273 +++++++++++
.../stream/GoogleSheetsStreamConstants.java} | 36 +-
.../sheets/stream/GoogleSheetsStreamConsumer.java | 135 ++++++
.../sheets/stream/GoogleSheetsStreamEndpoint.java | 118 +++++
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../org/apache/camel/component/google-sheets | 17 +
.../apache/camel/component/google-sheets-stream | 17 +
.../sheets/AbstractGoogleSheetsTestSupport.java | 164 +++++++
.../sheets/GoogleSheetsVerifierExtensionTest.java | 68 +++
.../google/sheets/SheetsConfigurationTest.java | 64 +++
.../sheets/SheetsSpreadsheetsIntegrationTest.java | 120 +++++
.../SheetsSpreadsheetsValuesIntegrationTest.java | 169 +++++++
.../AbstractGoogleSheetsStreamTestSupport.java | 44 ++
.../SheetsStreamConsumerIntegrationTest.java | 123 +++++
.../src/test/resources/log4j2.properties} | 13 +-
.../src/test/resources/test-options.properties | 11 +-
components/camel-gora/pom.xml | 2 +-
components/camel-grape/pom.xml | 2 +-
components/camel-groovy-dsl/pom.xml | 2 +-
components/camel-groovy/pom.xml | 2 +-
components/camel-grpc/pom.xml | 2 +-
components/camel-gson/pom.xml | 2 +-
components/camel-guava-eventbus/pom.xml | 2 +-
components/camel-guice/pom.xml | 2 +-
components/camel-hawtdb/pom.xml | 2 +-
components/camel-hazelcast/pom.xml | 2 +-
components/camel-hbase/pom.xml | 2 +-
components/camel-hdfs/pom.xml | 2 +-
components/camel-hdfs2/pom.xml | 2 +-
components/camel-headersmap/pom.xml | 2 +-
components/camel-hessian/pom.xml | 2 +-
components/camel-hipchat/pom.xml | 2 +-
components/camel-hl7/pom.xml | 2 +-
components/camel-http-common/pom.xml | 2 +-
components/camel-http/pom.xml | 2 +-
components/camel-http4/pom.xml | 2 +-
components/camel-hystrix/pom.xml | 2 +-
components/camel-ibatis/pom.xml | 2 +-
components/camel-ical/pom.xml | 2 +-
components/camel-iec60870/pom.xml | 2 +-
components/camel-ignite/pom.xml | 2 +-
components/camel-infinispan/pom.xml | 2 +-
components/camel-influxdb/pom.xml | 2 +-
components/{camel-rmi => camel-ipfs}/pom.xml | 48 +-
.../camel-ipfs/src/main/docs/ipfs-component.adoc | 96 ++++
.../apache/camel/component/ipfs/IPFSComponent.java | 68 +++
.../camel/component/ipfs/IPFSConfiguration.java | 79 ++++
.../apache/camel/component/ipfs/IPFSEndpoint.java | 108 +++++
.../apache/camel/component/ipfs/IPFSProducer.java | 92 ++++
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../services/org/apache/camel/component/ipfs | 18 +
.../camel/component/ipfs/SimpleIPFSTest.java | 213 +++++++++
.../src/test/resources/html/chap/ch01.html | 13 +
.../src/test/resources/html/css/default.css | 38 ++
.../src/test/resources/html/etc/userfile.txt | 1 +
.../src/test/resources/html/img/logo.png | Bin 0 -> 6715 bytes
.../camel-ipfs/src/test/resources/html/index.html | 13 +
.../src/test/resources/log4j2.properties | 15 +-
components/camel-irc/pom.xml | 39 +-
.../irc/it/IrcIntegrationTestSupport.java | 68 +++
.../irc/{ => it}/IrcMultiChannelRouteTest.java | 63 ++-
.../component/irc/{ => it}/IrcOnReplyTest.java | 18 +-
.../component/irc/{ => it}/IrcPrivmsgTest.java | 27 +-
.../camel/component/irc/{ => it}/IrcRouteTest.java | 34 +-
.../IrcsListUsersTest.java} | 32 +-
.../camel/component/irc/it/IrcsRouteTest.java | 15 +-
.../IrcsWithSslContextParamsRouteTest.java | 2 +-
.../src/test/resources/it-tests.properties | 11 +-
components/camel-ironmq/pom.xml | 2 +-
components/camel-jackson/pom.xml | 2 +-
components/camel-jacksonxml/pom.xml | 2 +-
components/camel-jasypt/pom.xml | 2 +-
components/camel-javaspace/pom.xml | 2 +-
components/camel-jaxb/pom.xml | 2 +-
components/camel-jbpm/pom.xml | 29 +-
.../camel/component/jbpm/JBPMConfiguration.java | 28 +-
.../apache/camel/component/jbpm/JBPMConstants.java | 8 +
.../apache/camel/component/jbpm/JBPMEndpoint.java | 12 +-
.../apache/camel/component/jbpm/JBPMProducer.java | 148 +++---
.../jbpm/server/CamelKieServerExtension.java | 95 ++--
.../jbpm/workitem/AbstractCamelCommand.java | 81 ++++
.../workitem/AbstractCamelWorkItemHandler.java | 152 +++++++
.../workitem/DeploymentContextCamelCommand.java | 71 +++
.../jbpm/workitem/GlobalContextCamelCommand.java | 56 +++
.../jbpm/workitem/InOnlyCamelWorkItemHandler.java | 106 +++++
.../jbpm/workitem/InOutCamelWorkItemHandler.java | 116 +++++
.../jbpm/JBPMComponentIntegrationTest.java | 42 +-
.../CamelWorkItemHandlerIntegrationTests.java | 204 +++++++++
.../DeploymentContextCamelCommandTest.java | 95 ++++
.../workitem/GlobalContextCamelCommandTest.java | 95 ++++
.../workitem/InOnlyCamelWorkItemHandlerTest.java | 97 ++++
.../workitem/InOutCamelWorkItemHandlerTest.java | 148 ++++++
components/camel-jcache/pom.xml | 2 +-
components/camel-jclouds/pom.xml | 2 +-
components/camel-jcr/pom.xml | 2 +-
components/camel-jdbc/pom.xml | 2 +-
components/camel-jetty-common/pom.xml | 2 +-
components/camel-jetty/pom.xml | 2 +-
components/camel-jetty9/pom.xml | 2 +-
components/camel-jgroups/pom.xml | 2 +-
components/camel-jibx/pom.xml | 2 +-
components/camel-jing/pom.xml | 2 +-
components/camel-jira/pom.xml | 2 +-
components/camel-jms/pom.xml | 2 +-
components/camel-jmx/pom.xml | 2 +-
components/camel-johnzon/pom.xml | 2 +-
.../camel/component/johnzon/JohnzonDataFormat.java | 2 +-
components/camel-jolt/pom.xml | 2 +-
components/camel-josql/pom.xml | 2 +-
components/camel-jpa/pom.xml | 2 +-
components/camel-jsch/pom.xml | 2 +-
components/camel-json-validator/pom.xml | 2 +-
components/camel-jsonpath/pom.xml | 2 +-
components/camel-jt400/pom.xml | 2 +-
components/camel-juel/pom.xml | 2 +-
components/camel-jxpath/pom.xml | 2 +-
components/camel-kafka/pom.xml | 2 +-
components/camel-kestrel/pom.xml | 2 +-
components/camel-krati/pom.xml | 2 +-
components/camel-kubernetes/pom.xml | 2 +-
components/camel-kura/pom.xml | 2 +-
components/camel-ldap/pom.xml | 2 +-
components/camel-ldif/pom.xml | 2 +-
components/camel-leveldb/pom.xml | 2 +-
.../camel-linkedin/camel-linkedin-api/pom.xml | 2 +-
.../camel-linkedin-component/pom.xml | 2 +-
components/camel-linkedin/pom.xml | 2 +-
components/camel-lra/pom.xml | 2 +-
components/camel-lucene/pom.xml | 2 +-
components/camel-lumberjack/pom.xml | 2 +-
components/camel-lzf/pom.xml | 2 +-
components/camel-mail/pom.xml | 2 +-
components/camel-master/pom.xml | 2 +-
components/camel-metrics/pom.xml | 2 +-
components/camel-micrometer/pom.xml | 2 +-
components/camel-milo/pom.xml | 2 +-
components/camel-mina/pom.xml | 2 +-
components/camel-mina2/pom.xml | 2 +-
components/camel-mllp/pom.xml | 2 +-
components/camel-mongodb-gridfs/pom.xml | 2 +-
components/camel-mongodb/pom.xml | 2 +-
components/camel-mongodb3/pom.xml | 2 +-
components/camel-mqtt/pom.xml | 2 +-
components/camel-msv/pom.xml | 2 +-
components/camel-mustache/pom.xml | 2 +-
components/camel-mvel/pom.xml | 2 +-
components/camel-mybatis/pom.xml | 2 +-
components/camel-nagios/pom.xml | 2 +-
components/camel-nats/pom.xml | 2 +-
components/camel-netty-http/pom.xml | 2 +-
.../src/main/docs/netty-http-component.adoc | 4 +-
components/camel-netty/pom.xml | 2 +-
.../camel-netty/src/main/docs/netty-component.adoc | 18 +-
components/camel-netty4-http/pom.xml | 2 +-
.../src/main/docs/netty4-http-component.adoc | 4 +-
components/camel-netty4/pom.xml | 2 +-
.../src/main/docs/netty4-component.adoc | 26 +-
components/camel-nsq/pom.xml | 20 +-
.../camel-nsq/src/main/docs/nsq-component.adoc | 14 +-
.../apache/camel/component/nsq/NsqEndpoint.java | 2 +-
components/camel-ognl/pom.xml | 2 +-
components/camel-olingo2/camel-olingo2-api/pom.xml | 2 +-
.../camel-olingo2/camel-olingo2-component/pom.xml | 2 +-
components/camel-olingo2/pom.xml | 2 +-
components/camel-olingo4/camel-olingo4-api/pom.xml | 2 +-
.../camel-olingo4/camel-olingo4-component/pom.xml | 2 +-
components/camel-olingo4/pom.xml | 2 +-
components/camel-openshift/pom.xml | 2 +-
components/camel-openstack/pom.xml | 2 +-
components/camel-opentracing/pom.xml | 2 +-
components/camel-optaplanner/pom.xml | 2 +-
components/camel-paho/pom.xml | 2 +-
components/camel-paxlogging/pom.xml | 2 +-
components/camel-pdf/pom.xml | 2 +-
components/camel-pgevent/pom.xml | 2 +-
components/camel-printer/pom.xml | 2 +-
components/camel-protobuf/pom.xml | 2 +-
components/camel-pubnub/pom.xml | 2 +-
components/camel-quartz/pom.xml | 2 +-
components/camel-quartz2/pom.xml | 2 +-
components/camel-quickfix/pom.xml | 2 +-
components/camel-rabbitmq/pom.xml | 2 +-
.../component/rabbitmq/RabbitMQConstants.java | 1 +
.../component/rabbitmq/RabbitMQDeclareSupport.java | 5 +
components/camel-reactive-streams/pom.xml | 2 +-
components/camel-reactor/pom.xml | 2 +-
components/camel-rest-swagger/pom.xml | 2 +-
components/camel-restlet/pom.xml | 2 +-
components/camel-ribbon/pom.xml | 2 +-
components/camel-rmi/pom.xml | 2 +-
components/camel-routebox/pom.xml | 2 +-
components/camel-rss/pom.xml | 2 +-
components/camel-ruby/pom.xml | 2 +-
components/camel-rx/pom.xml | 2 +-
components/camel-rxjava2/pom.xml | 2 +-
.../camel-salesforce-component/pom.xml | 2 +-
.../camel-salesforce-maven-plugin/pom.xml | 2 +-
components/camel-salesforce/pom.xml | 2 +-
components/camel-sap-netweaver/pom.xml | 2 +-
components/camel-saxon/pom.xml | 2 +-
components/camel-scala/pom.xml | 2 +-
components/camel-schematron/pom.xml | 2 +-
.../component/schematron/SchematronProducer.java | 14 +-
.../processor/SchematronProcessorFactory.java | 2 +
.../schematron/SchematronProducerTest.java | 13 +-
components/camel-scr/pom.xml | 2 +-
components/camel-script/pom.xml | 2 +-
components/camel-service/pom.xml | 2 +-
.../camel-servicenow-component/pom.xml | 2 +-
.../camel-servicenow-maven-plugin/pom.xml | 2 +-
components/camel-servicenow/pom.xml | 2 +-
components/camel-servlet/pom.xml | 2 +-
components/camel-servletlistener/pom.xml | 2 +-
components/camel-shiro/pom.xml | 2 +-
components/camel-sip/pom.xml | 2 +-
components/camel-sjms/pom.xml | 2 +-
.../camel-sjms/src/main/docs/sjms-component.adoc | 2 +-
.../apache/camel/component/sjms/SjmsEndpoint.java | 2 +
.../component/sjms/jms/DestinationNameParser.java | 13 +
.../component/sjms/producer/InOutProducer.java | 11 +-
components/camel-sjms2/pom.xml | 2 +-
components/camel-slack/pom.xml | 2 +-
components/camel-smpp/pom.xml | 2 +-
components/camel-snakeyaml/pom.xml | 2 +-
components/camel-snmp/pom.xml | 2 +-
components/camel-soap/pom.xml | 2 +-
components/camel-solr/pom.xml | 2 +-
components/camel-spark-rest/pom.xml | 2 +-
components/camel-spark/pom.xml | 2 +-
components/camel-splunk/pom.xml | 2 +-
components/camel-spring-batch/pom.xml | 2 +-
components/camel-spring-boot/pom.xml | 2 +-
components/camel-spring-cloud-consul/pom.xml | 2 +-
components/camel-spring-cloud-netflix/pom.xml | 2 +-
components/camel-spring-cloud-zookeeper/pom.xml | 2 +-
components/camel-spring-cloud/pom.xml | 2 +-
components/camel-spring-integration/pom.xml | 2 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
components/camel-spring-javaconfig/pom.xml | 2 +-
components/camel-spring-ldap/pom.xml | 2 +-
components/camel-spring-redis/pom.xml | 2 +-
components/camel-spring-security/pom.xml | 2 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
components/camel-spring-ws/pom.xml | 2 +-
.../spring/ws/bean/CamelEndpointMapping.java | 2 +
.../impl/HeaderTransformationMessageFilter.java | 10 +-
components/camel-spring/pom.xml | 2 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
.../apache/camel/component/rest/RestRefTest.xml | 2 +-
components/camel-sql/pom.xml | 2 +-
components/camel-ssh/pom.xml | 2 +-
components/camel-stax/pom.xml | 2 +-
components/camel-stomp/pom.xml | 2 +-
components/camel-stream/pom.xml | 2 +-
components/camel-stringtemplate/pom.xml | 2 +-
components/camel-swagger-java/pom.xml | 2 +-
.../apache/camel/swagger/RestSwaggerSupport.java | 3 +-
...RestSwaggerReaderEnableVendorExtensionTest.java | 2 +-
components/camel-swagger/pom.xml | 2 +-
components/camel-syslog/pom.xml | 2 +-
components/camel-tagsoup/pom.xml | 2 +-
.../dataformat/tagsoup/TidyMarkupDataFormat.java | 5 +-
components/camel-tarfile/pom.xml | 2 +-
components/camel-telegram/pom.xml | 2 +-
components/camel-test-blueprint/pom.xml | 2 +-
components/camel-test-cdi/pom.xml | 2 +-
components/camel-test-karaf/pom.xml | 2 +-
components/camel-test-spring/pom.xml | 2 +-
components/camel-test/pom.xml | 2 +-
components/camel-testcontainers-spring/pom.xml | 2 +-
components/camel-testcontainers/pom.xml | 2 +-
components/camel-testng/pom.xml | 2 +-
components/camel-thrift/pom.xml | 2 +-
components/camel-tika/pom.xml | 2 +-
.../apache/camel/component/tika/TikaProducer.java | 2 +
components/camel-twilio/pom.xml | 2 +-
components/camel-twitter/pom.xml | 2 +-
components/camel-undertow/pom.xml | 2 +-
components/camel-univocity-parsers/pom.xml | 2 +-
components/camel-urlrewrite/pom.xml | 2 +-
components/camel-velocity/pom.xml | 2 +-
components/camel-vertx/pom.xml | 2 +-
components/camel-weather/pom.xml | 2 +-
components/camel-web3j/pom.xml | 2 +-
components/camel-websocket/pom.xml | 2 +-
components/camel-wordpress/pom.xml | 2 +-
components/camel-xchange/pom.xml | 2 +-
components/camel-xmlbeans/pom.xml | 2 +-
components/camel-xmljson/pom.xml | 2 +-
components/camel-xmlrpc/pom.xml | 2 +-
components/camel-xmlsecurity/pom.xml | 2 +-
components/camel-xmpp/pom.xml | 2 +-
components/camel-xstream/pom.xml | 2 +-
components/camel-yammer/pom.xml | 2 +-
components/camel-yql/pom.xml | 2 +-
components/camel-zendesk/pom.xml | 2 +-
components/camel-zipfile/pom.xml | 2 +-
components/camel-zipkin/pom.xml | 2 +-
components/camel-zookeeper-master/pom.xml | 2 +-
components/camel-zookeeper/pom.xml | 2 +-
components/pom.xml | 7 +-
components/readme.adoc | 23 +-
connectors/camel-connector-maven-plugin/pom.xml | 4 +-
connectors/camel-connector/pom.xml | 4 +-
connectors/examples/pom.xml | 2 +-
connectors/pom.xml | 4 +-
docs/pom.xml | 2 +-
docs/user-manual/en/SUMMARY.md | 7 +-
etc/pom.xml | 2 +-
examples/camel-example-activemq-tomcat/pom.xml | 2 +-
examples/camel-example-aggregate/pom.xml | 2 +-
.../camel-example-artemis-amqp-blueprint/pom.xml | 2 +-
.../camel-example-artemis-large-messages/pom.xml | 2 +-
examples/camel-example-bam/pom.xml | 2 +-
examples/camel-example-cafe/pom.xml | 2 +-
.../camel-example-cassandra-kubernetes/pom.xml | 2 +-
examples/camel-example-cdi-aws-s3/pom.xml | 2 +-
examples/camel-example-cdi-cassandraql/pom.xml | 2 +-
examples/camel-example-cdi-kubernetes/pom.xml | 2 +-
examples/camel-example-cdi-metrics/pom.xml | 2 +-
examples/camel-example-cdi-osgi/pom.xml | 2 +-
examples/camel-example-cdi-properties/pom.xml | 2 +-
examples/camel-example-cdi-rest-servlet/pom.xml | 2 +-
examples/camel-example-cdi-test/pom.xml | 2 +-
examples/camel-example-cdi-xml/pom.xml | 2 +-
examples/camel-example-cdi/pom.xml | 2 +-
examples/camel-example-console/pom.xml | 2 +-
examples/camel-example-cxf-blueprint/pom.xml | 2 +-
examples/camel-example-cxf-proxy/pom.xml | 2 +-
examples/camel-example-cxf-tomcat/pom.xml | 2 +-
examples/camel-example-cxf/pom.xml | 2 +-
examples/camel-example-ehcache-blueprint/pom.xml | 2 +-
.../camel-example-fhir-auth-tx-spring-boot/pom.xml | 2 +-
examples/camel-example-fhir-osgi/pom.xml | 2 +-
examples/camel-example-fhir-spring-boot/pom.xml | 2 +-
examples/camel-example-fhir/pom.xml | 2 +-
examples/camel-example-ftp/pom.xml | 2 +-
examples/camel-example-google-pubsub/pom.xml | 2 +-
examples/camel-example-groovy/pom.xml | 2 +-
.../hello-camel-grpc-client-kubernetes/pom.xml | 2 +-
.../hello-camel-grpc-server-kubernetes/pom.xml | 2 +-
examples/camel-example-grpc-kubernetes/pom.xml | 2 +-
examples/camel-example-guice-jms/pom.xml | 2 +-
.../camel-example-hazelcast-kubernetes/pom.xml | 2 +-
examples/camel-example-hystrix/client/pom.xml | 2 +-
examples/camel-example-hystrix/pom.xml | 2 +-
examples/camel-example-hystrix/service1/pom.xml | 2 +-
examples/camel-example-hystrix/service2/pom.xml | 2 +-
examples/camel-example-java8-rx/pom.xml | 2 +-
examples/camel-example-java8/pom.xml | 2 +-
examples/camel-example-jdbc/pom.xml | 2 +-
examples/camel-example-jms-file/pom.xml | 2 +-
examples/camel-example-jmx/pom.xml | 2 +-
examples/camel-example-kafka/README.adoc | 2 +-
examples/camel-example-kafka/pom.xml | 2 +-
examples/camel-example-kotlin/pom.xml | 2 +-
examples/camel-example-loadbalancing/pom.xml | 2 +-
examples/camel-example-loan-broker-cxf/pom.xml | 2 +-
examples/camel-example-loan-broker-jms/pom.xml | 2 +-
examples/camel-example-management/pom.xml | 2 +-
examples/camel-example-micrometer/pom.xml | 2 +-
examples/camel-example-mybatis/pom.xml | 2 +-
.../camel-example-netty-custom-correlation/pom.xml | 2 +-
.../camel-example-netty-http/myapp-cdi/pom.xml | 2 +-
.../camel-example-netty-http/myapp-one/pom.xml | 2 +-
.../camel-example-netty-http/myapp-two/pom.xml | 2 +-
examples/camel-example-netty-http/pom.xml | 2 +-
.../shared-netty-http-server/pom.xml | 2 +-
examples/camel-example-olingo4-blueprint/pom.xml | 2 +-
examples/camel-example-opentracing/client/pom.xml | 2 +-
.../loggingtracer/pom.xml | 2 +-
examples/camel-example-opentracing/pom.xml | 2 +-
.../camel-example-opentracing/service1/pom.xml | 2 +-
.../camel-example-opentracing/service2/pom.xml | 2 +-
examples/camel-example-pojo-messaging/pom.xml | 2 +-
examples/camel-example-rabbitmq/pom.xml | 2 +-
examples/camel-example-reactive-streams/pom.xml | 2 +-
examples/camel-example-reload/pom.xml | 2 +-
.../pom.xml | 2 +-
examples/camel-example-reportincident/pom.xml | 2 +-
examples/camel-example-rest-producer/pom.xml | 2 +-
examples/camel-example-rest-swagger/pom.xml | 2 +-
examples/camel-example-restlet-jdbc/pom.xml | 2 +-
examples/camel-example-route-throttling/pom.xml | 2 +-
examples/camel-example-scala/pom.xml | 2 +-
.../pom.xml | 2 +-
.../camel-example-servlet-rest-blueprint/pom.xml | 2 +-
.../camel-example-servlet-tomcat-no-spring/pom.xml | 2 +-
examples/camel-example-servlet-tomcat/pom.xml | 2 +-
.../camel-example-simplejirabot/javadsl/pom.xml | 2 +-
examples/camel-example-simplejirabot/pom.xml | 2 +-
.../camel-example-simplejirabot/xmlconf/pom.xml | 2 +-
examples/camel-example-spark-rest/pom.xml | 2 +-
examples/camel-example-splunk/pom.xml | 2 +-
.../camel-example-spring-boot-activemq/pom.xml | 2 +-
.../cluster-bootstrap/pom.xml | 2 +-
.../cluster-node/pom.xml | 2 +-
.../pom.xml | 2 +-
.../camel-example-spring-boot-geocoder/pom.xml | 2 +-
.../hello-camel-grpc-client/pom.xml | 2 +-
.../hello-camel-grpc-server/pom.xml | 2 +-
examples/camel-example-spring-boot-grpc/pom.xml | 2 +-
.../application/pom.xml | 2 +-
.../pom.xml | 2 +-
.../service/pom.xml | 2 +-
.../camel-example-spring-boot-infinispan/pom.xml | 2 +-
examples/camel-example-spring-boot-master/pom.xml | 2 +-
examples/camel-example-spring-boot-metrics/pom.xml | 2 +-
examples/camel-example-spring-boot-pojo/pom.xml | 2 +-
.../camel-example-spring-boot-rest-jpa/pom.xml | 2 +-
.../camel-example-spring-boot-rest-swagger/pom.xml | 2 +-
.../consumer/pom.xml | 2 +-
.../camel-example-spring-boot-servicecall/pom.xml | 2 +-
.../services/pom.xml | 2 +-
.../pom.xml | 2 +-
examples/camel-example-spring-boot-xml/pom.xml | 2 +-
examples/camel-example-spring-boot/pom.xml | 2 +-
.../consumer/pom.xml | 2 +-
.../camel-example-spring-cloud-servicecall/pom.xml | 2 +-
.../service/pom.xml | 2 +-
.../consumer/pom.xml | 2 +-
.../pom.xml | 2 +-
.../service/pom.xml | 2 +-
examples/camel-example-spring-javaconfig/pom.xml | 2 +-
examples/camel-example-spring-jms/pom.xml | 2 +-
examples/camel-example-spring-security/pom.xml | 2 +-
examples/camel-example-spring-ws/pom.xml | 2 +-
examples/camel-example-spring-xquery/pom.xml | 2 +-
examples/camel-example-spring/pom.xml | 2 +-
examples/camel-example-sql-blueprint/pom.xml | 2 +-
examples/camel-example-ssh-security/pom.xml | 2 +-
examples/camel-example-ssh/pom.xml | 2 +-
examples/camel-example-swagger-cdi/pom.xml | 2 +-
examples/camel-example-swagger-osgi/pom.xml | 2 +-
examples/camel-example-swagger-xml/pom.xml | 2 +-
examples/camel-example-tracer/pom.xml | 2 +-
.../camel-example-transformer-blueprint/pom.xml | 2 +-
examples/camel-example-transformer-cdi/pom.xml | 2 +-
examples/camel-example-transformer-demo/pom.xml | 2 +-
examples/camel-example-twitter-salesforce/pom.xml | 2 +-
.../pom.xml | 2 +-
examples/camel-example-twitter-websocket/pom.xml | 2 +-
.../camel-example-validator-spring-boot/pom.xml | 2 +-
examples/camel-example-widget-gadget-cdi/pom.xml | 2 +-
examples/camel-example-widget-gadget-java/pom.xml | 2 +-
examples/camel-example-widget-gadget-xml/pom.xml | 2 +-
examples/camel-example-zipkin/client/pom.xml | 2 +-
examples/camel-example-zipkin/pom.xml | 2 +-
examples/camel-example-zipkin/service1/pom.xml | 2 +-
examples/camel-example-zipkin/service2/pom.xml | 2 +-
examples/pom.xml | 2 +-
parent/pom.xml | 138 +++++-
platforms/camel-catalog-connector/pom.xml | 4 +-
platforms/camel-catalog-lucene/pom.xml | 2 +-
platforms/camel-catalog-maven/pom.xml | 2 +-
platforms/camel-catalog-nexus/pom.xml | 4 +-
.../camel/catalog/nexus/BaseNexusRepository.java | 3 +
platforms/camel-catalog-provider-karaf/pom.xml | 2 +-
.../camel-catalog-provider-springboot/pom.xml | 2 +-
platforms/camel-catalog-rest-app/pom.xml | 4 +-
platforms/camel-catalog-rest/pom.xml | 4 +-
platforms/camel-catalog/pom.xml | 2 +-
.../apache/camel/catalog/DefaultCamelCatalog.java | 7 +-
platforms/commands/commands-core/pom.xml | 2 +-
platforms/commands/commands-jolokia/pom.xml | 2 +-
platforms/commands/pom.xml | 2 +-
platforms/dummy-component/pom.xml | 2 +-
platforms/karaf/commands/pom.xml | 2 +-
platforms/karaf/features/pom.xml | 2 +-
.../karaf/features/src/main/resources/features.xml | 44 +-
platforms/karaf/pom.xml | 2 +-
platforms/myfoo-connector/pom.xml | 4 +-
.../src/main/resources/camel-connector-schema.json | 2 +-
.../src/main/resources/camel-connector.json | 6 +-
platforms/pom.xml | 2 +-
.../components-starter/camel-ahc-starter/pom.xml | 2 +-
.../camel-ahc-ws-starter/pom.xml | 2 +-
.../components-starter/camel-amqp-starter/pom.xml | 2 +-
.../components-starter/camel-apns-starter/pom.xml | 2 +-
.../components-starter/camel-as2-starter/pom.xml | 2 +-
.../as2/springboot/AS2ComponentConfiguration.java | 14 +
.../components-starter/camel-asn1-starter/pom.xml | 2 +-
.../camel-asterisk-starter/pom.xml | 2 +-
.../components-starter/camel-atmos-starter/pom.xml | 2 +-
.../camel-atmosphere-websocket-starter/pom.xml | 2 +-
.../components-starter/camel-atom-starter/pom.xml | 2 +-
.../camel-atomix-starter/pom.xml | 2 +-
.../components-starter/camel-avro-starter/pom.xml | 2 +-
.../components-starter/camel-aws-starter/pom.xml | 2 +-
.../camel-aws-xray-starter/pom.xml | 2 +-
.../components-starter/camel-azure-starter/pom.xml | 2 +-
.../components-starter/camel-bam-starter/pom.xml | 2 +-
.../camel-barcode-starter/pom.xml | 2 +-
.../camel-base64-starter/pom.xml | 2 +-
.../camel-bean-validator-starter/pom.xml | 2 +-
.../camel-beanio-starter/pom.xml | 2 +-
.../camel-beanstalk-starter/pom.xml | 2 +-
.../components-starter/camel-bindy-starter/pom.xml | 2 +-
.../camel-bonita-starter/pom.xml | 2 +-
.../components-starter/camel-boon-starter/pom.xml | 2 +-
.../components-starter/camel-box-starter/pom.xml | 2 +-
.../camel-braintree-starter/pom.xml | 2 +-
.../components-starter/camel-cache-starter/pom.xml | 2 +-
.../camel-caffeine-starter/pom.xml | 2 +-
.../camel-cassandraql-starter/pom.xml | 2 +-
.../camel-castor-starter/pom.xml | 2 +-
.../camel-chronicle-starter/pom.xml | 2 +-
.../components-starter/camel-chunk-starter/pom.xml | 2 +-
.../camel-cm-sms-starter/pom.xml | 2 +-
.../components-starter/camel-cmis-starter/pom.xml | 2 +-
.../components-starter/camel-coap-starter/pom.xml | 2 +-
.../camel-cometd-starter/pom.xml | 2 +-
.../camel-consul-starter/pom.xml | 2 +-
.../camel-context-starter/pom.xml | 2 +-
.../pom.xml | 14 +-
.../CordaComponentAutoConfiguration.java | 128 ++++++
.../springboot/CordaComponentConfiguration.java | 182 ++++++++
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../additional-spring-configuration-metadata.json | 10 +
.../src/main/resources/META-INF/spring.factories | 2 +-
.../src/main/resources/META-INF/spring.provides | 5 +-
.../components-starter/camel-core-starter/pom.xml | 2 +-
.../camel-couchbase-starter/pom.xml | 2 +-
.../camel-couchdb-starter/pom.xml | 2 +-
.../camel-crypto-cms-starter/pom.xml | 2 +-
.../camel-crypto-starter/pom.xml | 2 +-
.../components-starter/camel-csv-starter/pom.xml | 2 +-
.../components-starter/camel-cxf-starter/pom.xml | 2 +-
.../camel-cxf-transport-starter/pom.xml | 2 +-
.../camel-digitalocean-starter/pom.xml | 2 +-
.../camel-disruptor-starter/pom.xml | 2 +-
.../components-starter/camel-dns-starter/pom.xml | 2 +-
.../camel-docker-starter/pom.xml | 2 +-
.../components-starter/camel-dozer-starter/pom.xml | 2 +-
.../components-starter/camel-drill-starter/pom.xml | 2 +-
.../camel-dropbox-starter/pom.xml | 2 +-
.../camel-eclipse-starter/pom.xml | 2 +-
.../camel-ehcache-starter/pom.xml | 2 +-
.../camel-elasticsearch-rest-starter/pom.xml | 2 +-
.../camel-elasticsearch-starter/pom.xml | 2 +-
.../camel-elasticsearch5-starter/pom.xml | 2 +-
.../components-starter/camel-elsql-starter/pom.xml | 2 +-
.../components-starter/camel-etcd-starter/pom.xml | 2 +-
.../components-starter/camel-exec-starter/pom.xml | 2 +-
.../camel-facebook-starter/pom.xml | 2 +-
.../camel-fastjson-starter/pom.xml | 2 +-
.../components-starter/camel-fhir-starter/pom.xml | 2 +-
.../camel-flatpack-starter/pom.xml | 2 +-
.../components-starter/camel-flink-starter/pom.xml | 2 +-
.../components-starter/camel-fop-starter/pom.xml | 2 +-
.../camel-freemarker-starter/pom.xml | 2 +-
.../components-starter/camel-ftp-starter/pom.xml | 2 +-
.../camel-ganglia-starter/pom.xml | 2 +-
.../camel-geocoder-starter/pom.xml | 2 +-
.../components-starter/camel-git-starter/pom.xml | 2 +-
.../camel-github-starter/pom.xml | 2 +-
.../camel-google-bigquery-starter/pom.xml | 2 +-
...oogleBigQuerySQLComponentAutoConfiguration.java | 130 ++++++
.../GoogleBigQuerySQLComponentConfiguration.java | 84 ++++
.../src/main/resources/META-INF/spring.factories | 4 +-
.../camel-google-calendar-starter/pom.xml | 2 +-
...GoogleCalendarStreamComponentConfiguration.java | 10 +-
.../camel-google-drive-starter/pom.xml | 2 +-
.../camel-google-mail-starter/pom.xml | 2 +-
.../GoogleMailStreamComponentConfiguration.java | 15 -
.../camel-google-pubsub-starter/pom.xml | 2 +-
.../pom.xml | 10 +-
.../GoogleSheetsComponentAutoConfiguration.java | 129 ++++++
.../GoogleSheetsComponentConfiguration.java} | 138 ++----
...ogleSheetsStreamComponentAutoConfiguration.java | 130 ++++++
.../GoogleSheetsStreamComponentConfiguration.java} | 135 +++---
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 4 +-
.../src/main/resources/META-INF/spring.provides | 4 +-
.../components-starter/camel-gora-starter/pom.xml | 2 +-
.../components-starter/camel-grape-starter/pom.xml | 2 +-
.../camel-groovy-starter/pom.xml | 2 +-
.../components-starter/camel-grpc-starter/pom.xml | 2 +-
.../components-starter/camel-gson-starter/pom.xml | 2 +-
.../camel-guava-eventbus-starter/pom.xml | 2 +-
.../components-starter/camel-guice-starter/pom.xml | 2 +-
.../camel-hawtdb-starter/pom.xml | 2 +-
.../camel-hazelcast-starter/pom.xml | 2 +-
.../components-starter/camel-hbase-starter/pom.xml | 2 +-
.../components-starter/camel-hdfs-starter/pom.xml | 2 +-
.../components-starter/camel-hdfs2-starter/pom.xml | 2 +-
.../camel-headersmap-starter/pom.xml | 2 +-
.../camel-hessian-starter/pom.xml | 2 +-
.../camel-hipchat-starter/pom.xml | 2 +-
.../components-starter/camel-hl7-starter/pom.xml | 2 +-
.../camel-http-common-starter/pom.xml | 2 +-
.../components-starter/camel-http-starter/pom.xml | 2 +-
.../components-starter/camel-http4-starter/pom.xml | 2 +-
.../camel-hystrix-starter/pom.xml | 2 +-
.../components-starter/camel-ical-starter/pom.xml | 2 +-
.../camel-iec60870-starter/pom.xml | 2 +-
.../camel-ignite-starter/pom.xml | 2 +-
.../camel-infinispan-starter/pom.xml | 2 +-
.../camel-influxdb-starter/pom.xml | 2 +-
.../pom.xml | 16 +-
.../springboot/IPFSComponentAutoConfiguration.java | 128 ++++++
.../springboot/IPFSComponentConfiguration.java | 55 +++
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 2 +-
.../src/main/resources/META-INF/spring.provides | 4 +-
.../components-starter/camel-irc-starter/pom.xml | 2 +-
.../camel-ironmq-starter/pom.xml | 2 +-
.../camel-jackson-starter/pom.xml | 2 +-
.../camel-jacksonxml-starter/pom.xml | 2 +-
.../camel-jasypt-starter/pom.xml | 2 +-
.../camel-javaspace-starter/pom.xml | 2 +-
.../components-starter/camel-jaxb-starter/pom.xml | 2 +-
.../components-starter/camel-jbpm-starter/pom.xml | 2 +-
.../camel-jcache-starter/pom.xml | 2 +-
.../camel-jclouds-starter/pom.xml | 2 +-
.../components-starter/camel-jcr-starter/pom.xml | 2 +-
.../components-starter/camel-jdbc-starter/pom.xml | 2 +-
.../camel-jetty-common-starter/pom.xml | 2 +-
.../components-starter/camel-jetty-starter/pom.xml | 2 +-
.../camel-jetty9-starter/pom.xml | 2 +-
.../camel-jgroups-starter/pom.xml | 2 +-
.../components-starter/camel-jibx-starter/pom.xml | 2 +-
.../components-starter/camel-jing-starter/pom.xml | 2 +-
.../components-starter/camel-jira-starter/pom.xml | 2 +-
.../components-starter/camel-jms-starter/pom.xml | 2 +-
.../components-starter/camel-jmx-starter/pom.xml | 2 +-
.../camel-johnzon-starter/pom.xml | 2 +-
.../components-starter/camel-jolt-starter/pom.xml | 2 +-
.../components-starter/camel-josql-starter/pom.xml | 2 +-
.../components-starter/camel-jpa-starter/pom.xml | 2 +-
.../components-starter/camel-jsch-starter/pom.xml | 2 +-
.../camel-json-validator-starter/pom.xml | 2 +-
.../camel-jsonpath-starter/pom.xml | 2 +-
.../components-starter/camel-jt400-starter/pom.xml | 2 +-
.../components-starter/camel-juel-starter/pom.xml | 2 +-
.../camel-jxpath-starter/pom.xml | 2 +-
.../components-starter/camel-kafka-starter/pom.xml | 2 +-
.../camel-kestrel-starter/pom.xml | 2 +-
.../components-starter/camel-krati-starter/pom.xml | 2 +-
.../camel-kubernetes-starter/pom.xml | 2 +-
.../components-starter/camel-kura-starter/pom.xml | 2 +-
.../components-starter/camel-ldap-starter/pom.xml | 2 +-
.../components-starter/camel-ldif-starter/pom.xml | 2 +-
.../camel-leveldb-starter/pom.xml | 2 +-
.../camel-linkedin-starter/pom.xml | 2 +-
.../components-starter/camel-lra-starter/pom.xml | 2 +-
.../camel-lucene-starter/pom.xml | 2 +-
.../camel-lumberjack-starter/pom.xml | 2 +-
.../components-starter/camel-lzf-starter/pom.xml | 2 +-
.../components-starter/camel-mail-starter/pom.xml | 2 +-
.../camel-master-starter/pom.xml | 2 +-
.../camel-metrics-starter/pom.xml | 2 +-
.../camel-micrometer-starter/pom.xml | 2 +-
.../components-starter/camel-milo-starter/pom.xml | 2 +-
.../components-starter/camel-mina2-starter/pom.xml | 2 +-
.../components-starter/camel-mllp-starter/pom.xml | 2 +-
.../camel-mongodb-gridfs-starter/pom.xml | 2 +-
.../camel-mongodb-starter/pom.xml | 2 +-
.../camel-mongodb3-starter/pom.xml | 2 +-
.../components-starter/camel-mqtt-starter/pom.xml | 2 +-
.../components-starter/camel-msv-starter/pom.xml | 2 +-
.../camel-mustache-starter/pom.xml | 2 +-
.../components-starter/camel-mvel-starter/pom.xml | 2 +-
.../camel-mybatis-starter/pom.xml | 2 +-
.../camel-nagios-starter/pom.xml | 2 +-
.../components-starter/camel-nats-starter/pom.xml | 2 +-
.../camel-netty-http-starter/pom.xml | 2 +-
.../components-starter/camel-netty-starter/pom.xml | 2 +-
.../camel-netty4-http-starter/pom.xml | 2 +-
.../camel-netty4-starter/pom.xml | 2 +-
.../components-starter/camel-nsq-starter/pom.xml | 2 +-
.../components-starter/camel-ognl-starter/pom.xml | 2 +-
.../camel-olingo2-starter/pom.xml | 2 +-
.../camel-olingo4-starter/pom.xml | 2 +-
.../camel-openshift-starter/pom.xml | 2 +-
.../camel-openstack-starter/pom.xml | 2 +-
.../camel-opentracing-starter/pom.xml | 2 +-
.../camel-optaplanner-starter/pom.xml | 2 +-
.../components-starter/camel-paho-starter/pom.xml | 2 +-
.../components-starter/camel-pdf-starter/pom.xml | 2 +-
.../camel-pgevent-starter/pom.xml | 2 +-
.../camel-printer-starter/pom.xml | 2 +-
.../camel-protobuf-starter/pom.xml | 2 +-
.../camel-pubnub-starter/pom.xml | 2 +-
.../camel-quartz2-starter/pom.xml | 2 +-
.../camel-quickfix-starter/pom.xml | 2 +-
.../camel-rabbitmq-starter/pom.xml | 2 +-
.../camel-reactive-streams-starter/pom.xml | 2 +-
.../camel-reactor-starter/pom.xml | 2 +-
.../camel-rest-swagger-starter/pom.xml | 2 +-
.../camel-restlet-starter/pom.xml | 2 +-
.../camel-ribbon-starter/pom.xml | 2 +-
.../components-starter/camel-rmi-starter/pom.xml | 2 +-
.../camel-routebox-starter/pom.xml | 2 +-
.../components-starter/camel-rss-starter/pom.xml | 2 +-
.../components-starter/camel-ruby-starter/pom.xml | 2 +-
.../components-starter/camel-rx-starter/pom.xml | 2 +-
.../camel-rxjava2-starter/pom.xml | 2 +-
.../camel-salesforce-starter/pom.xml | 2 +-
.../camel-sap-netweaver-starter/pom.xml | 2 +-
.../components-starter/camel-saxon-starter/pom.xml | 2 +-
.../camel-schematron-starter/pom.xml | 2 +-
.../camel-script-starter/pom.xml | 2 +-
.../camel-service-starter/pom.xml | 2 +-
.../camel-servicenow-starter/pom.xml | 2 +-
.../camel-servlet-starter/pom.xml | 2 +-
.../camel-servletlistener-starter/pom.xml | 2 +-
.../components-starter/camel-shiro-starter/pom.xml | 2 +-
.../components-starter/camel-sip-starter/pom.xml | 2 +-
.../components-starter/camel-sjms-starter/pom.xml | 2 +-
.../components-starter/camel-sjms2-starter/pom.xml | 2 +-
.../components-starter/camel-slack-starter/pom.xml | 2 +-
.../components-starter/camel-smpp-starter/pom.xml | 2 +-
.../camel-snakeyaml-starter/pom.xml | 2 +-
.../components-starter/camel-snmp-starter/pom.xml | 2 +-
.../components-starter/camel-soap-starter/pom.xml | 2 +-
.../components-starter/camel-solr-starter/pom.xml | 2 +-
.../components-starter/camel-spark-starter/pom.xml | 2 +-
.../camel-splunk-starter/pom.xml | 2 +-
.../camel-spring-batch-starter/pom.xml | 2 +-
.../camel-spring-boot-starter/pom.xml | 2 +-
.../camel-spring-cloud-consul-starter/pom.xml | 2 +-
.../camel-spring-cloud-netflix-starter/pom.xml | 2 +-
.../camel-spring-cloud-starter/pom.xml | 2 +-
.../camel-spring-cloud-zookeeper-starter/pom.xml | 2 +-
.../camel-spring-integration-starter/pom.xml | 2 +-
.../camel-spring-javaconfig-starter/pom.xml | 2 +-
.../camel-spring-ldap-starter/pom.xml | 2 +-
.../camel-spring-redis-starter/pom.xml | 2 +-
.../camel-spring-security-starter/pom.xml | 2 +-
.../camel-spring-starter/pom.xml | 2 +-
.../camel-spring-ws-starter/pom.xml | 2 +-
.../components-starter/camel-sql-starter/pom.xml | 2 +-
.../components-starter/camel-ssh-starter/pom.xml | 2 +-
.../components-starter/camel-stax-starter/pom.xml | 2 +-
.../components-starter/camel-stomp-starter/pom.xml | 2 +-
.../camel-stream-starter/pom.xml | 2 +-
.../camel-stringtemplate-starter/pom.xml | 2 +-
.../camel-swagger-java-starter/pom.xml | 2 +-
.../camel-syslog-starter/pom.xml | 2 +-
.../camel-tagsoup-starter/pom.xml | 2 +-
.../camel-tarfile-starter/pom.xml | 2 +-
.../camel-telegram-starter/pom.xml | 2 +-
.../camel-thrift-starter/pom.xml | 2 +-
.../components-starter/camel-tika-starter/pom.xml | 2 +-
.../camel-twilio-starter/pom.xml | 2 +-
.../camel-twitter-starter/pom.xml | 2 +-
.../camel-undertow-starter/pom.xml | 2 +-
.../camel-univocity-parsers-starter/pom.xml | 2 +-
.../camel-urlrewrite-starter/pom.xml | 2 +-
.../camel-velocity-starter/pom.xml | 2 +-
.../components-starter/camel-vertx-starter/pom.xml | 2 +-
.../camel-weather-starter/pom.xml | 2 +-
.../components-starter/camel-web3j-starter/pom.xml | 2 +-
.../camel-websocket-starter/pom.xml | 2 +-
.../camel-wordpress-starter/pom.xml | 2 +-
.../camel-xchange-starter/pom.xml | 2 +-
.../camel-xmlbeans-starter/pom.xml | 2 +-
.../camel-xmljson-starter/pom.xml | 2 +-
.../camel-xmlrpc-starter/pom.xml | 2 +-
.../camel-xmlsecurity-starter/pom.xml | 2 +-
.../components-starter/camel-xmpp-starter/pom.xml | 2 +-
.../camel-xstream-starter/pom.xml | 2 +-
.../camel-yammer-starter/pom.xml | 2 +-
.../components-starter/camel-yql-starter/pom.xml | 2 +-
.../camel-zendesk-starter/pom.xml | 2 +-
.../camel-zipfile-starter/pom.xml | 2 +-
.../camel-zipkin-starter/pom.xml | 2 +-
.../camel-zookeeper-master-starter/pom.xml | 2 +-
.../camel-zookeeper-starter/pom.xml | 2 +-
platforms/spring-boot/components-starter/pom.xml | 5 +-
platforms/spring-boot/pom.xml | 2 +-
.../pom.xml | 2 +-
.../camel-spring-boot-dependencies/pom.xml | 205 ++++++---
.../spring-boot-dm/camel-starter-parent/pom.xml | 2 +-
platforms/spring-boot/spring-boot-dm/pom.xml | 2 +-
pom.xml | 35 +-
tests/camel-blueprint-cxf-test/pom.xml | 2 +-
tests/camel-blueprint-test/pom.xml | 2 +-
tests/camel-itest-cdi/pom.xml | 2 +-
tests/camel-itest-jms2/pom.xml | 2 +-
tests/camel-itest-karaf/pom.xml | 2 +-
.../camel/itest/karaf/CamelGoogleSheetsTest.java | 22 +-
tests/camel-itest-osgi/pom.xml | 2 +-
tests/camel-itest-performance/pom.xml | 2 +-
tests/camel-itest-spring-boot/pom.xml | 2 +-
.../itest/springboot/CamelGoogleSheetsTest.java | 50 +++
tests/camel-itest-standalone/pom.xml | 2 +-
tests/camel-itest/pom.xml | 2 +-
tests/camel-jmh/pom.xml | 2 +-
tests/camel-partial-classpath-test/pom.xml | 2 +-
tests/camel-performance/pom.xml | 2 +-
tests/camel-typeconverterscan-test/pom.xml | 2 +-
tests/pom.xml | 2 +-
tests/test-bundles/mock-javamail_1.7/pom.xml | 2 +-
tests/test-bundles/pom.xml | 2 +-
tooling/apt/pom.xml | 2 +-
.../apache/camel/tools/apt/ConverterProcessor.java | 161 +++++--
tooling/camel-manual/pom.xml | 2 +-
tooling/camel-route-parser/pom.xml | 2 +-
.../camel/parser/helper/XmlLineNumberParser.java | 4 +
tooling/json-simple-ordered/pom.xml | 2 +-
tooling/maven/bom-generator-maven-plugin/pom.xml | 2 +-
.../maven/bom/generator/BomGeneratorMojo.java | 11 +-
.../maven/camel-api-component-maven-plugin/pom.xml | 2 +-
.../pom.xml | 2 +-
.../java/org/apache/camel/maven/XmlHelper.java | 7 +-
tooling/maven/camel-maven-plugin/pom.xml | 2 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 2 +-
.../maven/packaging/PrepareCatalogKarafMojo.java | 3 +
.../maven/packaging/SpringBootStarterMojo.java | 10 +-
tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 2 +-
.../src/it/customized/pom.xml | 1 +
.../src/it/customized/verify.groovy | 4 +
.../main/docs/camel-restdsl-swagger-plugin.adoc | 6 +-
.../generator/swagger/AbstractGenerateMojo.java | 3 +
.../maven/generator/swagger/GenerateMojo.java | 4 +
tooling/maven/guice-maven-plugin/pom.xml | 2 +-
tooling/maven/pom.xml | 2 +-
tooling/parent/pom.xml | 2 +-
tooling/pom.xml | 2 +-
tooling/spi-annotations/pom.xml | 2 +-
tooling/swagger-rest-dsl-generator/pom.xml | 2 +-
.../camel/generator/swagger/RestDslGenerator.java | 10 +
.../swagger/RestDslSourceCodeGenerator.java | 3 +
.../generator/swagger/RestDslXmlGenerator.java | 9 +-
1067 files changed, 12062 insertions(+), 2887 deletions(-)
create mode 100644 camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDynamicDoneFileNameWithTwoDotsTest.java
create mode 100644 camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest.java
create mode 100644 camel-core/src/test/java/org/apache/camel/impl/RouteIdRestDefinitionTest.java
rename components/{camel-irc/src/test/java/org/apache/camel/component/irc/IrcsRouteTest.java => camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2CompressionAlgorithm.java} (52%)
copy components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/{ApplicationPkcs7MimeEntity.java => ApplicationPkcs7MimeCompressedDataEntity.java} (64%)
rename components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/{ApplicationPkcs7MimeEntity.java => ApplicationPkcs7MimeEnvelopedDataEntity.java} (93%)
copy components/{camel-google-mail/src/main/java/org/apache/camel/component/google/mail/internal/GoogleMailConstants.java => camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/CompressionUtils.java} (56%)
create mode 100644 components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/CompressedEntityTest.java
create mode 100644 components/camel-corda/.gitignore
create mode 100644 components/camel-corda/README.md
copy components/{camel-snmp => camel-corda}/pom.xml (74%)
create mode 100644 components/camel-corda/src/main/docs/corda-component.adoc
create mode 100644 components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java
create mode 100644 components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConfiguration.java
create mode 100644 components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConstants.java
create mode 100644 components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConsumer.java
create mode 100644 components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java
create mode 100644 components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
copy {tooling/maven/guice-maven-plugin => components/camel-corda}/src/main/resources/META-INF/LICENSE.txt (100%)
mode change 100644 => 100755
copy {tooling/maven/guice-maven-plugin => components/camel-corda}/src/main/resources/META-INF/NOTICE.txt (100%)
mode change 100644 => 100755
create mode 100755 components/camel-corda/src/main/resources/META-INF/services/org/apache/camel/component/corda
copy tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/verify.groovy => components/camel-corda/src/test/java/org/apache/camel/component/corda/CamelFlow.java (72%)
copy components/{camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java => camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedTest.java} (54%)
copy components/{camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java => camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicTest.java} (51%)
copy components/{camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java => camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedTest.java} (54%)
create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTestSupport.java
copy components/{camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java => camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedTest.java} (54%)
copy components/{camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java => camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaTest.java} (54%)
copy components/{camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java => camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByTest.java} (52%)
copy components/{camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java => camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecTest.java} (52%)
copy components/{camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java => camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingTest.java} (53%)
rename components/{camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java => camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackTest.java} (54%)
create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerTest.java
create mode 100755 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaTestSupport.java
copy components/{camel-google-mail/src/main/java/org/apache/camel/component/google/mail/internal/GoogleMailConstants.java => camel-corda/src/test/java/org/apache/camel/component/corda/IntegrationWhiteList.java} (59%)
create mode 100644 components/camel-corda/src/test/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist
copy platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/resources/META-INF/spring.factories => components/camel-corda/src/test/resources/log4j2.properties (65%)
copy components/{camel-web3j => camel-corda}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%)
delete mode 100644 components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java
delete mode 100644 components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java
delete mode 100644 components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java
create mode 100644 components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
create mode 100644 components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLComponent.java
create mode 100644 components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java
create mode 100644 components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java
create mode 100644 components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
create mode 100644 components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java
copy components/{camel-dropbox/src/test/resources/test-options.properties => camel-google-bigquery/src/main/resources/META-INF/services/org/apache/camel/component/google-bigquery-sql} (85%)
create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryFromResourceTest.java
create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryTest.java
create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java
create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java
create mode 100644 components/camel-google-bigquery/src/test/resources/sql/delete.sql
create mode 100644 components/camel-google-bigquery/src/test/resources/sql/insert.sql
copy components/{camel-google-calendar => camel-google-sheets}/pom.xml (64%)
create mode 100644 components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
copy components/{camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc => camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc} (51%)
create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java
copy tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/verify.groovy => components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsClientFactory.java (74%)
create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java
create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java
create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java
create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java
create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
copy components/{camel-google-mail/src/main/java/org/apache/camel/component/google/mail/internal/GoogleMailConstants.java => camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java} (71%)
copy components/{camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DestinationNameParser.java => camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsPropertiesHelper.java} (52%)
create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
copy components/{camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DestinationNameParser.java => camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConstants.java} (50%)
create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
copy {tooling/maven/guice-maven-plugin => components/camel-google-sheets}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/guice-maven-plugin => components/camel-google-sheets}/src/main/resources/META-INF/NOTICE.txt (100%)
create mode 100644 components/camel-google-sheets/src/main/resources/META-INF/services/org/apache/camel/component/google-sheets
create mode 100644 components/camel-google-sheets/src/main/resources/META-INF/services/org/apache/camel/component/google-sheets-stream
create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsConfigurationTest.java
create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java
create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java
create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/AbstractGoogleSheetsStreamTestSupport.java
create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java
copy components/{camel-dropbox/src/test/resources/test-options.properties => camel-google-sheets/src/test/resources/log4j2.properties} (68%)
copy components/{camel-dropbox => camel-google-sheets}/src/test/resources/test-options.properties (79%)
copy components/{camel-rmi => camel-ipfs}/pom.xml (67%)
create mode 100644 components/camel-ipfs/src/main/docs/ipfs-component.adoc
create mode 100644 components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSComponent.java
create mode 100644 components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSConfiguration.java
create mode 100644 components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java
create mode 100644 components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java
copy {tooling/maven/guice-maven-plugin => components/camel-ipfs}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/guice-maven-plugin => components/camel-ipfs}/src/main/resources/META-INF/NOTICE.txt (100%)
create mode 100644 components/camel-ipfs/src/main/resources/META-INF/services/org/apache/camel/component/ipfs
create mode 100644 components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
create mode 100644 components/camel-ipfs/src/test/resources/html/chap/ch01.html
create mode 100644 components/camel-ipfs/src/test/resources/html/css/default.css
create mode 100644 components/camel-ipfs/src/test/resources/html/etc/userfile.txt
create mode 100644 components/camel-ipfs/src/test/resources/html/img/logo.png
create mode 100644 components/camel-ipfs/src/test/resources/html/index.html
copy platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/resources/META-INF/spring.factories => components/camel-ipfs/src/test/resources/log4j2.properties (68%)
create mode 100644 components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java
rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{ => it}/IrcMultiChannelRouteTest.java (59%)
rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{ => it}/IrcOnReplyTest.java (81%)
rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{ => it}/IrcPrivmsgTest.java (80%)
rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{ => it}/IrcRouteTest.java (81%)
rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{IrcsListUsersIntegrationTest.java => it/IrcsListUsersTest.java} (74%)
copy tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/verify.groovy => components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsRouteTest.java (70%)
rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{ => it}/IrcsWithSslContextParamsRouteTest.java (98%)
copy platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/resources/META-INF/spring.factories => components/camel-irc/src/test/resources/it-tests.properties (84%)
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
create mode 100644 components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
create mode 100644 components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
create mode 100644 components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
create mode 100644 components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
create mode 100644 components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
copy platforms/spring-boot/components-starter/{camel-hbase-starter => camel-corda-starter}/pom.xml (85%)
create mode 100644 platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java
create mode 100644 platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConfiguration.java
copy {tooling/maven/guice-maven-plugin => platforms/spring-boot/components-starter/camel-corda-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/guice-maven-plugin => platforms/spring-boot/components-starter/camel-corda-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
create mode 100644 platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
copy platforms/spring-boot/components-starter/{camel-google-bigquery-starter => camel-corda-starter}/src/main/resources/META-INF/spring.factories (91%)
rename components/camel-irc/src/test/resources/it-list-users.properties => platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.provides (91%)
create mode 100644 platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java
create mode 100644 platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java
copy platforms/spring-boot/components-starter/{camel-google-drive-starter => camel-google-sheets-starter}/pom.xml (90%)
create mode 100644 platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentAutoConfiguration.java
copy platforms/spring-boot/components-starter/{camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java => camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java} (57%)
create mode 100644 platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentAutoConfiguration.java
copy platforms/spring-boot/components-starter/{camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java => camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java} (54%)
copy {tooling/maven/guice-maven-plugin => platforms/spring-boot/components-starter/camel-google-sheets-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/guice-maven-plugin => platforms/spring-boot/components-starter/camel-google-sheets-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
copy platforms/spring-boot/components-starter/{camel-google-bigquery-starter => camel-google-sheets-starter}/src/main/resources/META-INF/spring.factories (83%)
copy components/camel-dropbox/src/test/resources/test-options.properties => platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/spring.provides (94%)
copy platforms/spring-boot/components-starter/{camel-nagios-starter => camel-ipfs-starter}/pom.xml (83%)
create mode 100644 platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentAutoConfiguration.java
create mode 100644 platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentConfiguration.java
copy {tooling/maven/guice-maven-plugin => platforms/spring-boot/components-starter/camel-ipfs-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/guice-maven-plugin => platforms/spring-boot/components-starter/camel-ipfs-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
copy platforms/spring-boot/components-starter/{camel-google-bigquery-starter => camel-ipfs-starter}/src/main/resources/META-INF/spring.factories (91%)
copy components/camel-dropbox/src/test/resources/test-options.properties => platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/spring.provides (94%)
copy components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/internal/GoogleMailConstants.java => tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleSheetsTest.java (67%)
create mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGoogleSheetsTest.java
[camel] 09/19: CAMEL-12618: Prevent Maven Shade plugin from ha...
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 50fc61c7d5df30bb3597118824440256d7776323
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Nov 6 12:43:06 2018 +0100
CAMEL-12618: Prevent Maven Shade plugin from ha...
...nging
When `maven-shade-plugin` is run under Java 11 it tends to hang in:
```
"main" #1 prio=5 os_prio=0 cpu=1597418.82ms elapsed=3787.04s tid=0x00007fc7ec012000 nid=0x7b24 runnable [0x00007fc7f34ae000]
java.lang.Thread.State: RUNNABLE
at org.apache.maven.plugins.shade.pom.MavenJDOMWriter.insertAtPreferredLocation(MavenJDOMWriter.java:272)
at org.apache.maven.plugins.shade.pom.MavenJDOMWriter.iterateExclusion(MavenJDOMWriter.java:488)
at org.apache.maven.plugins.shade.pom.MavenJDOMWriter.updateDependency(MavenJDOMWriter.java:1335)
at org.apache.maven.plugins.shade.pom.MavenJDOMWriter.iterateDependency(MavenJDOMWriter.java:386)
at org.apache.maven.plugins.shade.pom.MavenJDOMWriter.updateModel(MavenJDOMWriter.java:1623)
at org.apache.maven.plugins.shade.pom.MavenJDOMWriter.write(MavenJDOMWriter.java:2156)
at org.apache.maven.plugins.shade.pom.PomWriter.write(PomWriter.java:75)
at org.apache.maven.plugins.shade.mojo.ShadeMojo.rewriteDependencyReducedPomIfWeHaveReduction(ShadeMojo.java:1049)
at org.apache.maven.plugins.shade.mojo.ShadeMojo.createDependencyReducedPom(ShadeMojo.java:978)
at org.apache.maven.plugins.shade.mojo.ShadeMojo.execute(ShadeMojo.java:538)
```
This removes the generation of dependency reduced POM and skips over
the blocking part.
---
platforms/camel-catalog/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/platforms/camel-catalog/pom.xml b/platforms/camel-catalog/pom.xml
index 9567c5e..90d503f 100644
--- a/platforms/camel-catalog/pom.xml
+++ b/platforms/camel-catalog/pom.xml
@@ -193,6 +193,7 @@
<goal>shade</goal>
</goals>
<configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
<include>org.apache.camel:json-simple-ordered</include>
[camel] 16/19: CAMEL-12618: upgrade MVEL version and use the r...
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 1b102ea9d068f51ba27b17f5696bef20dd19795f
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Nov 12 11:26:22 2018 +0100
CAMEL-12618: upgrade MVEL version and use the r...
...eleased artifact
Removes the jitpack based fork, MVEL is Java 11 compatible from 2.4.1.
---
parent/pom.xml | 2 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 30fa28c..4e89c3d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -516,7 +516,7 @@
<mustache-java-version>0.9.5</mustache-java-version>
<mustache-guava-version>16.0</mustache-guava-version>
<mustache-bundle-version>0.9.5_3</mustache-bundle-version>
- <mvel-version>2.4.2.Final</mvel-version>
+ <mvel-version>2.4.3.Final</mvel-version>
<mybatis-version>3.4.6</mybatis-version>
<narayana-version>5.9.0.Final</narayana-version>
<nessus-version>1.0.0.Beta1</nessus-version>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index dc64d0f..f3a009d 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -53,6 +53,7 @@
<version>${project.version}</version>
</dependency>
+ <!-- see above, targeting MVEL with Java 10+ support -->
<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
[camel] 08/19: CAMEL-12618: Revert to Groovy 2.5.3
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 706b12239195ad4131076f5f37b4f25d29886ea8
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Nov 6 11:38:54 2018 +0100
CAMEL-12618: Revert to Groovy 2.5.3
---
buildingtools/pom.xml | 16 +++++++-
components/camel-grpc/pom.xml | 14 +++++++
.../camel-olingo2/camel-olingo2-component/pom.xml | 8 ++++
components/camel-protobuf/pom.xml | 14 +++++++
pom.xml | 44 ----------------------
5 files changed, 51 insertions(+), 45 deletions(-)
diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index 72bc780..79921b3 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -113,7 +113,21 @@
</configuration>
</execution>
</executions>
- </plugin>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
<plugin>
<!--
This is needed so that the camel-checkstyle.xml is
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index b9730aa..bec2916 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -179,6 +179,20 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</plugin>
<!-- gRPC and protobuf Java code generator plugin -->
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index 46f190c..73f4501 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -330,6 +330,14 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index 86b3827..6e43a2f 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -125,6 +125,20 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</plugin>
<!-- Protobuf Java code generator plugin -->
diff --git a/pom.xml b/pom.xml
index 193a7cd..9003a32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,17 +138,6 @@
<enabled>false</enabled>
</releases>
</pluginRepository>
- <!-- needed for Groovy SNAPSHOTs see gmaven plugin below -->
- <pluginRepository>
- <id>oss.jfrog.org-snapshots</id>
- <url>https://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
<!-- needed for Groovy Eclipse plugin -->
<pluginRepository>
<id>bintray</id>
@@ -355,39 +344,6 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin-version}</version>
- <dependencies>
- <!-- until we get a release that fixes https://issues.apache.org/jira/browse/GROOVY-8727
- we use a snapshot version
- -->
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <!--<version>${groovy-version}</version>-->
- <version>3.0.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-xml</artifactId>
- <!--<version>${groovy-version}</version>-->
- <version>3.0.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <!--<version>${groovy-version}</version>-->
- <version>3.0.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </plugin>
-
</plugins>
</pluginManagement>
</build>
[camel] 14/19: CAMEL-12618: add Glassfish JAXB implementation ...
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 171ee2cdaba89b6832dd41c81ec9640166931dfe
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Nov 12 11:10:04 2018 +0100
CAMEL-12618: add Glassfish JAXB implementation ...
...to camel-bindy
---
components/camel-bindy/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index ec174f1..8922812 100644
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -95,6 +95,12 @@
<version>${jaxb-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
[camel] 07/19: 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 224298fec4fd747c699493dacd44c1001eca2a77
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Nov 2 17:07:34 2018 +0100
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
---
.../archetype-resources/__artifactId__-api/pom.xml | 21 ---
.../src/main/resources/archetype-resources/pom.xml | 18 ---
camel-core/pom.xml | 112 ++++++---------
components/camel-as2/camel-as2-api/pom.xml | 21 ---
components/camel-bam/pom.xml | 52 +++----
components/camel-bindy/pom.xml | 25 +---
components/camel-blueprint/pom.xml | 104 +++++---------
components/camel-bonita/pom.xml | 25 +---
components/camel-boon/pom.xml | 21 ---
components/camel-box/camel-box-api/pom.xml | 21 ---
components/camel-cdi/pom.xml | 108 +--------------
components/camel-chronicle/pom.xml | 24 +---
.../src/main/docs/cm-sms-component.adoc | 6 +-
components/camel-context/pom.xml | 23 +---
components/camel-cxf-transport/pom.xml | 38 +++--
components/camel-cxf/pom.xml | 20 ---
components/camel-dozer/pom.xml | 5 +
components/camel-ejb/pom.xml | 21 ---
components/camel-fhir/camel-fhir-api/pom.xml | 21 ---
components/camel-grape/pom.xml | 27 ----
components/camel-groovy-dsl/pom.xml | 27 ----
components/camel-grpc/pom.xml | 8 ++
components/camel-guice/pom.xml | 5 +
components/camel-hl7/pom.xml | 24 +---
components/camel-ignite/pom.xml | 21 ---
components/camel-infinispan/pom.xml | 31 -----
components/camel-jaxb/pom.xml | 5 +
components/camel-jetty9/pom.xml | 25 +---
components/camel-jibx/pom.xml | 81 -----------
components/camel-jmx/pom.xml | 78 ++---------
components/camel-jpa/pom.xml | 54 --------
components/camel-kubernetes/pom.xml | 30 +---
.../camel-linkedin/camel-linkedin-api/pom.xml | 21 ---
components/camel-mail/pom.xml | 25 +---
components/camel-mustache/pom.xml | 19 ---
components/camel-netty-http/pom.xml | 6 +
components/camel-netty4-http/pom.xml | 5 +
components/camel-netty4/pom.xml | 20 ---
components/camel-olingo2/camel-olingo2-api/pom.xml | 23 ----
components/camel-olingo4/camel-olingo4-api/pom.xml | 21 ---
components/camel-ruby/pom.xml | 18 ---
components/camel-scala/pom.xml | 28 ----
components/camel-soap/pom.xml | 84 ++---------
components/camel-spark-rest/pom.xml | 20 ---
components/camel-spring-boot/pom.xml | 20 ---
components/camel-spring-javaconfig/pom.xml | 19 ---
components/camel-spring-redis/pom.xml | 5 +
components/camel-spring-ws/pom.xml | 73 ++--------
components/camel-spring/pom.xml | 153 +++++----------------
components/camel-swagger/pom.xml | 37 -----
components/camel-syslog/pom.xml | 24 +---
components/camel-telegram/pom.xml | 16 ---
components/camel-test-blueprint/pom.xml | 18 ---
components/camel-test-spring/pom.xml | 20 ---
components/camel-test/pom.xml | 35 ++---
components/camel-testcontainers-spring/pom.xml | 16 ---
components/camel-testcontainers/pom.xml | 16 ---
components/camel-testng/pom.xml | 19 ---
components/camel-thrift/pom.xml | 8 +-
components/camel-undertow/pom.xml | 5 +
components/camel-velocity/pom.xml | 7 -
components/camel-vertx/pom.xml | 20 ---
components/camel-wordpress/pom.xml | 19 ---
connectors/camel-connector-maven-plugin/pom.xml | 6 +
connectors/examples/beverage-component/pom.xml | 18 ---
connectors/examples/foo-bar-wine-example/pom.xml | 18 ---
connectors/examples/petstore-example/pom.xml | 31 ++---
examples/camel-example-cafe/pom.xml | 20 +--
examples/camel-example-cdi-metrics/pom.xml | 18 ---
examples/camel-example-cdi-properties/pom.xml | 18 ---
examples/camel-example-cdi-rest-servlet/pom.xml | 42 ------
examples/camel-example-cdi-test/pom.xml | 18 ---
examples/camel-example-cxf-blueprint/pom.xml | 20 +--
examples/camel-example-cxf-proxy/pom.xml | 20 +--
examples/camel-example-cxf-tomcat/pom.xml | 34 -----
examples/camel-example-cxf/pom.xml | 20 ---
.../camel-example-fhir-auth-tx-spring-boot/pom.xml | 18 ---
examples/camel-example-fhir-spring-boot/pom.xml | 18 ---
examples/camel-example-groovy/pom.xml | 27 ----
.../hello-camel-grpc-server-kubernetes/pom.xml | 7 +-
examples/camel-example-loan-broker-cxf/pom.xml | 16 ---
examples/camel-example-loan-broker-jms/pom.xml | 16 ---
examples/camel-example-management/pom.xml | 18 ---
examples/camel-example-pojo-messaging/pom.xml | 30 ++--
examples/camel-example-rabbitmq/pom.xml | 18 ---
.../pom.xml | 22 ---
examples/camel-example-reportincident/pom.xml | 18 ---
examples/camel-example-rest-producer/pom.xml | 18 ---
examples/camel-example-scala/pom.xml | 23 ----
.../camel-example-spring-boot-activemq/pom.xml | 20 ---
.../pom.xml | 18 ---
.../hello-camel-grpc-server/pom.xml | 6 +
.../pom.xml | 18 ---
examples/camel-example-spring-boot-master/pom.xml | 18 ---
examples/camel-example-spring-boot-pojo/pom.xml | 18 ---
.../camel-example-spring-boot-rest-jpa/pom.xml | 31 ++---
.../pom.xml | 18 ---
examples/camel-example-spring-boot-xml/pom.xml | 18 ---
examples/camel-example-spring-boot/pom.xml | 18 ---
examples/camel-example-spring-jms/pom.xml | 16 ---
examples/camel-example-transformer-demo/pom.xml | 18 ---
.../camel-example-validator-spring-boot/pom.xml | 18 ---
parent/pom.xml | 67 +--------
platforms/camel-catalog-rest/pom.xml | 47 -------
platforms/spring-boot/components-starter/pom.xml | 18 ---
.../camel-spring-boot-dependencies/pom.xml | 56 ++++----
tests/camel-blueprint-cxf-test/pom.xml | 22 ---
tests/camel-blueprint-test/pom.xml | 18 ---
tests/camel-itest/pom.xml | 22 ---
tooling/apt/pom.xml | 6 +
.../maven/camel-api-component-maven-plugin/pom.xml | 6 +-
.../pom.xml | 27 +---
tooling/maven/camel-package-maven-plugin/pom.xml | 37 ++---
tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 31 ++---
.../src/it/simple-dto/pom.xml | 5 +
.../src/it/simple-xml-dto/pom.xml | 5 +
tooling/swagger-rest-dsl-generator/pom.xml | 20 +++
117 files changed, 479 insertions(+), 2597 deletions(-)
diff --git a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml
index 3df8e61..bf291d4 100644
--- a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml
+++ b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml
@@ -65,25 +65,4 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
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..5391d7a 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
@@ -150,22 +150,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 2e09609..d34a714 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -143,6 +143,40 @@
<version>${project.version}</version>
</dependency>
+ <!-- in Java 11+ JAXB is no longer included -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb-version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- in Java 11+ Activation Framework is no longer included -->
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
+
+ <!-- in Java 11+ SAAJ is no longer included -->
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ <version>${soap-api-version}</version>
+ <optional>true</optional>
+ </dependency>
+
<!-- required dependencies by camel-core -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -236,6 +270,13 @@
<scope>test</scope>
</dependency>
+ <!-- xmltokenizer using woodstox -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
@@ -656,77 +697,8 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>woodstox</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <!-- enable the APT processor -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>apt</artifactId>
- <scope>provided</scope>
- </dependency>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- skip file stress tests as they are intended to run manually -->
- <excludes>
- <exclude>org/apache/camel/component/file/stress/**.java</exclude>
- <exclude>**/DistributedCompletionIntervalTest.java</exclude>
- <exclude>**/DistributedConcurrentPerCorrelationKeyTest.java</exclude>
- <exclude>${platform.skip.tests}</exclude>
- </excludes>
- <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
- <!-- needed for testing the properties component -->
- <environmentVariables>
- <FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
- <FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
- </environmentVariables>
- <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED</argLine>
- </configuration>
- <dependencies>
- <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/components/camel-as2/camel-as2-api/pom.xml b/components/camel-as2/camel-as2-api/pom.xml
index 5eb6dc8..f3f62b2 100644
--- a/components/camel-as2/camel-as2-api/pom.xml
+++ b/components/camel-as2/camel-as2-api/pom.xml
@@ -109,25 +109,4 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml
index e16d66b..99bb90e 100644
--- a/components/camel-bam/pom.xml
+++ b/components/camel-bam/pom.xml
@@ -99,8 +99,26 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <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>
</dependencies>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/profiles/hibernate</directory>
+ </testResource>
+ </testResources>
+ </build>
+
<profiles>
<!-- Hibernate Derby profile -->
<profile>
@@ -209,39 +227,5 @@
</dependencies>
</profile>
- <profile>
- <id>jdk9+-hibernate</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <testResources>
- <testResource>
- <directory>${basedir}/src/test/profiles/hibernate</directory>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.activation,java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </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>
- </dependencies>
- </profile>
</profiles>
</project>
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index 46e530d..ec174f1 100644
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -89,6 +89,12 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
@@ -103,23 +109,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
- <argLine>-Duser.language=en -Duser.region=GB --add-modules java.xml.bind,java.xml.ws.annotation --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.xml.ws.annotation/javax.annotation=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 06b9e1e..daed9e0 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -92,6 +92,11 @@
<version>${aries-util-version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
<!-- for testing -->
<dependency>
@@ -230,6 +235,31 @@
</executions>
</plugin>
+ <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>
<pluginManagement>
@@ -415,7 +445,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>
@@ -432,6 +462,13 @@
</sources>
<createJavaDocAnnotations>false</createJavaDocAnnotations>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
@@ -488,71 +525,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- <property>
- <name>!os.unsupported.schemagen</name>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-jxc-jdk9</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <reuseForks>true</reuseForks>
- <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- <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 27505ae..69c6fff 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -88,24 +88,11 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.activation,java.xml.bind</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-boon/pom.xml b/components/camel-boon/pom.xml
index ae8b7c4..0a781ff 100644
--- a/components/camel-boon/pom.xml
+++ b/components/camel-boon/pom.xml
@@ -79,25 +79,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!--TODO: See https://github.com/boonproject/boon/issues/376 for more details-->
- <exclude>**/**.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index 2e6b0b8..129313e 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -69,27 +69,6 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>com.box</groupId>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index f31fa11..941df1e 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -84,6 +84,12 @@
<artifactId>camel-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+
<!-- DeltaSpike is only used to provide Main support thus optional -->
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
@@ -493,108 +499,6 @@
</dependencies>
</profile>
- <profile>
- <id>jdk9+-weld-2.0</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
-
- <dependencies>
-
- <!-- provided dependencies -->
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-2.0-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- test dependencies -->
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-impl</artifactId>
- <version>${weld3-version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-embedded</artifactId>
- <version>${arquillian-weld-embedded-version}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <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>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>copy</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- <execution>
- <id>copy-jaxb</id>
- <phase>validate</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/components/camel-chronicle/pom.xml b/components/camel-chronicle/pom.xml
index 8e87500..173535a 100644
--- a/components/camel-chronicle/pom.xml
+++ b/components/camel-chronicle/pom.xml
@@ -103,26 +103,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!--See https://github.com/OpenHFT/Chronicle-Engine/issues/19 for more details-->
- <exclude>**/**.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
+ </project>
diff --git a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
index 4a4b254..19e7abb 100644
--- a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
+++ b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
@@ -62,9 +62,9 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *defaultFrom* (producer) | This is the sender name. The maximum length is 11 characters. | | String)
-| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces the max number. Message can be truncated. Technically the gateway will first check if a message is larger than 160 characters, if so, the message will be cut into multiple 153 characters parts limited by these parameters. | 8 | Max(8L)::Int)
-| *productToken* (producer) | *Required* The unique token to use | | String)
+| *defaultFrom* (producer) | This is the sender name. The maximum length is 11 characters. | | String
+| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces the max number. Message can be truncated. Technically the gateway will first check if a message is larger than 160 characters, if so, the message will be cut into multiple 153 characters parts limited by these parameters. | 8 | Max(8L)Int
+| *productToken* (producer) | *Required* The unique token to use | | String
| *testConnectionOnStartup* (producer) | Whether to test the connection to the SMS Gateway on startup | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
|===
diff --git a/components/camel-context/pom.xml b/components/camel-context/pom.xml
index 6cf0175..c614b45 100644
--- a/components/camel-context/pom.xml
+++ b/components/camel-context/pom.xml
@@ -42,6 +42,11 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
<!-- testing -->
<dependency>
@@ -84,22 +89,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <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>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 751495b..7f0649b 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -84,6 +84,17 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
+ <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>
<!-- OSGi, Blueprint -->
<dependency>
@@ -203,28 +214,15 @@
</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>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <reuseForks>true</reuseForks>
- <argLine>--add-modules java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 1a3facc..12af640 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -488,25 +488,5 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!--ignore tests until CXF-7520 is resolved and released-->
- <exclude>**/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index bc70c33..3202da9 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -48,6 +48,11 @@
<groupId>com.github.dozermapper</groupId>
<artifactId>dozer-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
<!-- Expressions -->
<dependency>
diff --git a/components/camel-ejb/pom.xml b/components/camel-ejb/pom.xml
index a71e731..06bb38f 100644
--- a/components/camel-ejb/pom.xml
+++ b/components/camel-ejb/pom.xml
@@ -91,25 +91,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!--TODO: See https://issues.apache.org/jira/browse/TOMEE-2038 for more details-->
- <exclude>**/**.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-fhir/camel-fhir-api/pom.xml b/components/camel-fhir/camel-fhir-api/pom.xml
index c51df25..5ecaa2d 100644
--- a/components/camel-fhir/camel-fhir-api/pom.xml
+++ b/components/camel-fhir/camel-fhir-api/pom.xml
@@ -79,25 +79,4 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index f4512c4..64f54c7 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -141,31 +141,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <!--Skip compile on Java 9 https://issues.apache.org/jira/browse/CAMEL-10905 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>default-testCompile</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-groovy-dsl/pom.xml b/components/camel-groovy-dsl/pom.xml
index b465c7b..922e564 100644
--- a/components/camel-groovy-dsl/pom.xml
+++ b/components/camel-groovy-dsl/pom.xml
@@ -179,31 +179,4 @@
</testResources>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <!--Skip compile on Java 9 https://issues.apache.org/jira/browse/CAMEL-10905 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>default-testCompile</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index f7719eb..b9730aa 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -47,6 +47,13 @@
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc-version}</version>
@@ -220,4 +227,5 @@
</plugin>
</plugins>
</build>
+
</project>
diff --git a/components/camel-guice/pom.xml b/components/camel-guice/pom.xml
index 33e4e5f..0b0d974 100644
--- a/components/camel-guice/pom.xml
+++ b/components/camel-guice/pom.xml
@@ -56,6 +56,11 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
<!-- testing -->
<dependency>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 4433ecc..906d384 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -114,6 +114,12 @@
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -147,22 +153,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index 8d423a1..e9d370d 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -99,25 +99,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- TODO: See https://issues.apache.org/jira/browse/IGNITE-4615 for more information. -->
- <exclude>**/**.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-infinispan/pom.xml b/components/camel-infinispan/pom.xml
index b0ba907..c7aad35 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -156,37 +156,6 @@
<!-- unit testing requires java 8 -->
<profiles>
<profile>
- <id>jdk8-test</id>
- <activation>
- <jdk>!1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-testCompile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>infinispan-itests</id>
<activation>
<activeByDefault>false</activeByDefault>
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 5b702f9..b09f0f1 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -47,6 +47,11 @@
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
</dependency>
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index 4f565e1..72680e8 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -171,6 +171,12 @@
<artifactId>httpclient</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -188,23 +194,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <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>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-jibx/pom.xml b/components/camel-jibx/pom.xml
index 94046b5..81f83d7 100644
--- a/components/camel-jibx/pom.xml
+++ b/components/camel-jibx/pom.xml
@@ -76,85 +76,4 @@
</dependency>
</dependencies>
- <!-- Use JiBX plugin to perform the binding of the test classes. -->
- <!-- A profile is used to allow for skipping of the unit tests -->
- <profiles>
- <profile>
- <id>jibx-for-unit-tests</id>
- <activation>
- <property>
- <name>!maven.test.skip</name>
- </property>
- <jdk>[,1.8)</jdk>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <!-- Eclipse m2e Lifecycle Management -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>${lifecycle-mapping-version}</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.jibx</groupId>
- <artifactId>maven-jibx-plugin</artifactId>
- <versionRange>${jibx-version}</versionRange>
- <goals>
- <goal>test-bind</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.jibx</groupId>
- <artifactId>maven-jibx-plugin</artifactId>
- <version>${jibx-version}</version>
- <configuration>
- <directory>${basedir}/src/test/resources/org/apache/camel/dataformat/jibx/</directory>
- <includes>
- <include>purchaseOrder-jibx.xml</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-bind</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jdk8-test</id>
- <activation>
- <jdk>[1.8,]</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 2ae7da5..75e6261 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -42,6 +42,12 @@
<artifactId>camel-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -76,67 +82,13 @@
</dependency>
</dependencies>
- <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>
- <activation>
- <jdk>[9,)</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>
- </profile>
- </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index bc30272..6942983 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -223,59 +223,5 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa-version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-javaagent:${project.basedir}/target/openjpa-${openjpa-version}.jar ${camel.surefire.fork.vmargs}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index 09d408c..beb01e2 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -69,6 +69,12 @@
<artifactId>mockwebserver</artifactId>
<version>${mockwebserver-version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -104,28 +110,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>mockwebserver</artifactId>
- <version>${mockwebserver-version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml b/components/camel-linkedin/camel-linkedin-api/pom.xml
index d285464..326f4a9 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -210,25 +210,4 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index fd4f009..e139696 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -125,6 +125,12 @@
<version>${assertj-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -140,23 +146,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- required to make MailMimeDecodeHeadersTest work on operating systems with a different default encoding -->
- <argLine>-Dfile.encoding=UTF-8 --add-modules java.activation,java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml
index f2bf41c..8ace4e0 100644
--- a/components/camel-mustache/pom.xml
+++ b/components/camel-mustache/pom.xml
@@ -72,23 +72,4 @@
</dependencies>
- <!-- unit testing requires java 8 -->
- <profiles>
- <profile>
- <id>jdk8-test</id>
- <activation>
- <jdk>!1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml
index 20b9ce9..6763288 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -60,6 +60,12 @@
<artifactId>camel-http4</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty4-http/pom.xml
index e61d6d3..de159a2 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty4-http/pom.xml
@@ -53,6 +53,11 @@
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
<!-- testing -->
<dependency>
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index dcb3949..75401b0 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -83,24 +83,4 @@
</dependency>
</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>
- </profiles>
-
</project>
diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml
index bfd7eb2..0356734 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -93,7 +93,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
<executions>
<execution>
<id>add-javadoc</id>
@@ -115,26 +114,4 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin-version}</version>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-olingo4/camel-olingo4-api/pom.xml b/components/camel-olingo4/camel-olingo4-api/pom.xml
index 2566797..2789f55 100644
--- a/components/camel-olingo4/camel-olingo4-api/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-api/pom.xml
@@ -129,25 +129,4 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-ruby/pom.xml b/components/camel-ruby/pom.xml
index 09cf387..068df92 100644
--- a/components/camel-ruby/pom.xml
+++ b/components/camel-ruby/pom.xml
@@ -78,22 +78,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <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.util.regex=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index b53fcb4..009c4a8 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -62,11 +62,6 @@
<version>${scalaxml-version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>${activation-api-version}</version>
- </dependency>
<!-- test dependencies -->
<dependency>
@@ -214,27 +209,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <!--Skip compile on Java 9 https://issues.apache.org/jira/browse/CAMEL-10904 -->
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>default</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index f2b9e2e..a2d3444 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -53,11 +53,15 @@
</dependency>
<dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>webservices-api</artifactId>
+ <version>${webservices-api-version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
-
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -104,6 +108,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>
@@ -200,78 +208,4 @@
</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>
- <activation>
- <jdk>[9,)</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>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-spark-rest/pom.xml b/components/camel-spark-rest/pom.xml
index bde7527..456a14e 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -144,24 +144,4 @@
</dependencies>
- <!-- unit testing requires java 8 -->
- <profiles>
- <profile>
- <id>jdk8-test</id>
- <activation>
- <jdk>!1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index 51b8cdb..7cc910d 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -156,24 +156,4 @@
</plugin>
</plugins>
</build>
-
- <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</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml
index 527486a..265c3cc 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -94,23 +94,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <reuseForks>true</reuseForks>
- <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>
- </profiles>
</project>
diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml
index 820c781..90de40b 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -43,6 +43,11 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>${spring-data-redis-version}</version>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 9695379..ebea312 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -58,6 +58,11 @@
<version>${javax.servlet-api-version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>webservices-api</artifactId>
+ <version>${webservices-api-version}</version>
+ </dependency>
<!-- spring -->
<dependency>
@@ -76,6 +81,12 @@
<version>${spring-ws-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.springframework.ws</groupId>
@@ -186,66 +197,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</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>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>copy</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jvnet.staxex</groupId>
- <artifactId>stax-ex</artifactId>
- <version>1.7.8</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>1.3.28</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index d24fd9e..b3e5a66 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -174,6 +174,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>${woodstox-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- for testing Spring AOP at class level -->
<dependency>
<groupId>org.aspectj</groupId>
@@ -372,7 +379,36 @@
</execution>
</executions>
</plugin>
-
+
+ <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>${activation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
@@ -540,121 +576,6 @@
<platform.skip.tests>org/apache/camel/spring/management/**/*.java</platform.skip.tests>
</properties>
</profile>
- <profile>
- <id>woodstox</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>${woodstox-version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>jdk8</id>
- <activation>
- <jdk>(,1.8]</jdk>
- </activation>
- <dependencies>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>${woodstox-version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</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>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>${woodstox-version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <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>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-jxc-jdk9</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
- </dependency>
- </dependencies>
- <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>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<reporting>
diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml
index 17bd114..c0bd6f8 100644
--- a/components/camel-swagger/pom.xml
+++ b/components/camel-swagger/pom.xml
@@ -183,41 +183,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <!--Skip compile on Java 9 https://issues.apache.org/jira/browse/CAMEL-10904 -->
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>default</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>default-testCompile</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index 2221eb7..9560861 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -47,6 +47,12 @@
<artifactId>camel-netty4</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -85,22 +91,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml
index 8a7f041..2e65866 100644
--- a/components/camel-telegram/pom.xml
+++ b/components/camel-telegram/pom.xml
@@ -140,22 +140,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index 64af07a..5f1d5ad 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -176,22 +176,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <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</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml
index eefb300..ac46f19 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -73,24 +73,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <reuseForks>true</reuseForks>
- <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>
- </profiles>
</project>
diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml
index 7e7e841..ccd26f5 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -50,8 +50,22 @@
<artifactId>junit</artifactId>
</dependency>
+ <!-- in Java 11+ JAXB is no longer included -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb-version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ <optional>true</optional>
+ </dependency>
+
<!-- optional dependencies for running tests -->
-
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
@@ -67,25 +81,6 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-testcontainers-spring/pom.xml b/components/camel-testcontainers-spring/pom.xml
index 6fd7621..408b118 100644
--- a/components/camel-testcontainers-spring/pom.xml
+++ b/components/camel-testcontainers-spring/pom.xml
@@ -74,22 +74,6 @@
</dependencies>
<profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
<!-- activate integration test if the docker socket file is accessible -->
<profile>
diff --git a/components/camel-testcontainers/pom.xml b/components/camel-testcontainers/pom.xml
index b1333c0..1bc46e4 100644
--- a/components/camel-testcontainers/pom.xml
+++ b/components/camel-testcontainers/pom.xml
@@ -76,22 +76,6 @@
</dependencies>
<profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
<!-- activate integration test if the docker socket file is accessible -->
<profile>
diff --git a/components/camel-testng/pom.xml b/components/camel-testng/pom.xml
index 7a81f31..63afec8 100644
--- a/components/camel-testng/pom.xml
+++ b/components/camel-testng/pom.xml
@@ -82,23 +82,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <reuseForks>true</reuseForks>
- <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-thrift/pom.xml b/components/camel-thrift/pom.xml
index bdb6ee2..71277b1 100644
--- a/components/camel-thrift/pom.xml
+++ b/components/camel-thrift/pom.xml
@@ -49,7 +49,13 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index e5a87ca..e6ee5f2 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -51,6 +51,11 @@
<version>${javax.servlet-api-version}</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ <dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
<version>${undertow-version}</version>
diff --git a/components/camel-velocity/pom.xml b/components/camel-velocity/pom.xml
index 9fecdc5..9fe4b7c 100644
--- a/components/camel-velocity/pom.xml
+++ b/components/camel-velocity/pom.xml
@@ -48,13 +48,6 @@
<artifactId>velocity-engine-core</artifactId>
<version>${velocity-version}</version>
</dependency>
- <!-- in Java 11+ Activation Framework is no longer included -->
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>${activation-api-version}</version>
- <optional>true</optional>
- </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/components/camel-vertx/pom.xml b/components/camel-vertx/pom.xml
index 50d4884..237a438 100644
--- a/components/camel-vertx/pom.xml
+++ b/components/camel-vertx/pom.xml
@@ -77,24 +77,4 @@
</dependency>
</dependencies>
- <!-- unit testing requires java 8 -->
- <profiles>
- <profile>
- <id>jdk8-test</id>
- <activation>
- <jdk>!1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index 9919d34..d381277 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -125,23 +125,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/connectors/camel-connector-maven-plugin/pom.xml b/connectors/camel-connector-maven-plugin/pom.xml
index 3c756f5..176705a 100644
--- a/connectors/camel-connector-maven-plugin/pom.xml
+++ b/connectors/camel-connector-maven-plugin/pom.xml
@@ -51,6 +51,12 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+
<!-- use jackson json parser -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/connectors/examples/beverage-component/pom.xml b/connectors/examples/beverage-component/pom.xml
index 48d41e2..ea13e2e 100644
--- a/connectors/examples/beverage-component/pom.xml
+++ b/connectors/examples/beverage-component/pom.xml
@@ -93,22 +93,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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..2ab5f7d 100644
--- a/connectors/examples/foo-bar-wine-example/pom.xml
+++ b/connectors/examples/foo-bar-wine-example/pom.xml
@@ -105,22 +105,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/connectors/examples/petstore-example/pom.xml b/connectors/examples/petstore-example/pom.xml
index cb495e9..ee1afad 100644
--- a/connectors/examples/petstore-example/pom.xml
+++ b/connectors/examples/petstore-example/pom.xml
@@ -88,6 +88,19 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -108,22 +121,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-cafe/pom.xml b/examples/camel-example-cafe/pom.xml
index 240facb..94c3342 100644
--- a/examples/camel-example-cafe/pom.xml
+++ b/examples/camel-example-cafe/pom.xml
@@ -120,23 +120,5 @@
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
</project>
diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml
index dc237c3..3fbebc6 100644
--- a/examples/camel-example-cdi-metrics/pom.xml
+++ b/examples/camel-example-cdi-metrics/pom.xml
@@ -135,22 +135,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml
index a41b4d1..493f00d 100644
--- a/examples/camel-example-cdi-properties/pom.xml
+++ b/examples/camel-example-cdi-properties/pom.xml
@@ -132,22 +132,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml
index 931a490..874a90f 100644
--- a/examples/camel-example-cdi-rest-servlet/pom.xml
+++ b/examples/camel-example-cdi-rest-servlet/pom.xml
@@ -177,48 +177,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>jdk9+-build-jetty</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty9-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-annotations</artifactId>
- <version>${jetty9-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-jetty-embedded-9</artifactId>
- <version>1.0.0.CR3</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<build>
diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml
index 3bc3919..9aef531 100644
--- a/examples/camel-example-cdi-test/pom.xml
+++ b/examples/camel-example-cdi-test/pom.xml
@@ -116,22 +116,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-cxf-blueprint/pom.xml b/examples/camel-example-cxf-blueprint/pom.xml
index 2f2255a..0040ac7 100644
--- a/examples/camel-example-cxf-blueprint/pom.xml
+++ b/examples/camel-example-cxf-blueprint/pom.xml
@@ -99,23 +99,5 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.activation,java.xml.bind,java.xml.ws,jdk.xml.bind --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 --add-exports=java.xml.ws/com.sun.xml.internal.messaging.saaj.soap.impl=ALL-UNNA [...]
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
</project>
diff --git a/examples/camel-example-cxf-proxy/pom.xml b/examples/camel-example-cxf-proxy/pom.xml
index 1323b3e..4dbe8d2 100644
--- a/examples/camel-example-cxf-proxy/pom.xml
+++ b/examples/camel-example-cxf-proxy/pom.xml
@@ -151,23 +151,5 @@
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.activation,java.xml.bind,java.xml.ws,jdk.xml.bind --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 --add-exports=java.xml.ws/com.sun.xml.internal.messaging.saaj.soap.impl=ALL-UNNA [...]
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
</project>
diff --git a/examples/camel-example-cxf-tomcat/pom.xml b/examples/camel-example-cxf-tomcat/pom.xml
index 45ab7f3..d99c954 100644
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -121,38 +121,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>Tomcat7</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <tomcat.url>http://localhost:8080/manager/text</tomcat.url>
- </properties>
- </profile>
- <profile>
- <id>Tomcat6</id>
- <properties>
- <tomcat.url>http://localhost:8080/manager</tomcat.url>
- </properties>
- </profile>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.activation,java.xml.bind,java.xml.ws,jdk.xml.bind --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 --add-exports=java.xml.ws/com.sun.xml.internal.messaging.saaj.soap.impl=ALL-UNNA [...]
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.xml
index 41e4082..dbd1562 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -243,26 +243,6 @@
<target.main.class>org.apache.camel.example.cxf.jaxrs.Client</target.main.class>
</properties>
</profile>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!--ignore tests until CXF-7520 is resolved and released-->
- <exclude>**/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<build>
diff --git a/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml b/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
index 5730e56..6ec0a13 100644
--- a/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
+++ b/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
@@ -146,22 +146,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-fhir-spring-boot/pom.xml b/examples/camel-example-fhir-spring-boot/pom.xml
index 796ae75..b158eb2 100644
--- a/examples/camel-example-fhir-spring-boot/pom.xml
+++ b/examples/camel-example-fhir-spring-boot/pom.xml
@@ -146,22 +146,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-groovy/pom.xml b/examples/camel-example-groovy/pom.xml
index 3b52796..f27333a 100644
--- a/examples/camel-example-groovy/pom.xml
+++ b/examples/camel-example-groovy/pom.xml
@@ -142,31 +142,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <!--Skip compile on Java 9 https://issues.apache.org/jira/browse/CAMEL-10905 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>default-testCompile</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </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 5fbb1d4..ae98f79 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
@@ -53,6 +53,11 @@
<artifactId>grpc-stub</artifactId>
<version>${grpc-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
</dependencies>
<build>
<extensions>
@@ -166,4 +171,4 @@
</build>
</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 5176fbb..04d4331 100644
--- a/examples/camel-example-loan-broker-cxf/pom.xml
+++ b/examples/camel-example-loan-broker-cxf/pom.xml
@@ -171,22 +171,6 @@
<target.main.class>org.apache.camel.loanbroker.Client</target.main.class>
</properties>
</profile>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <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-opens java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/examples/camel-example-loan-broker-jms/pom.xml b/examples/camel-example-loan-broker-jms/pom.xml
index 9bce830..e030fb7 100644
--- a/examples/camel-example-loan-broker-jms/pom.xml
+++ b/examples/camel-example-loan-broker-jms/pom.xml
@@ -179,22 +179,6 @@
<target.main.class>org.apache.camel.loanbroker.Client</target.main.class>
</properties>
</profile>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <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-opens java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/examples/camel-example-management/pom.xml b/examples/camel-example-management/pom.xml
index c7497de..eb5fde6 100644
--- a/examples/camel-example-management/pom.xml
+++ b/examples/camel-example-management/pom.xml
@@ -138,22 +138,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/camel-example-pojo-messaging/pom.xml
index 18ac626..276fff5 100644
--- a/examples/camel-example-pojo-messaging/pom.xml
+++ b/examples/camel-example-pojo-messaging/pom.xml
@@ -119,6 +119,18 @@
<artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -156,22 +168,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-rabbitmq/pom.xml b/examples/camel-example-rabbitmq/pom.xml
index c2afc8a..6a4c6cd 100644
--- a/examples/camel-example-rabbitmq/pom.xml
+++ b/examples/camel-example-rabbitmq/pom.xml
@@ -136,22 +136,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-reportincident-wssecurity/pom.xml b/examples/camel-example-reportincident-wssecurity/pom.xml
index 051cf51..eab5a73 100644
--- a/examples/camel-example-reportincident-wssecurity/pom.xml
+++ b/examples/camel-example-reportincident-wssecurity/pom.xml
@@ -223,26 +223,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!--ignore tests until CXF-7520 is resolved and released-->
- <exclude>**/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml
index 8575d68..7ceeecf 100644
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -196,22 +196,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <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-opens java.base/java.lang.invoke=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-rest-producer/pom.xml b/examples/camel-example-rest-producer/pom.xml
index 5621d21..fc4adc1 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -137,22 +137,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-scala/pom.xml b/examples/camel-example-scala/pom.xml
index 2b2fe4b..3b60f3c 100644
--- a/examples/camel-example-scala/pom.xml
+++ b/examples/camel-example-scala/pom.xml
@@ -156,27 +156,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <!--Skip compile on Java 9 https://issues.apache.org/jira/browse/CAMEL-10904 -->
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>default</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-spring-boot-activemq/pom.xml b/examples/camel-example-spring-boot-activemq/pom.xml
index f74235a..0a66ceb 100644
--- a/examples/camel-example-spring-boot-activemq/pom.xml
+++ b/examples/camel-example-spring-boot-activemq/pom.xml
@@ -125,24 +125,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens
- java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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 29cdc87..d35a6d2 100644
--- a/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
@@ -46,22 +46,4 @@
<module>cluster-node</module>
</modules>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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 4165a9e..84f076a 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
@@ -52,6 +52,12 @@
<artifactId>grpc-stub</artifactId>
<version>${grpc-version}</version>
</dependency>
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
</dependencies>
<build>
<extensions>
diff --git a/examples/camel-example-spring-boot-health-checks/pom.xml b/examples/camel-example-spring-boot-health-checks/pom.xml
index 0c83439..4f66ca9 100644
--- a/examples/camel-example-spring-boot-health-checks/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/pom.xml
@@ -47,22 +47,4 @@
<module>application</module>
</modules>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-spring-boot-master/pom.xml b/examples/camel-example-spring-boot-master/pom.xml
index be32e35..d166f31 100644
--- a/examples/camel-example-spring-boot-master/pom.xml
+++ b/examples/camel-example-spring-boot-master/pom.xml
@@ -112,22 +112,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-spring-boot-pojo/pom.xml b/examples/camel-example-spring-boot-pojo/pom.xml
index 3d1ebc2..3796439 100644
--- a/examples/camel-example-spring-boot-pojo/pom.xml
+++ b/examples/camel-example-spring-boot-pojo/pom.xml
@@ -110,22 +110,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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 64e9cf3..eda7379 100644
--- a/examples/camel-example-spring-boot-rest-jpa/pom.xml
+++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml
@@ -124,6 +124,19 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -143,24 +156,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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 79f13c6..fa7c958 100644
--- a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
@@ -139,22 +139,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-spring-boot-xml/pom.xml b/examples/camel-example-spring-boot-xml/pom.xml
index 0fed4f3..c97afd9 100644
--- a/examples/camel-example-spring-boot-xml/pom.xml
+++ b/examples/camel-example-spring-boot-xml/pom.xml
@@ -137,22 +137,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-spring-boot/pom.xml b/examples/camel-example-spring-boot/pom.xml
index 3e21f3b..4bb56a6 100644
--- a/examples/camel-example-spring-boot/pom.xml
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -136,22 +136,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml
index 621d31e..25dce64 100644
--- a/examples/camel-example-spring-jms/pom.xml
+++ b/examples/camel-example-spring-jms/pom.xml
@@ -144,22 +144,6 @@
<target.main.class>org.apache.camel.example.client.CamelClientEndpoint</target.main.class>
</properties>
</profile>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<build>
diff --git a/examples/camel-example-transformer-demo/pom.xml b/examples/camel-example-transformer-demo/pom.xml
index cbe6ef6..396da16 100644
--- a/examples/camel-example-transformer-demo/pom.xml
+++ b/examples/camel-example-transformer-demo/pom.xml
@@ -104,22 +104,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-validator-spring-boot/pom.xml b/examples/camel-example-validator-spring-boot/pom.xml
index 2286525..e411a52 100644
--- a/examples/camel-example-validator-spring-boot/pom.xml
+++ b/examples/camel-example-validator-spring-boot/pom.xml
@@ -125,22 +125,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index ae15f68..b75f235 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! -->
+ <activation-api-version>1.2.0</activation-api-version>
<activemq-version>5.15.7</activemq-version>
<activemq-artemis-version>2.6.3</activemq-artemis-version>
<aether-version>1.0.2.v20150114</aether-version>
<ahc-version>2.6.0</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>
@@ -169,9 +171,9 @@
<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.7</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-plugin-version>3.2.3</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.2.0</cxf-xjc-utils-version>
<deltaspike-version>1.9.0</deltaspike-version>
<depends-maven-plugin-version>1.4.0</depends-maven-plugin-version>
@@ -627,6 +629,7 @@
<snakeyaml-version>1.23</snakeyaml-version>
<snappy-version>1.1.4</snappy-version>
<snmp4j-version>2.6.3_1</snmp4j-version>
+ <soap-api-version>1.4.0</soap-api-version>
<solr-bundle-version>7.5.0_1</solr-bundle-version>
<!-- solr version aligned with lucene -->
<solr-version>7.5.0</solr-version>
@@ -706,6 +709,7 @@
<vysper-version>0.7</vysper-version>
<web3j-version>3.6.0</web3j-version>
<web3j-quorum-version>0.8.0</web3j-quorum-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>
@@ -5327,7 +5331,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>
@@ -5832,62 +5836,5 @@
</build>
</profile>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</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 [...]
- <cxf.xjc.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-opens ja [...]
- <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
- <camel.surefire.fork.vmargs>--add-modules java.xml.bind,java.xml.ws,java.xml.ws.annotation,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 [...]
- </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>
- <compilerArgs>
- <arg>-J--add-modules</arg>
- <arg>-Jjava.xml.bind</arg>
- <!-- SB2 actuator endpoint requires MethodParameter metadata -->
- <arg>-parameters</arg>
- </compilerArgs>
- </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 a1fbcfb..b5f83b7 100644
--- a/platforms/camel-catalog-rest/pom.xml
+++ b/platforms/camel-catalog-rest/pom.xml
@@ -173,51 +173,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <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>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>copy</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index dc16fdc..02121ca 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -373,22 +373,4 @@
<module>camel-zookeeper-master-starter</module>
<module>camel-zookeeper-starter</module>
</modules>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 8db69b3..7c5b921 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3206,142 +3206,142 @@
<dependency>
<groupId>org.apache.cxf.services.sts</groupId>
<artifactId>cxf-services-sts-core</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.services.ws-discovery</groupId>
<artifactId>cxf-services-ws-discovery-api</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-clustering</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-logging</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-mex</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security-oauth2</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
- <version>3.2.7</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>
diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml
index 309bc07..b705fdf 100644
--- a/tests/camel-blueprint-cxf-test/pom.xml
+++ b/tests/camel-blueprint-cxf-test/pom.xml
@@ -191,26 +191,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!--ignore tests until CXF-7520 is resolved and released-->
- <exclude>**/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/tests/camel-blueprint-test/pom.xml b/tests/camel-blueprint-test/pom.xml
index d724be5..499048b 100644
--- a/tests/camel-blueprint-test/pom.xml
+++ b/tests/camel-blueprint-test/pom.xml
@@ -62,22 +62,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 33984e8..1410cc1 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -469,26 +469,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- exclude doc tests as they dont work on CI server -->
- <exclude>**/*DocumentationTest.*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/tooling/apt/pom.xml b/tooling/apt/pom.xml
index c44dc85..e0de7a8 100644
--- a/tooling/apt/pom.xml
+++ b/tooling/apt/pom.xml
@@ -51,6 +51,12 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml
index ab268a8..5fb6cfd 100644
--- a/tooling/maven/camel-api-component-maven-plugin/pom.xml
+++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml
@@ -176,11 +176,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
+ <version>3.6.0</version>
<executions>
<execution>
<id>mojo-descriptor</id>
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 37dcbae..8d3e530 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.0</version>
<configuration>
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
@@ -180,29 +180,4 @@
</pluginManagement>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 01be522..3bdc9cf 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -150,6 +150,27 @@
<version>${freemarker-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-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>
+
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -194,20 +215,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jigsaw</id>
- <activation>
- <jdk>[1.9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index d4a7052..3ea7dfa 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -110,6 +110,21 @@
<version>2.3.0</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-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>
+ <dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.5</version>
@@ -117,20 +132,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jigsaw</id>
- <activation>
- <jdk>[1.9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
index f30dfe0..55fd1e8 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
@@ -59,6 +59,11 @@
<artifactId>threetenbp</artifactId>
<version>1.3.7</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>@annotation-api-version@</version>
+ </dependency>
</dependencies>
<build>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
index a564b6a..3ffa8cb 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
@@ -59,6 +59,11 @@
<artifactId>threetenbp</artifactId>
<version>1.3.7</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>@annotation-api-version@</version>
+ </dependency>
</dependencies>
<build>
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index 23f3053..0405021 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -47,6 +47,26 @@
<artifactId>swagger-parser</artifactId>
<version>${swagger-java-parser-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-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>
<!-- test -->
<dependency>
[camel] 15/19: CAMEL-12618: add Glassfish JAXB implementation ...
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 d58bedb93634b5c58678c38ef3a4ff22b2893a9c
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Nov 12 11:19:45 2018 +0100
CAMEL-12618: add Glassfish JAXB implementation ...
...to camel-hazelcast
---
components/camel-hazelcast/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml
index b1e5a62..9a93acf 100644
--- a/components/camel-hazelcast/pom.xml
+++ b/components/camel-hazelcast/pom.xml
@@ -96,6 +96,12 @@
<artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
[camel] 19/19: CAMEL-12618: add JAXB API and Glassfish JAXB im...
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 0e40e84fc81c15dc0ee699764636ccdadeeddb10
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Nov 14 16:30:49 2018 +0100
CAMEL-12618: add JAXB API and Glassfish JAXB im...
...plementation to camel-cdi
---
components/camel-cdi/pom.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 941df1e..9f0563a 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -90,6 +90,12 @@
<version>${annotation-api-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
<!-- DeltaSpike is only used to provide Main support thus optional -->
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
@@ -196,6 +202,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<profiles>
[camel] 13/19: CAMEL-12618: add Glassfish JAXB implementation ...
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 e9ce404f2981b05b4992d9a04e63befe242d8a42
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Nov 12 11:18:16 2018 +0100
CAMEL-12618: add Glassfish JAXB implementation ...
...to camel-blueprint
This adds JAXB implementation as a runtime dependency for Camel
Blueprint.
---
components/camel-blueprint/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index daed9e0..1364a96 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -97,6 +97,12 @@
<artifactId>jaxb-api</artifactId>
<version>${jaxb-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- for testing -->
<dependency>
[camel] 12/19: CAMEL-12618: add Glassfish JAXB implementation ...
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 f24b5d1674a2b2ab4f7ed2fc431b00d5efc07498
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Nov 12 11:16:41 2018 +0100
CAMEL-12618: add Glassfish JAXB implementation ...
...to camel-xmlsecurity
---
components/camel-xmlsecurity/pom.xml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml
index f8fc6a7..119a9bb 100644
--- a/components/camel-xmlsecurity/pom.xml
+++ b/components/camel-xmlsecurity/pom.xml
@@ -73,7 +73,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
@@ -104,13 +104,19 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${bouncycastle-version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
[camel] 17/19: CAMEL-12618: add Glassfish JAXB implementation ...
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 b901574a4e4d8482922847a6b2480c331ed33125
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Nov 13 00:00:50 2018 +0100
CAMEL-12618: add Glassfish JAXB implementation ...
...to camel-spring-boot
---
components/camel-spring-boot/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index 7cc910d..7c9d054 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -70,6 +70,13 @@
<artifactId>camel-spring</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
<!-- Optional Spring web support -->
<dependency>
<groupId>org.springframework</groupId>
[camel] 01/19: Temporary disable JDK 9 and karaf-itest and spr...
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 f97f07b46dcf0a4450884bb079a87fb3c6ece54b
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Aug 22 14:38:04 2018 +0200
Temporary disable JDK 9 and karaf-itest and spr...
...ing-itest builds
---
Jenkinsfile.daily | 42 +++---------------------------------------
1 file changed, 3 insertions(+), 39 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 86051db..9783c16 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
}
}
}
@@ -74,48 +74,12 @@ pipeline {
steps {
dir("tests/camel-itest-spring-boot/") {
script {
- spring_boot_itests_result = sh script: "../../mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
+ spring_boot_itests_result = sh script: "true || ../../mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
}
}
}
}
- stage('Test JDK 9') {
- tools {
- jdk 'JDK 1.9 (latest)'
- }
- steps {
- script {
- jdk9_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
- }
- }
- post {
- always {
- junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml'
- junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/*.xml'
- sh "find . -path '*/target/surefire-reports/*' -delete -o -path '*/target/failsafe-reports/*' -delete"
- }
- }
- }
-
- stage('Test JDK 10') {
- tools {
- jdk 'JDK 10 (latest)'
- }
- steps {
- script {
- jdk10_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
- }
- }
- post {
- always {
- junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml'
- junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/*.xml'
- sh "find . -path '*/target/surefire-reports/*' -delete -o -path '*/target/failsafe-reports/*' -delete"
- }
- }
- }
-
stage('Test JDK 11') {
tools {
jdk 'JDK 11 (latest)'
[camel] 03/19: CAMEL-12618: upgrade Groovy Eclipse compiler
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 79dfaa27ecb1a05412eb4e1f43625689dd479c5b
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Aug 23 10:56:33 2018 +0200
CAMEL-12618: upgrade Groovy Eclipse compiler
---
archetypes/camel-archetype-groovy/pom.xml | 13 ++++++++++++-
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
components/camel-grape/pom.xml | 8 +++-----
components/camel-groovy-dsl/pom.xml | 4 ++--
examples/camel-example-groovy/pom.xml | 4 ++--
parent/pom.xml | 2 ++
pom.xml | 12 ++++++++++++
7 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/archetypes/camel-archetype-groovy/pom.xml b/archetypes/camel-archetype-groovy/pom.xml
index 88aae76..6ab4ddd 100644
--- a/archetypes/camel-archetype-groovy/pom.xml
+++ b/archetypes/camel-archetype-groovy/pom.xml
@@ -46,7 +46,7 @@
<resources>
<resource>
<directory>src/main/resources</directory>
- <filtering>false</filtering>
+ <filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources-filtered</directory>
@@ -56,6 +56,17 @@
</includes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>@</delimiter>
+ </delimiters>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
index ed27546..18b945b 100644
--- a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.9.2-01</version>
+ <version>@groovy-eclipse-compiler-version@</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>2.4.3-01</version>
+ <version>@groovy-eclipse-batch-version@</version>
</dependency>
</dependencies>
</plugin>
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index 151d7ed..f4512c4 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -32,8 +32,6 @@
<description>The grape component allows you to fetch, load and manage additional jars when CamelContext is running</description>
<properties>
- <groovy-eclipse-batch.version>2.4.3-01</groovy-eclipse-batch.version>
- <groovy-eclipse-compiler.version>2.9.2-01</groovy-eclipse-compiler.version>
<plexus-compiler-api.version>2.8.3</plexus-compiler-api.version>
<camel.osgi.export.pkg />
</properties>
@@ -95,12 +93,12 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>${groovy-eclipse-batch.version}</version>
+ <version>${groovy-eclipse-batch-version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>${groovy-eclipse-compiler.version}</version>
+ <version>${groovy-eclipse-compiler-version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -115,7 +113,7 @@
<plugin>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>${groovy-eclipse-compiler.version}</version>
+ <version>${groovy-eclipse-compiler-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
diff --git a/components/camel-groovy-dsl/pom.xml b/components/camel-groovy-dsl/pom.xml
index 5f52616..b465c7b 100644
--- a/components/camel-groovy-dsl/pom.xml
+++ b/components/camel-groovy-dsl/pom.xml
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.9.2-01</version>
+ <version>${groovy-eclipse-compiler-version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
@@ -149,7 +149,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>2.4.3-01</version>
+ <version>${groovy-eclipse-batch-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/examples/camel-example-groovy/pom.xml b/examples/camel-example-groovy/pom.xml
index 9ff4d69..3b52796 100644
--- a/examples/camel-example-groovy/pom.xml
+++ b/examples/camel-example-groovy/pom.xml
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.9.2-01</version>
+ <version>${groovy-eclipse-compiler-version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>2.4.3-01</version>
+ <version>${groovy-eclipse-batch-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index a5924a5..9f7334a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -268,6 +268,8 @@
<google-mail-guava-version>17.0</google-mail-guava-version>
<google-truth-version>0.30</google-truth-version>
<grizzly-websockets-version>2.3.25</grizzly-websockets-version>
+ <groovy-eclipse-compiler-version>3.0.0-01</groovy-eclipse-compiler-version>
+ <groovy-eclipse-batch-version>2.5.2-01</groovy-eclipse-batch-version>
<grpc-version>1.15.0</grpc-version>
<grpc-google-auth-library-version>0.9.0</grpc-google-auth-library-version>
<grpc-guava-version>20.0</grpc-guava-version>
diff --git a/pom.xml b/pom.xml
index 9a4dec9..193a7cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,6 +149,18 @@
<enabled>false</enabled>
</releases>
</pluginRepository>
+ <!-- needed for Groovy Eclipse plugin -->
+ <pluginRepository>
+ <id>bintray</id>
+ <url>https://dl.bintray.com/groovy/maven</url>
+ <name>Bintray Repository</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
</pluginRepositories>
<modules>
[camel] 02/19: CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
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 de585df3145ff1fd0e6b69a25ede7bd4233a83db
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Aug 17 12:33:14 2018 +0200
CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
...enplus plugin
There is no released Groovy version that supports Java 11[1], so this
uses a snapshot version in the configuration of the gmavenplus plugin so
the build can be performed on Java 11.
[1] https://issues.apache.org/jira/browse/GROOVY-8727
---
buildingtools/pom.xml | 14 -------
components/camel-grpc/pom.xml | 14 -------
.../camel-olingo2/camel-olingo2-component/pom.xml | 8 ----
components/camel-protobuf/pom.xml | 14 -------
pom.xml | 44 ++++++++++++++++++++++
5 files changed, 44 insertions(+), 50 deletions(-)
diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index 61a4b3a..72bc780 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -113,20 +113,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-xml</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<!--
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 5cca9a9..f7719eb 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -172,20 +172,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
</plugin>
<!-- gRPC and protobuf Java code generator plugin -->
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index 73f4501..46f190c 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -330,14 +330,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index 8f032c2..86b3827 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -125,20 +125,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
</plugin>
<!-- Protobuf Java code generator plugin -->
diff --git a/pom.xml b/pom.xml
index 0186a70..9a4dec9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,17 @@
<enabled>false</enabled>
</releases>
</pluginRepository>
+ <!-- needed for Groovy SNAPSHOTs see gmaven plugin below -->
+ <pluginRepository>
+ <id>oss.jfrog.org-snapshots</id>
+ <url>https://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
</pluginRepositories>
<modules>
@@ -332,6 +343,39 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>${gmavenplus-plugin-version}</version>
+ <dependencies>
+ <!-- until we get a release that fixes https://issues.apache.org/jira/browse/GROOVY-8727
+ we use a snapshot version
+ -->
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <!--<version>${groovy-version}</version>-->
+ <version>3.0.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ <!--<version>${groovy-version}</version>-->
+ <version>3.0.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <!--<version>${groovy-version}</version>-->
+ <version>3.0.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
+
</plugins>
</pluginManagement>
</build>
[camel] 04/19: Upgrade Hibernate to 5.3.6.Final
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 1e675578d0b1a89c725f66fa5cdb6fcf6a0a1298
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Sep 24 12:21:46 2018 +0200
Upgrade Hibernate to 5.3.6.Final
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9f7334a..568ad58 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -297,7 +297,7 @@
<hessian-version>4.0.51</hessian-version>
<hdrhistrogram-version>2.1.10</hdrhistrogram-version>
<hibernate-validator-version>6.0.13.Final</hibernate-validator-version>
- <hibernate-version>5.2.16.Final</hibernate-version>
+ <hibernate-version>5.3.6.Final</hibernate-version>
<hikaricp-version>2.3.13</hikaricp-version>
<hk2-version>2.3.0</hk2-version>
<hk2-osgi-resource-version>1.0.1</hk2-osgi-resource-version>
[camel] 06/19: update velocity/pom.xml
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 7e31e2e88de3195d42863e875fb6eb2d39481116
Author: önder sezgin <on...@apache.org>
AuthorDate: Fri Nov 2 11:42:04 2018 +0300
update velocity/pom.xml
add activation-api directly
---
components/camel-velocity/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/components/camel-velocity/pom.xml b/components/camel-velocity/pom.xml
index 9fe4b7c..9fecdc5 100644
--- a/components/camel-velocity/pom.xml
+++ b/components/camel-velocity/pom.xml
@@ -48,6 +48,13 @@
<artifactId>velocity-engine-core</artifactId>
<version>${velocity-version}</version>
</dependency>
+ <!-- in Java 11+ Activation Framework is no longer included -->
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ <optional>true</optional>
+ </dependency>
<!-- test dependencies -->
<dependency>
[camel] 10/19: CAMEL-12618: replace com.sun.xml.bind with org....
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 e6c35646845ad8c701ddd55b6fca3e7defaf110c
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Nov 9 11:19:58 2018 +0100
CAMEL-12618: replace com.sun.xml.bind with org....
...glassfish.jaxb
This replaces the `com.sun.xml.bind:jaxb-core` and
`com.sun.xml.bind:jaxb-impl` dependencies with
`org.glassfish.jaxb:jaxb-runtime`.
And `com.sun.xml.bind:jaxb-jxc` with `org.glassfish.jaxb:jaxb-jxc`.
---
camel-core/pom.xml | 12 ++----
components/camel-jaxb/pom.xml | 9 ++--
components/camel-soap/pom.xml | 5 ++-
components/camel-spring/pom.xml | 6 +++
components/camel-test/pom.xml | 12 ++----
connectors/examples/petstore-example/pom.xml | 12 ++----
examples/camel-example-pojo-messaging/pom.xml | 12 ++----
.../camel-example-spring-boot-rest-jpa/pom.xml | 12 ++----
parent/pom.xml | 48 ++++------------------
.../camel-spring-boot-dependencies/pom.xml | 26 +++---------
pom.xml | 16 +++-----
tooling/maven/camel-package-maven-plugin/pom.xml | 11 ++---
tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 11 ++---
tooling/swagger-rest-dsl-generator/pom.xml | 11 ++---
14 files changed, 55 insertions(+), 148 deletions(-)
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index d34a714..b65f8b2 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -150,15 +150,9 @@
<version>${jaxb-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
<optional>true</optional>
</dependency>
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index b09f0f1..929c9d8 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -52,12 +52,9 @@
<version>${jaxb-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<!-- for testing -->
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index a2d3444..6843c29 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -58,8 +58,9 @@
<version>${webservices-api-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<!-- test dependencies -->
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index b3e5a66..a08cc3b 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -206,6 +206,12 @@
<version>${assertj-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml
index ccd26f5..ed28a2a 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -52,15 +52,9 @@
<!-- in Java 11+ JAXB is no longer included -->
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
<optional>true</optional>
</dependency>
diff --git a/connectors/examples/petstore-example/pom.xml b/connectors/examples/petstore-example/pom.xml
index ee1afad..0d3d763 100644
--- a/connectors/examples/petstore-example/pom.xml
+++ b/connectors/examples/petstore-example/pom.xml
@@ -89,15 +89,9 @@
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
<scope>test</scope>
</dependency>
diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/camel-example-pojo-messaging/pom.xml
index 276fff5..4716bee 100644
--- a/examples/camel-example-pojo-messaging/pom.xml
+++ b/examples/camel-example-pojo-messaging/pom.xml
@@ -120,15 +120,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/examples/camel-example-spring-boot-rest-jpa/pom.xml b/examples/camel-example-spring-boot-rest-jpa/pom.xml
index eda7379..629fee6 100644
--- a/examples/camel-example-spring-boot-rest-jpa/pom.xml
+++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml
@@ -125,15 +125,9 @@
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
<scope>test</scope>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index b75f235..30fa28c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4081,26 +4081,11 @@
<version>${stax-api-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-jxc</artifactId>
- <version>${jaxb-version}</version>
+ <version>${jaxb-runtime-version}</version>
</dependency>
+
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
@@ -5057,14 +5042,14 @@
<version>${maven-antrun-plugin-version}</version>
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-jxc</artifactId>
- <version>${jaxb-version}</version>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
@@ -5710,23 +5695,6 @@
</profile>
<profile>
- <id>jdk1.8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>integration</id>
<!--The profile for running the unit and integration test -->
<build>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 7c5b921..31ab71d 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -121,27 +121,6 @@
<version>0.4.9</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.3.0</version>
- <exclusions>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-jxc</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
<version>1.4.5</version>
@@ -3501,6 +3480,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-jxc</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ <dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1.3</version>
diff --git a/pom.xml b/pom.xml
index 9003a32..988a608 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
<!-- eclipse plugin need the jaxb in this pom.xml file -->
<!-- Make sure to keep JAXB version up to date in parent/pom.xml in the bottom of the file -->
<jaxb-version>2.3.0</jaxb-version>
+ <jaxb-runtime-version>2.3.1</jaxb-runtime-version>
<errorprone-version>2.5</errorprone-version>
<mycila-license-version>3.0</mycila-license-version>
<gmavenplus-plugin-version>1.6.2</gmavenplus-plugin-version>
@@ -505,19 +506,14 @@
<artifactId>maven-antrun-plugin</artifactId>
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-jxc</artifactId>
- <version>${jaxb-version}</version>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 3bdc9cf..dc64d0f 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -161,14 +161,9 @@
<version>${jaxb-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>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<!-- logging -->
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index 3ea7dfa..f1d6d79 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -115,14 +115,9 @@
<version>${annotation-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>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index 0405021..6cf8654 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -58,14 +58,9 @@
<version>${jaxb-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>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<!-- test -->
[camel] 05/19: Upgrade Scala to 2.12.7
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 045f9e2cec05a3218e5c41297c99edd3d33af2ed
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Nov 1 12:59:13 2018 +0100
Upgrade Scala to 2.12.7
---
.mvn/wrapper/maven-wrapper.properties | 2 +-
components/camel-scala/pom.xml | 5 +++++
.../src/main/scala/org/apache/camel/scala/Preamble.scala | 4 ++--
.../scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala | 9 ++++++++-
.../scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala | 4 ++--
parent/pom.xml | 4 ++--
6 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index b573bb5..6c8c0e0 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index 90138fa..b53fcb4 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -62,6 +62,11 @@
<version>${scalaxml-version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
index a28beeb..1e90953 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
@@ -82,7 +82,7 @@ trait Preamble {
(exchange: Exchange) =>
run(exchange) map {
case () => throw new RuntimeTransformException("Unit result cannot be used in Predicate")
- case v => v
+ case v : Boolean => v
} getOrElse false
override def process(exchange: Exchange) {
@@ -148,4 +148,4 @@ trait Preamble {
* `import org.apache.camel.scala.Preamble._`
*
*/
-object Preamble extends Preamble
\ No newline at end of file
+object Preamble extends Preamble
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
index bc5084e..ff01bce 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
@@ -135,7 +135,14 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
def routingSlip(expression: Exchange => Any) = wrap(target.routingSlip(expression))
def script(expression: Exchange => Any) = wrap(target.script(expression))
- def setBody(expression: Exchange => Any) = wrap(target.setBody(expression))
+ def setBody(expression: Exchange => Any) = {
+ val fn = new java.util.function.Function[Exchange, Any] {
+ override def apply(exchange: Exchange) = {
+ expression(exchange)
+ }
+ }
+ wrap(target.setBody(fn))
+ }
def setFaultBody(expression: Exchange => Any) = wrap(target.setFaultBody(expression))
def setHeader(name: String, expression: Exchange => Any) = wrap(target.setHeader(name, expression))
def setExchangePattern(mep: ExchangePattern) = wrap(target.setExchangePattern(mep))
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
index a1db7a4..21347a0 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
@@ -25,7 +25,7 @@ class SOnCompletionWhenTest extends OnCompletionWhenTest with RouteBuilderSuppor
override def createRouteBuilder = new RouteBuilder {
"direct:start" ==> {
- onCompletion(containsHello(_)) {
+ onCompletion(containsHello(_: Exchange)) {
to("mock:sync")
}
to("mock:result")
@@ -34,4 +34,4 @@ class SOnCompletionWhenTest extends OnCompletionWhenTest with RouteBuilderSuppor
def containsHello(exchange: Exchange) = exchange.getIn.getBody(classOf[String]).contains("Hello")
}
-}
\ No newline at end of file
+}
diff --git a/parent/pom.xml b/parent/pom.xml
index 568ad58..ae15f68 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -605,8 +605,8 @@
<saaj-impl-version>1.3.2_2</saaj-impl-version>
<saxon-bundle-version>9.8.0-14_1</saxon-bundle-version>
<saxon-version>9.8.0-14</saxon-version>
- <scala-version>2.11.7</scala-version>
- <scala-maven-plugin-version>3.2.2</scala-maven-plugin-version>
+ <scala-version>2.12.7</scala-version>
+ <scala-maven-plugin-version>3.4.2</scala-maven-plugin-version>
<scalatest-version>2.2.5</scalatest-version>
<scalaxml-version>1.0.6</scalaxml-version>
<scribe-version>1.3.7</scribe-version>
[camel] 18/19: CAMEL-12618: Fix SimpleTest on Java 11+
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 70f26d335f0c4333bcd90dce0133eade9a707930
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Nov 14 15:29:03 2018 +0100
CAMEL-12618: Fix SimpleTest on Java 11+
---
.../src/test/java/org/apache/camel/language/simple/SimpleTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 69505cd..5d93e73 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -48,7 +48,7 @@ import org.junit.Test;
public class SimpleTest extends LanguageTestSupport {
private static final String JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG = "Index: 2, Size: 2";
- private static final String INDEX_OUT_OF_BOUNDS_ERROR_MSG = "Index 2 out-of-bounds for length 2";
+ private static final String INDEX_OUT_OF_BOUNDS_ERROR_MSG = "Index 2 out of bounds for length 2";
@Override
protected JndiRegistry createRegistry() throws Exception {
[camel] 11/19: CAMEL-12618: add Glassfish JAXB implementation ...
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 15dd5fff919938448a27753a940e6cc853c14a34
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Nov 12 11:14:54 2018 +0100
CAMEL-12618: add Glassfish JAXB implementation ...
...to camel-spring-test
---
components/camel-test-spring/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml
index ac46f19..1e5eb42 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -55,6 +55,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
+ <optional>true</optional>
+ </dependency>
<!-- test dependencies -->
<dependency>