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/07/18 11:41:26 UTC
[camel] branch java-10-test updated (4c4131a -> 26e05d5)
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 4c4131a CAMEL-12618: Additional dependencies needed on ...
discard d8121b3 CAMEL-12618: Support APT on Java 11
discard 89dd1ac CAMEL-12618: Use MVEL version that supports Java 11
discard 0e058ae Temporary disable JDK 9 build
add 1eacac5 Upgrade Jettison to version 1.4.0
add 60a9625 Camel 12644 - Generate documentation for Spring Boot starters (#2430)
add 99692d9 Removed telegram bot key from doc
add f6e32ce Regen
add cfbd615 Fix camel-fhir Karaf feature
add 8bde80e Add camel-fhir OSGi example
add 236380a CAMEL-12660: spring-boot auto configuration option for enabled should be generated in the source with javadoc so the spring tooling can grab its description in its metadata file.
add 4d33c77 Fix CS
add 7a954c3 CAMEL-11158 - Camel-Kubernetes: Add support for Job resources
add 32083ff CAMEL-11158 - Fixed CS
add 73e4b72 CAMEL-11158 - Added docs
add 0bd2bc4 Regen
new 9015bef Temporary disable JDK 9 build
new d3cbc24 CAMEL-12618: Use MVEL version that supports Java 11
new 06f7aec CAMEL-12618: Support APT on Java 11
new 26e05d5 CAMEL-12618: Additional dependencies needed on ...
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4c4131a)
\
N -- N -- N refs/heads/java-10-test (26e05d5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/docs/ahc-ws-component.adoc | 40 ++
.../camel-ahc/src/main/docs/ahc-component.adoc | 40 ++
.../camel-amqp/src/main/docs/amqp-component.adoc | 352 ++++++++++
.../camel-apns/src/main/docs/apns-component.adoc | 21 +
.../src/main/docs/as2-component.adoc | 88 ++-
.../camel-asn1/src/main/docs/asn1-dataformat.adoc | 23 +
.../src/main/docs/asterisk-component.adoc | 18 +
.../camel-atmos/src/main/docs/atmos-component.adoc | 22 +
.../main/docs/atmosphere-websocket-component.adoc | 40 ++
.../camel-atom/src/main/docs/atom-component.adoc | 18 +
.../src/main/docs/atomix-map-component.adoc | 28 +
.../src/main/docs/atomix-messaging-component.adoc | 28 +
.../src/main/docs/atomix-multimap-component.adoc | 28 +
.../src/main/docs/atomix-queue-component.adoc | 25 +
.../src/main/docs/atomix-set-component.adoc | 26 +
.../src/main/docs/atomix-value-component.adoc | 26 +
.../camel-avro/src/main/docs/avro-component.adoc | 41 ++
.../camel-avro/src/main/docs/avro-dataformat.adoc | 41 ++
.../camel-aws/src/main/docs/aws-cw-component.adoc | 32 +
.../camel-aws/src/main/docs/aws-ddb-component.adoc | 37 +
.../src/main/docs/aws-ddbstream-component.adoc | 31 +
.../camel-aws/src/main/docs/aws-ec2-component.adoc | 32 +
.../src/main/docs/aws-kinesis-component.adoc | 33 +
.../main/docs/aws-kinesis-firehose-component.adoc | 28 +
.../camel-aws/src/main/docs/aws-kms-component.adoc | 29 +
.../src/main/docs/aws-lambda-component.adoc | 31 +
.../camel-aws/src/main/docs/aws-mq-component.adoc | 30 +
.../camel-aws/src/main/docs/aws-s3-component.adoc | 79 +++
.../camel-aws/src/main/docs/aws-sdb-component.adoc | 18 +
.../camel-aws/src/main/docs/aws-ses-component.adoc | 36 +
.../camel-aws/src/main/docs/aws-sns-component.adoc | 33 +
.../camel-aws/src/main/docs/aws-sqs-component.adoc | 69 ++
.../camel-aws/src/main/docs/aws-swf-component.adoc | 78 +++
.../src/main/docs/azure-blob-component.adoc | 18 +
.../src/main/docs/azure-queue-component.adoc | 18 +
.../src/main/docs/barcode-dataformat.adoc | 23 +
.../src/main/docs/base64-dataformat.adoc | 25 +
.../src/main/docs/bean-validator-component.adoc | 18 +
.../src/main/docs/beanio-dataformat.adoc | 36 +
.../src/main/docs/beanstalk-component.adoc | 23 +
.../src/main/docs/bindy-dataformat.adoc | 47 ++
.../src/main/docs/bonita-component.adoc | 18 +
.../camel-boon/src/main/docs/boon-dataformat.adoc | 21 +
.../src/main/docs/box-component.adoc | 94 +++
.../src/main/docs/braintree-component.adoc | 32 +
.../camel-cache/src/main/docs/cache-component.adoc | 41 ++
.../src/main/docs/caffeine-cache-component.adoc | 39 ++
.../main/docs/caffeine-loadcache-component.adoc | 39 ++
.../src/main/docs/cql-component.adoc | 16 +
.../src/main/docs/castor-dataformat.adoc | 37 +
.../src/main/docs/chronicle-engine-component.adoc | 18 +
.../camel-chunk/src/main/docs/chunk-component.adoc | 18 +
.../src/main/docs/cm-sms-component.adoc | 18 +
.../camel-cmis/src/main/docs/cmis-component.adoc | 21 +
.../camel-coap/src/main/docs/coap-component.adoc | 18 +
.../src/main/docs/cometd-component.adoc | 28 +
.../src/main/docs/consul-component.adoc | 124 ++++
.../src/main/docs/context-component.adoc | 18 +
.../src/main/docs/couchbase-component.adoc | 18 +
.../src/main/docs/couchdb-component.adoc | 18 +
.../src/main/docs/crypto-cms-component.adoc | 27 +
.../src/main/docs/crypto-component.adoc | 95 +++
.../src/main/docs/crypto-dataformat.adoc | 95 +++
.../camel-csv/src/main/docs/csv-dataformat.adoc | 53 ++
.../camel-cxf/src/main/docs/cxf-component.adoc | 26 +
.../camel-cxf/src/main/docs/cxfrs-component.adoc | 22 +
.../src/main/docs/digitalocean-component.adoc | 18 +
.../src/main/docs/disruptor-component.adoc | 42 ++
.../camel-dns/src/main/docs/dns-component.adoc | 18 +
.../src/main/docs/docker-component.adoc | 37 +
.../camel-dozer/src/main/docs/dozer-component.adoc | 18 +
.../camel-drill/src/main/docs/drill-component.adoc | 18 +
.../src/main/docs/dropbox-component.adoc | 18 +
.../src/main/docs/ehcache-component.adoc | 50 ++
.../main/docs/elasticsearch-rest-component.adoc | 37 +
.../src/main/docs/elasticsearch-component.adoc | 21 +
.../src/main/docs/elasticsearch5-component.adoc | 22 +
.../camel-elsql/src/main/docs/elsql-component.adoc | 29 +
.../camel-etcd/src/main/docs/etcd-component.adoc | 48 ++
.../camel-exec/src/main/docs/exec-component.adoc | 18 +
.../src/main/docs/facebook-component.adoc | 47 ++
.../src/main/docs/json-fastjson-dataformat.adoc | 73 ++
components/camel-fhir/camel-fhir-component/pom.xml | 4 +-
.../src/main/docs/fhir-component.adoc | 50 +-
.../src/main/docs/fhirJson-dataformat.adoc | 22 +-
.../src/main/docs/fhirXml-dataformat.adoc | 21 +
.../src/main/docs/flatpack-component.adoc | 36 +
.../src/main/docs/flatpack-dataformat.adoc | 36 +
.../camel-flink/src/main/docs/flink-component.adoc | 26 +
.../camel-fop/src/main/docs/fop-component.adoc | 18 +
.../src/main/docs/freemarker-component.adoc | 20 +
.../camel-ftp/src/main/docs/ftp-component.adoc | 18 +
.../camel-ftp/src/main/docs/ftps-component.adoc | 19 +
.../src/main/docs/ganglia-component.adoc | 38 ++
.../src/main/docs/geocoder-component.adoc | 18 +
.../camel-git/src/main/docs/git-component.adoc | 18 +
.../src/main/docs/github-component.adoc | 18 +
.../src/main/docs/google-bigquery-component.adoc | 21 +
.../src/main/docs/google-calendar-component.adoc | 43 ++
.../src/main/docs/google-drive-component.adoc | 35 +
.../src/main/docs/google-mail-component.adoc | 32 +
.../main/docs/google-mail-stream-component.adoc | 38 ++
.../src/main/docs/google-pubsub-component.adoc | 18 +
.../camel-gora/src/main/docs/gora-component.adoc | 18 +
.../src/main/docs/groovy-language.adoc | 19 +-
.../camel-grpc/src/main/docs/grpc-component.adoc | 18 +
.../src/main/docs/json-gson-dataformat.adoc | 74 ++
.../src/main/docs/guava-eventbus-component.adoc | 25 +
.../main/docs/hazelcast-atomicvalue-component.adoc | 26 +
.../main/docs/hazelcast-instance-component.adoc | 46 ++
.../src/main/docs/hazelcast-list-component.adoc | 26 +
.../src/main/docs/hazelcast-map-component.adoc | 26 +
.../main/docs/hazelcast-multimap-component.adoc | 26 +
.../src/main/docs/hazelcast-queue-component.adoc | 26 +
.../docs/hazelcast-replicatedmap-component.adoc | 26 +
.../main/docs/hazelcast-ringbuffer-component.adoc | 26 +
.../src/main/docs/hazelcast-seda-component.adoc | 26 +
.../src/main/docs/hazelcast-set-component.adoc | 26 +
.../src/main/docs/hazelcast-topic-component.adoc | 28 +
.../camel-hbase/src/main/docs/hbase-component.adoc | 22 +
.../camel-hdfs/src/main/docs/hdfs-component.adoc | 20 +
.../camel-hdfs2/src/main/docs/hdfs2-component.adoc | 20 +
.../src/main/docs/hessian-dataformat.adoc | 22 +
.../src/main/docs/hipchat-component.adoc | 18 +
.../camel-hl7/src/main/docs/hl7-dataformat.adoc | 23 +
.../camel-http/src/main/docs/http-component.adoc | 37 +
.../camel-http4/src/main/docs/http4-component.adoc | 73 ++
.../camel-hystrix/src/main/docs/hystrix.adoc | 17 +-
.../camel-ical/src/main/docs/ical-dataformat.adoc | 20 +
.../src/main/docs/iec60870-client-component.adoc | 21 +
.../src/main/docs/iec60870-server-component.adoc | 34 +
.../src/main/docs/ignite-cache-component.adoc | 23 +
.../src/main/docs/ignite-compute-component.adoc | 23 +
.../src/main/docs/ignite-events-component.adoc | 23 +
.../src/main/docs/ignite-idgen-component.adoc | 23 +
.../src/main/docs/ignite-messaging-component.adoc | 23 +
.../src/main/docs/ignite-queue-component.adoc | 23 +
.../src/main/docs/ignite-set-component.adoc | 23 +
.../src/main/docs/infinispan-component.adoc | 59 ++
.../src/main/docs/influxdb-component.adoc | 18 +
.../camel-irc/src/main/docs/irc-component.adoc | 19 +
.../src/main/docs/ironmq-component.adoc | 18 +
.../src/main/docs/json-jackson-dataformat.adoc | 73 ++
.../src/main/docs/jacksonxml-dataformat.adoc | 58 ++
.../src/main/docs/javaspace-component.adoc | 18 +
.../camel-jaxb/src/main/docs/jaxb-dataformat.adoc | 60 ++
.../camel-jbpm/src/main/docs/jbpm-component.adoc | 18 +
.../src/main/docs/jcache-component.adoc | 24 +
.../camel-jcr/src/main/docs/jcr-component.adoc | 18 +
.../camel-jdbc/src/main/docs/jdbc-component.adoc | 90 +--
.../src/main/docs/jetty-component.adoc | 92 +++
.../src/main/docs/jgroups-component.adoc | 27 +
.../camel-jibx/src/main/docs/jibx-dataformat.adoc | 21 +
.../camel-jing/src/main/docs/jing-component.adoc | 18 +
.../camel-jira/src/main/docs/jira-component.adoc | 20 +-
.../camel-jms/src/main/docs/jms-component.adoc | 756 +++++++++++++++++++++
.../camel-jmx/src/main/docs/jmx-component.adoc | 18 +
.../src/main/docs/json-johnzon-dataformat.adoc | 73 ++
.../camel-jolt/src/main/docs/jolt-component.adoc | 21 +
.../camel-josql/src/main/docs/sql-language.adoc | 17 +-
.../camel-jpa/src/main/docs/jpa-component.adoc | 31 +
.../camel-jsch/src/main/docs/scp-component.adoc | 19 +
.../src/main/docs/json-validator-component.adoc | 19 +
.../src/main/docs/jsonpath-language.adoc | 23 +
.../camel-jt400/src/main/docs/jt400-component.adoc | 20 +
.../camel-juel/src/main/docs/el-language.adoc | 17 +-
.../src/main/docs/jxpath-language.adoc | 22 +-
.../camel-kafka/src/main/docs/kafka-component.adoc | 397 +++++++++++
.../src/main/docs/kestrel-component.adoc | 21 +
.../camel-krati/src/main/docs/krati-component.adoc | 18 +
.../src/main/docs/kubernetes-component.adoc | 34 +
.../docs/kubernetes-config-maps-component.adoc | 19 +
.../docs/kubernetes-deployments-component.adoc | 19 +
.../src/main/docs/kubernetes-hpa-component.adoc | 19 +
...omponent.adoc => kubernetes-job-component.adoc} | 34 +-
.../main/docs/kubernetes-namespaces-component.adoc | 19 +
.../src/main/docs/kubernetes-nodes-component.adoc | 19 +
...rnetes-persistent-volumes-claims-component.adoc | 20 +
.../kubernetes-persistent-volumes-component.adoc | 19 +
.../src/main/docs/kubernetes-pods-component.adoc | 19 +
...bernetes-replication-controllers-component.adoc | 19 +
.../docs/kubernetes-resources-quota-component.adoc | 19 +
.../main/docs/kubernetes-secrets-component.adoc | 19 +
.../kubernetes-service-accounts-component.adoc | 19 +
.../main/docs/kubernetes-services-component.adoc | 19 +
.../component/kubernetes/KubernetesConstants.java | 3 +
.../component/kubernetes/KubernetesOperations.java | 7 +
.../kubernetes/job/KubernetesJobComponent.java | 28 +
.../kubernetes/job/KubernetesJobEndpoint.java | 51 ++
.../kubernetes/job/KubernetesJobProducer.java | 173 +++++
.../org/apache/camel/component/kubernetes-job | 18 +
.../producer/KubernetesJobProducerTest.java | 112 +++
.../camel-ldap/src/main/docs/ldap-component.adoc | 18 +
.../camel-ldif/src/main/docs/ldif-component.adoc | 19 +
.../src/main/docs/linkedin-component.adoc | 37 +
components/camel-lra/src/main/docs/lra.adoc | 25 +-
.../src/main/docs/lucene-component.adoc | 32 +
.../src/main/docs/lumberjack-component.adoc | 22 +
.../camel-lzf/src/main/docs/lzf-dataformat.adoc | 20 +
.../camel-mail/src/main/docs/mail-component.adoc | 150 ++++
.../src/main/docs/master-component.adoc | 24 +
.../src/main/docs/metrics-component.adoc | 20 +
.../src/main/docs/micrometer-component.adoc | 21 +
.../src/main/docs/milo-client-component.adoc | 44 ++
.../src/main/docs/milo-server-component.adoc | 46 ++
.../camel-mina2/src/main/docs/mina2-component.adoc | 89 +++
.../camel-mllp/src/main/docs/mllp-component.adoc | 170 +++++
.../src/main/docs/mongodb-gridfs-component.adoc | 18 +
.../src/main/docs/mongodb-component.adoc | 20 +-
.../src/main/docs/mongodb3-component.adoc | 18 +
.../camel-mqtt/src/main/docs/mqtt-component.adoc | 22 +
.../camel-msv/src/main/docs/msv-component.adoc | 24 +
.../src/main/docs/mustache-component.adoc | 20 +
.../camel-mvel/src/main/docs/mvel-component.adoc | 21 +
.../camel-mvel/src/main/docs/mvel-language.adoc | 23 +-
.../src/main/docs/mybatis-bean-component.adoc | 23 +
.../src/main/docs/mybatis-component.adoc | 22 +
.../src/main/docs/nagios-component.adoc | 33 +
.../camel-nats/src/main/docs/nats-component.adoc | 19 +
.../src/main/docs/netty-http-component.adoc | 119 ++++
.../camel-netty/src/main/docs/netty-component.adoc | 193 ++++++
.../src/main/docs/netty4-http-component.adoc | 122 ++++
.../src/main/docs/netty4-component.adoc | 234 +++++++
.../camel-ognl/src/main/docs/ognl-language.adoc | 19 +-
.../src/main/docs/olingo2-component.adoc | 42 ++
.../src/main/docs/olingo4-component.adoc | 42 ++
.../src/main/docs/openshift-component.adoc | 24 +
.../src/main/docs/openstack-cinder-component.adoc | 18 +
.../src/main/docs/openstack-glance-component.adoc | 18 +
.../main/docs/openstack-keystone-component.adoc | 18 +
.../src/main/docs/openstack-neutron-component.adoc | 18 +
.../src/main/docs/openstack-nova-component.adoc | 18 +
.../src/main/docs/openstack-swift-component.adoc | 18 +
.../src/main/docs/opentracing.adoc | 19 +-
.../src/main/docs/optaplanner-component.adoc | 18 +
.../camel-paho/src/main/docs/paho-component.adoc | 22 +
.../camel-pdf/src/main/docs/pdf-component.adoc | 18 +
.../src/main/docs/pgevent-component.adoc | 18 +
.../camel-printer/src/main/docs/lpr-component.adoc | 16 +
.../src/main/docs/protobuf-dataformat.adoc | 24 +
.../src/main/docs/pubnub-component.adoc | 18 +
.../src/main/docs/quartz2-component.adoc | 40 ++
.../src/main/docs/quickfix-component.adoc | 29 +
.../src/main/docs/rabbitmq-component.adoc | 118 ++++
.../src/main/docs/reactive-streams-component.adoc | 30 +
.../src/main/docs/rest-swagger-component.adoc | 49 ++
.../src/main/docs/restlet-component.adoc | 64 ++
.../camel-rmi/src/main/docs/rmi-component.adoc | 18 +
.../src/main/docs/routebox-component.adoc | 18 +
.../camel-rss/src/main/docs/rss-component.adoc | 23 +
.../camel-rss/src/main/docs/rss-dataformat.adoc | 23 +
.../src/main/docs/salesforce-component.adoc | 250 +++++++
.../src/main/docs/sap-netweaver-component.adoc | 18 +
.../src/main/docs/xquery-component.adoc | 27 +
.../camel-saxon/src/main/docs/xquery-language.adoc | 28 +
.../src/main/docs/schematron-component.adoc | 18 +
.../src/main/docs/javaScript-language.adoc | 27 +-
.../camel-script/src/main/docs/php-language.adoc | 3 +
.../src/main/docs/python-language.adoc | 3 +
.../camel-script/src/main/docs/ruby-language.adoc | 3 +
.../src/main/docs/service-component.adoc | 23 +
.../src/main/docs/servicenow-component.adoc | 150 ++++
.../src/main/docs/servlet-component.adoc | 43 ++
.../camel-sip/src/main/docs/sip-component.adoc | 18 +
.../src/main/docs/sjms-batch-component.adoc | 36 +
.../camel-sjms/src/main/docs/sjms-component.adoc | 61 ++
.../camel-sjms2/src/main/docs/sjms2-component.adoc | 63 ++
.../camel-slack/src/main/docs/slack-component.adoc | 19 +
.../camel-smpp/src/main/docs/smpp-component.adoc | 210 ++++++
.../src/main/docs/yaml-snakeyaml-dataformat.adoc | 29 +
.../camel-snmp/src/main/docs/snmp-component.adoc | 18 +
.../src/main/docs/soapjaxb-dataformat.adoc | 47 ++
.../camel-solr/src/main/docs/solr-component.adoc | 18 +
.../camel-spark/src/main/docs/spark-component.adoc | 22 +
.../src/main/docs/splunk-component.adoc | 20 +
.../src/main/docs/spring-batch-component.adoc | 22 +
components/camel-spring-boot/pom.xml | 31 +
.../src/main/docs/spring-boot.adoc | 291 ++++++++
.../main/docs/spring-integration-component.adoc | 18 +
.../src/main/docs/spring-ldap-component.adoc | 18 +
.../src/main/docs/spring-redis-component.adoc | 18 +
.../src/main/docs/spring-ws-component.adoc | 19 +
.../src/main/docs/spring-event-component.adoc | 21 +
.../camel-sql/src/main/docs/sql-component.adoc | 22 +
.../src/main/docs/sql-stored-component.adoc | 20 +
.../camel-ssh/src/main/docs/ssh-component.adoc | 122 ++++
.../camel-stax/src/main/docs/stax-component.adoc | 18 +
.../camel-stomp/src/main/docs/stomp-component.adoc | 44 ++
.../src/main/docs/stream-component.adoc | 18 +
.../src/main/docs/string-template-component.adoc | 17 +
.../src/main/docs/syslog-dataformat.adoc | 19 +
.../src/main/docs/tidyMarkup-dataformat.adoc | 21 +
.../src/main/docs/tarfile-dataformat.adoc | 26 +
.../src/main/docs/telegram-component.adoc | 72 +-
.../src/main/docs/thrift-component.adoc | 30 +
.../src/main/docs/thrift-dataformat.adoc | 30 +
.../camel-tika/src/main/docs/tika-component.adoc | 18 +
.../src/main/docs/twilio-component.adoc | 31 +
.../src/main/docs/twitter-component.adoc | 26 +
.../main/docs/twitter-directmessage-component.adoc | 27 +
.../src/main/docs/twitter-search-component.adoc | 27 +
.../src/main/docs/twitter-streaming-component.adoc | 27 +
.../src/main/docs/twitter-timeline-component.adoc | 27 +
.../src/main/docs/undertow-component.adoc | 29 +
.../src/main/docs/univocity-csv-dataformat.adoc | 46 ++
.../src/main/docs/univocity-fixed-dataformat.adoc | 46 ++
.../src/main/docs/univocity-tsv-dataformat.adoc | 43 ++
.../src/main/docs/velocity-component.adoc | 20 +
.../camel-vertx/src/main/docs/vertx-component.adoc | 28 +
.../src/main/docs/weather-component.adoc | 21 +
.../camel-web3j/src/main/docs/web3j-component.adoc | 54 ++
.../src/main/docs/websocket-component.adoc | 48 ++
.../src/main/docs/wordpress-component.adoc | 32 +
.../src/main/docs/xchange-component.adoc | 19 +
.../src/main/docs/xmlBeans-dataformat.adoc | 19 +
.../src/main/docs/xmljson-dataformat.adoc | 58 ++
.../src/main/docs/xmlrpc-component.adoc | 24 +
.../src/main/docs/xmlrpc-dataformat.adoc | 24 +
.../src/main/docs/xmlsecurity-component.adoc | 332 +++++++++
.../camel-xmpp/src/main/docs/xmpp-component.adoc | 18 +
.../src/main/docs/xstream-dataformat.adoc | 112 +++
.../src/main/docs/yammer-component.adoc | 50 ++
.../camel-yql/src/main/docs/yql-component.adoc | 21 +
.../src/main/docs/zendesk-component.adoc | 44 ++
.../src/main/docs/zipfile-dataformat.adoc | 26 +
components/camel-zipkin/src/main/docs/zipkin.adoc | 34 +
.../src/main/docs/zookeeper-master-component.adoc | 29 +
.../src/main/docs/zookeeper-component.adoc | 76 +++
components/readme.adoc | 5 +-
docs/user-manual/en/SUMMARY.md | 1 +
examples/camel-example-fhir-osgi/README.md | 142 ++++
...pache.camel.example.fhir.osgi.configuration.cfg | 19 +
examples/camel-example-fhir-osgi/pom.xml | 233 +++++++
.../src/main/data/hl7v2.patient | 0
.../apache/camel/example/fhir/osgi/FhirRoute.java | 65 ++
.../resources/OSGI-INF/blueprint/camel-context.xml | 35 +
.../src/main/resources/log4j2.properties | 0
.../apache/camel/example/fhir/osgi/FhirOsgiIT.java | 77 +++
.../camel/example/fhir/osgi/PaxExamOptions.java | 71 ++
examples/pom.xml | 1 +
parent/pom.xml | 2 +-
.../karaf/features/src/main/resources/features.xml | 2 +
.../ahc/springboot/AhcComponentConfiguration.java | 5 +
.../ws/springboot/WsComponentConfiguration.java | 5 +
.../springboot/AMQPComponentConfiguration.java | 5 +
.../springboot/ApnsComponentConfiguration.java | 5 +
.../as2/springboot/AS2ComponentConfiguration.java | 5 +
.../springboot/AsteriskComponentConfiguration.java | 5 +
.../springboot/AtmosComponentConfiguration.java | 5 +
.../WebsocketComponentConfiguration.java | 5 +
.../springboot/AtomComponentConfiguration.java | 5 +
.../AtomixMapComponentConfiguration.java | 5 +
.../AtomixMessagingComponentConfiguration.java | 5 +
.../AtomixMultiMapComponentConfiguration.java | 5 +
.../AtomixQueueComponentConfiguration.java | 5 +
.../AtomixSetComponentConfiguration.java | 5 +
.../AtomixValueComponentConfiguration.java | 5 +
.../springboot/AvroComponentConfiguration.java | 5 +
.../cw/springboot/CwComponentConfiguration.java | 5 +
.../ddb/springboot/DdbComponentConfiguration.java | 5 +
.../DdbStreamComponentConfiguration.java | 5 +
.../ec2/springboot/EC2ComponentConfiguration.java | 5 +
.../KinesisFirehoseComponentConfiguration.java | 5 +
.../springboot/KinesisComponentConfiguration.java | 5 +
.../kms/springboot/KMSComponentConfiguration.java | 5 +
.../springboot/LambdaComponentConfiguration.java | 5 +
.../mq/springboot/MQComponentConfiguration.java | 5 +
.../s3/springboot/S3ComponentConfiguration.java | 5 +
.../sdb/springboot/SdbComponentConfiguration.java | 5 +
.../ses/springboot/SesComponentConfiguration.java | 5 +
.../sns/springboot/SnsComponentConfiguration.java | 5 +
.../sqs/springboot/SqsComponentConfiguration.java | 5 +
.../swf/springboot/SWFComponentConfiguration.java | 5 +
.../BlobServiceComponentConfiguration.java | 5 +
.../QueueServiceComponentConfiguration.java | 5 +
.../BeanValidatorComponentConfiguration.java | 5 +
.../BeanstalkComponentConfiguration.java | 5 +
.../springboot/BonitaComponentConfiguration.java | 5 +
.../box/springboot/BoxComponentConfiguration.java | 5 +
.../BraintreeComponentConfiguration.java | 5 +
.../springboot/CacheComponentConfiguration.java | 5 +
.../CaffeineCacheComponentConfiguration.java | 5 +
.../CaffeineLoadCacheComponentConfiguration.java | 5 +
.../CassandraComponentConfiguration.java | 5 +
.../ChronicleEngineComponentConfiguration.java | 5 +
.../springboot/ChunkComponentConfiguration.java | 5 +
.../cm/springboot/CMComponentConfiguration.java | 5 +
.../springboot/CMISComponentConfiguration.java | 5 +
.../springboot/CoAPComponentConfiguration.java | 5 +
.../springboot/CometdComponentConfiguration.java | 5 +
.../springboot/ConsulComponentConfiguration.java | 5 +
.../QualifiedContextComponentConfiguration.java | 5 +
.../springboot/BeanComponentConfiguration.java | 5 +
.../springboot/ClassComponentConfiguration.java | 5 +
.../BindingNameComponentConfiguration.java | 5 +
.../springboot/BrowseComponentConfiguration.java | 5 +
.../ControlBusComponentConfiguration.java | 5 +
.../DataFormatComponentConfiguration.java | 5 +
.../springboot/DataSetComponentConfiguration.java | 5 +
.../springboot/DirectComponentConfiguration.java | 5 +
.../springboot/DirectVmComponentConfiguration.java | 5 +
.../springboot/FileComponentConfiguration.java | 5 +
.../springboot/LanguageComponentConfiguration.java | 5 +
.../log/springboot/LogComponentConfiguration.java | 5 +
.../springboot/MockComponentConfiguration.java | 5 +
.../PropertiesComponentConfiguration.java | 5 +
.../ref/springboot/RefComponentConfiguration.java | 5 +
.../springboot/RestApiComponentConfiguration.java | 5 +
.../springboot/RestComponentConfiguration.java | 5 +
.../springboot/SagaComponentConfiguration.java | 5 +
.../SchedulerComponentConfiguration.java | 5 +
.../springboot/SedaComponentConfiguration.java | 5 +
.../springboot/StubComponentConfiguration.java | 5 +
.../springboot/TestComponentConfiguration.java | 5 +
.../springboot/TimerComponentConfiguration.java | 5 +
.../ValidatorComponentConfiguration.java | 5 +
.../vm/springboot/VmComponentConfiguration.java | 5 +
.../springboot/XsltComponentConfiguration.java | 5 +
.../CouchbaseComponentConfiguration.java | 5 +
.../springboot/CouchDbComponentConfiguration.java | 5 +
.../CryptoCmsComponentConfiguration.java | 5 +
.../DigitalSignatureComponentConfiguration.java | 5 +
.../springboot/CxfRsComponentConfiguration.java | 5 +
.../cxf/springboot/CxfComponentConfiguration.java | 5 +
.../DigitalOceanComponentConfiguration.java | 5 +
.../DisruptorComponentConfiguration.java | 5 +
.../DisruptorVmComponentConfiguration.java | 5 +
.../dns/springboot/DnsComponentConfiguration.java | 5 +
.../springboot/DockerComponentConfiguration.java | 5 +
.../springboot/DozerComponentConfiguration.java | 5 +
.../springboot/DrillComponentConfiguration.java | 5 +
.../springboot/DropboxComponentConfiguration.java | 5 +
.../springboot/EhcacheComponentConfiguration.java | 5 +
.../ElasticsearchComponentConfiguration.java | 5 +
.../ElasticsearchComponentConfiguration.java | 5 +
.../ElasticsearchComponentConfiguration.java | 5 +
.../springboot/ElsqlComponentConfiguration.java | 5 +
.../springboot/EtcdComponentConfiguration.java | 5 +
.../springboot/ExecComponentConfiguration.java | 5 +
.../springboot/FacebookComponentConfiguration.java | 5 +
.../springboot/FhirComponentConfiguration.java | 5 +
.../springboot/FlatpackComponentConfiguration.java | 5 +
.../springboot/FlinkComponentConfiguration.java | 5 +
.../fop/springboot/FopComponentConfiguration.java | 5 +
.../FreemarkerComponentConfiguration.java | 5 +
.../springboot/FtpComponentConfiguration.java | 5 +
.../springboot/FtpsComponentConfiguration.java | 5 +
.../springboot/SftpComponentConfiguration.java | 5 +
.../springboot/GangliaComponentConfiguration.java | 5 +
.../springboot/GeoCoderComponentConfiguration.java | 5 +
.../git/springboot/GitComponentConfiguration.java | 5 +
.../springboot/GitHubComponentConfiguration.java | 5 +
.../GoogleBigQueryComponentConfiguration.java | 5 +
.../GoogleCalendarComponentConfiguration.java | 5 +
.../GoogleDriveComponentConfiguration.java | 5 +
.../GoogleMailComponentConfiguration.java | 5 +
.../GoogleMailStreamComponentConfiguration.java | 5 +
.../GooglePubsubComponentConfiguration.java | 5 +
.../springboot/GoraComponentConfiguration.java | 5 +
.../springboot/GrpcComponentConfiguration.java | 5 +
.../GuavaEventBusComponentConfiguration.java | 5 +
...azelcastAtomicnumberComponentConfiguration.java | 5 +
.../HazelcastInstanceComponentConfiguration.java | 5 +
.../HazelcastListComponentConfiguration.java | 5 +
.../HazelcastMapComponentConfiguration.java | 5 +
.../HazelcastMultimapComponentConfiguration.java | 5 +
.../HazelcastQueueComponentConfiguration.java | 5 +
...zelcastReplicatedmapComponentConfiguration.java | 5 +
.../HazelcastRingbufferComponentConfiguration.java | 5 +
.../HazelcastSedaComponentConfiguration.java | 5 +
.../HazelcastSetComponentConfiguration.java | 5 +
.../HazelcastTopicComponentConfiguration.java | 5 +
.../springboot/HBaseComponentConfiguration.java | 5 +
.../springboot/HdfsComponentConfiguration.java | 5 +
.../springboot/HdfsComponentConfiguration.java | 5 +
.../springboot/HipchatComponentConfiguration.java | 5 +
.../springboot/HttpComponentConfiguration.java | 5 +
.../springboot/HttpComponentConfiguration.java | 5 +
.../springboot/ClientComponentConfiguration.java | 5 +
.../springboot/ServerComponentConfiguration.java | 5 +
.../IgniteCacheComponentConfiguration.java | 5 +
.../IgniteComputeComponentConfiguration.java | 5 +
.../IgniteEventsComponentConfiguration.java | 5 +
.../IgniteIdGenComponentConfiguration.java | 5 +
.../IgniteMessagingComponentConfiguration.java | 5 +
.../IgniteQueueComponentConfiguration.java | 5 +
.../IgniteSetComponentConfiguration.java | 5 +
.../InfinispanComponentConfiguration.java | 5 +
.../springboot/InfluxDbComponentConfiguration.java | 5 +
.../irc/springboot/IrcComponentConfiguration.java | 5 +
.../springboot/IronMQComponentConfiguration.java | 5 +
.../JavaSpaceComponentConfiguration.java | 5 +
.../springboot/JBPMComponentConfiguration.java | 5 +
.../springboot/JCacheComponentConfiguration.java | 5 +
.../jcr/springboot/JcrComponentConfiguration.java | 5 +
.../springboot/JdbcComponentConfiguration.java | 5 +
.../JettyHttpComponentConfiguration9.java | 5 +
.../springboot/JGroupsComponentConfiguration.java | 5 +
.../springboot/JingComponentConfiguration.java | 5 +
.../springboot/JIRAComponentConfiguration.java | 5 +
.../jms/springboot/JmsComponentConfiguration.java | 5 +
.../jmx/springboot/JMXComponentConfiguration.java | 5 +
.../springboot/JoltComponentConfiguration.java | 5 +
.../jpa/springboot/JpaComponentConfiguration.java | 5 +
.../scp/springboot/ScpComponentConfiguration.java | 5 +
.../JsonValidatorComponentConfiguration.java | 5 +
.../springboot/Jt400ComponentConfiguration.java | 5 +
.../springboot/KafkaComponentConfiguration.java | 5 +
.../springboot/KestrelComponentConfiguration.java | 5 +
.../springboot/KratiComponentConfiguration.java | 5 +
...KubernetesConfigMapsComponentConfiguration.java | 5 +
...ubernetesDeploymentsComponentConfiguration.java | 5 +
.../KubernetesHPAComponentConfiguration.java | 5 +
.../KubernetesJobComponentAutoConfiguration.java | 129 ++++
.../KubernetesJobComponentConfiguration.java} | 14 +-
...KubernetesNamespacesComponentConfiguration.java | 5 +
.../KubernetesNodesComponentConfiguration.java | 5 +
...tesPersistentVolumesComponentConfiguration.java | 5 +
...sistentVolumesClaimsComponentConfiguration.java | 6 +
.../KubernetesPodsComponentConfiguration.java | 5 +
...plicationControllersComponentConfiguration.java | 5 +
...rnetesResourcesQuotaComponentConfiguration.java | 5 +
.../KubernetesSecretsComponentConfiguration.java | 5 +
...netesServiceAccountsComponentConfiguration.java | 5 +
.../KubernetesServicesComponentConfiguration.java | 5 +
.../KubernetesComponentConfiguration.java | 5 +
...penshiftBuildConfigsComponentConfiguration.java | 5 +
.../OpenshiftBuildsComponentConfiguration.java | 5 +
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/LdapComponentConfiguration.java | 5 +
.../springboot/LdifComponentConfiguration.java | 5 +
.../springboot/LinkedInComponentConfiguration.java | 5 +
.../springboot/LuceneComponentConfiguration.java | 5 +
.../LumberjackComponentConfiguration.java | 5 +
.../springboot/MailComponentConfiguration.java | 5 +
.../springboot/MasterComponentConfiguration.java | 5 +
.../springboot/MetricsComponentConfiguration.java | 5 +
.../MicrometerComponentConfiguration.java | 5 +
.../MiloClientComponentConfiguration.java | 5 +
.../MiloServerComponentConfiguration.java | 5 +
.../springboot/Mina2ComponentConfiguration.java | 5 +
.../springboot/MllpComponentConfiguration.java | 5 +
.../springboot/GridFsComponentConfiguration.java | 5 +
.../springboot/MongoDbComponentConfiguration.java | 5 +
.../springboot/MongoDbComponentConfiguration.java | 5 +
.../springboot/MQTTComponentConfiguration.java | 5 +
.../msv/springboot/MsvComponentConfiguration.java | 5 +
.../springboot/MustacheComponentConfiguration.java | 5 +
.../springboot/MvelComponentConfiguration.java | 5 +
.../MyBatisBeanComponentConfiguration.java | 5 +
.../springboot/MyBatisComponentConfiguration.java | 5 +
.../springboot/NagiosComponentConfiguration.java | 5 +
.../springboot/NatsComponentConfiguration.java | 5 +
.../NettyHttpComponentConfiguration.java | 5 +
.../springboot/NettyComponentConfiguration.java | 5 +
.../NettyHttpComponentConfiguration.java | 5 +
.../springboot/NettyComponentConfiguration.java | 5 +
.../springboot/Olingo2ComponentConfiguration.java | 5 +
.../springboot/Olingo4ComponentConfiguration.java | 5 +
.../OpenShiftComponentConfiguration.java | 5 +
.../springboot/CinderComponentConfiguration.java | 5 +
.../springboot/GlanceComponentConfiguration.java | 5 +
.../springboot/KeystoneComponentConfiguration.java | 5 +
.../springboot/NeutronComponentConfiguration.java | 5 +
.../springboot/NovaComponentConfiguration.java | 5 +
.../springboot/SwiftComponentConfiguration.java | 5 +
.../OptaPlannerComponentConfiguration.java | 5 +
.../springboot/PahoComponentConfiguration.java | 5 +
.../pdf/springboot/PdfComponentConfiguration.java | 5 +
.../springboot/PgEventComponentConfiguration.java | 5 +
.../springboot/PrinterComponentConfiguration.java | 5 +
.../springboot/PubNubComponentConfiguration.java | 5 +
.../springboot/QuartzComponentConfiguration.java | 5 +
.../QuickfixjComponentConfiguration.java | 5 +
.../springboot/RabbitMQComponentConfiguration.java | 5 +
.../ReactiveStreamsComponentConfiguration.java | 5 +
.../RestSwaggerComponentConfiguration.java | 5 +
.../springboot/RestletComponentConfiguration.java | 5 +
.../rmi/springboot/RmiComponentConfiguration.java | 5 +
.../springboot/RouteboxComponentConfiguration.java | 5 +
.../rss/springboot/RssComponentConfiguration.java | 5 +
.../SalesforceComponentConfiguration.java | 5 +
.../NetWeaverComponentConfiguration.java | 5 +
.../springboot/XQueryComponentConfiguration.java | 5 +
.../SchematronComponentConfiguration.java | 5 +
.../springboot/ServiceComponentConfiguration.java | 5 +
.../ServiceNowComponentConfiguration.java | 5 +
.../springboot/ServletComponentConfiguration.java | 5 +
.../sip/springboot/SipComponentConfiguration.java | 5 +
.../SjmsBatchComponentConfiguration.java | 5 +
.../springboot/SjmsComponentConfiguration.java | 5 +
.../springboot/Sjms2ComponentConfiguration.java | 5 +
.../springboot/SlackComponentConfiguration.java | 5 +
.../springboot/SmppComponentConfiguration.java | 5 +
.../springboot/SnmpComponentConfiguration.java | 5 +
.../springboot/SolrComponentConfiguration.java | 5 +
.../springboot/SparkComponentConfiguration.java | 5 +
.../springboot/SplunkComponentConfiguration.java | 5 +
.../SpringBatchComponentConfiguration.java | 5 +
.../SpringIntegrationComponentConfiguration.java | 5 +
.../SpringLdapComponentConfiguration.java | 5 +
.../springboot/RedisComponentConfiguration.java | 5 +
.../springboot/EventComponentConfiguration.java | 5 +
.../SpringWebserviceComponentConfiguration.java | 5 +
.../sql/springboot/SqlComponentConfiguration.java | 5 +
.../SqlStoredComponentConfiguration.java | 5 +
.../ssh/springboot/SshComponentConfiguration.java | 5 +
.../springboot/StAXComponentConfiguration.java | 5 +
.../springboot/StompComponentConfiguration.java | 5 +
.../springboot/StreamComponentConfiguration.java | 5 +
.../StringTemplateComponentConfiguration.java | 5 +
.../springboot/TelegramComponentConfiguration.java | 5 +
.../springboot/ThriftComponentConfiguration.java | 5 +
.../springboot/TikaComponentConfiguration.java | 5 +
.../springboot/TwilioComponentConfiguration.java | 5 +
...TwitterDirectMessageComponentConfiguration.java | 5 +
.../TwitterSearchComponentConfiguration.java | 5 +
.../springboot/TwitterComponentConfiguration.java | 5 +
.../TwitterStreamingComponentConfiguration.java | 5 +
.../TwitterTimelineComponentConfiguration.java | 5 +
.../springboot/UndertowComponentConfiguration.java | 5 +
.../springboot/VelocityComponentConfiguration.java | 5 +
.../springboot/VertxComponentConfiguration.java | 5 +
.../springboot/WeatherComponentConfiguration.java | 5 +
.../springboot/Web3jComponentConfiguration.java | 5 +
.../WebsocketComponentConfiguration.java | 5 +
.../WordpressComponentConfiguration.java | 5 +
.../springboot/XChangeComponentConfiguration.java | 5 +
.../springboot/XmlRpcComponentConfiguration.java | 5 +
.../XmlSignatureComponentConfiguration.java | 5 +
.../springboot/XmppComponentConfiguration.java | 5 +
.../springboot/YammerComponentConfiguration.java | 5 +
.../yql/springboot/YqlComponentConfiguration.java | 5 +
.../springboot/ZendeskComponentConfiguration.java | 5 +
.../springboot/MasterComponentConfiguration.java | 5 +
.../ZooKeeperComponentConfiguration.java | 5 +
platforms/spring-boot/components-starter/pom.xml | 20 +
.../camel-spring-boot-dependencies/pom.xml | 2 +-
.../packaging/SpringBootAutoConfigurationMojo.java | 7 +
...pdateSpringBootAutoConfigurationReadmeMojo.java | 376 ++++++++++
.../model/SpringBootAutoConfigureOptionModel.java | 110 +++
.../spring-boot-auto-configure-options.mvel | 15 +
642 files changed, 16135 insertions(+), 113 deletions(-)
copy components/camel-kubernetes/src/main/docs/{kubernetes-hpa-component.adoc => kubernetes-job-component.adoc} (78%)
create mode 100644 components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobComponent.java
create mode 100644 components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpoint.java
create mode 100644 components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java
create mode 100644 components/camel-kubernetes/src/main/resources/META-INF/services/org/apache/camel/component/kubernetes-job
create mode 100644 components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
create mode 100644 examples/camel-example-fhir-osgi/README.md
create mode 100644 examples/camel-example-fhir-osgi/org.apache.camel.example.fhir.osgi.configuration.cfg
create mode 100644 examples/camel-example-fhir-osgi/pom.xml
copy examples/{camel-example-fhir => camel-example-fhir-osgi}/src/main/data/hl7v2.patient (100%)
create mode 100644 examples/camel-example-fhir-osgi/src/main/java/org/apache/camel/example/fhir/osgi/FhirRoute.java
create mode 100644 examples/camel-example-fhir-osgi/src/main/resources/OSGI-INF/blueprint/camel-context.xml
copy examples/{camel-example-widget-gadget-xml => camel-example-fhir-osgi}/src/main/resources/log4j2.properties (100%)
create mode 100644 examples/camel-example-fhir-osgi/src/test/java/org/apache/camel/example/fhir/osgi/FhirOsgiIT.java
create mode 100644 examples/camel-example-fhir-osgi/src/test/java/org/apache/camel/example/fhir/osgi/PaxExamOptions.java
create mode 100644 platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/job/springboot/KubernetesJobComponentAutoConfiguration.java
copy platforms/spring-boot/components-starter/{camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentConfiguration.java => camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/job/springboot/KubernetesJobComponentConfiguration.java} (80%)
create mode 100644 tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSpringBootAutoConfigurationReadmeMojo.java
create mode 100644 tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/SpringBootAutoConfigureOptionModel.java
create mode 100644 tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-auto-configure-options.mvel
[camel] 02/04: CAMEL-12618: Use MVEL version that supports 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 d3cbc24f1239a18b4a4c7fb7debe25fb293d24f5
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jul 13 11:43:54 2018 +0200
CAMEL-12618: Use MVEL version that supports Java 11
Try to fix Java 10 build with MVEL dependency built by jitpack.io.
See mvel/mvel#159[2]
[1] http://openjdk.java.net/jeps/320
[2] https://github.com/mvel/mvel/issues/159
---
tooling/maven/camel-package-maven-plugin/pom.xml | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 50afd0f..47cf92a 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -44,6 +44,17 @@
</dependencies>
</dependencyManagement>
+ <!-- added to allow for Java 10+ compatibility in MVEL
+ there is no release that includes this fix
+ https://github.com/mvel/mvel/issues/159
+ -->
+ <repositories>
+ <repository>
+ <id>jitpack.io</id>
+ <url>https://jitpack.io</url>
+ </repository>
+ </repositories>
+
<dependencies>
<!-- use our patched ordered json-simple parser -->
@@ -53,10 +64,11 @@
<version>${project.version}</version>
</dependency>
+ <!-- see above, targeting MVEL with Java 10+ support -->
<dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- <version>${mvel-version}</version>
+ <groupId>com.github.mvel</groupId>
+ <artifactId>mvel</artifactId>
+ <version>97071e83fb</version>
</dependency>
<dependency>
[camel] 04/04: CAMEL-12618: Additional dependencies needed on ...
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 26e05d5c7f600dbacb0db877d04af0366afe6a8a
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Jul 18 12:57:40 2018 +0200
CAMEL-12618: Additional dependencies needed on ...
...Java 11
Adds additional dependencies needed to compile on Java 11. Java 11
stopped shipping Java EE classes[1], we need to add them as dependencies
now.
[1] http://openjdk.java.net/jeps/320
---
.../src/main/resources/archetype-resources/pom.xml | 17 +++-
camel-core/pom.xml | 35 ++++++++-
components/camel-bam/pom.xml | 34 +++++++-
components/camel-bindy/pom.xml | 17 +++-
components/camel-blueprint/pom.xml | 67 ++++++++++++++--
components/camel-bonita/pom.xml | 17 +++-
components/camel-cdi/pom.xml | 29 ++++++-
components/camel-context/pom.xml | 17 +++-
components/camel-cxf-transport/pom.xml | 31 +++++++-
components/camel-grpc/pom.xml | 22 ++++++
components/camel-hl7/pom.xml | 17 +++-
components/camel-jetty9/pom.xml | 22 +++++-
components/camel-jmx/pom.xml | 80 ++++++-------------
components/camel-mail/pom.xml | 17 +++-
components/camel-netty4/pom.xml | 47 +++++++----
components/camel-ruby/pom.xml | 17 +++-
components/camel-soap/pom.xml | 91 ++++++----------------
components/camel-spring-boot/pom.xml | 17 +++-
components/camel-spring-javaconfig/pom.xml | 17 +++-
components/camel-spring-ws/pom.xml | 26 ++++++-
components/camel-spring/pom.xml | 66 +++++++++++++---
components/camel-syslog/pom.xml | 17 +++-
components/camel-telegram/pom.xml | 17 +++-
components/camel-test-blueprint/pom.xml | 17 +++-
components/camel-test-spring/pom.xml | 17 +++-
components/camel-test/pom.xml | 17 +++-
components/camel-testcontainers-spring/pom.xml | 18 ++++-
components/camel-testcontainers/pom.xml | 18 ++++-
components/camel-testng/pom.xml | 17 +++-
components/camel-undertow/pom.xml | 16 ++++
components/camel-wordpress/pom.xml | 17 +++-
connectors/examples/beverage-component/pom.xml | 17 +++-
connectors/examples/foo-bar-wine-example/pom.xml | 17 +++-
connectors/examples/petstore-example/pom.xml | 17 +++-
examples/camel-example-cafe/pom.xml | 17 +++-
examples/camel-example-cdi-metrics/pom.xml | 17 +++-
examples/camel-example-cdi-properties/pom.xml | 17 +++-
examples/camel-example-cdi-rest-servlet/pom.xml | 21 ++++-
examples/camel-example-cdi-test/pom.xml | 17 +++-
examples/camel-example-cxf-blueprint/pom.xml | 17 +++-
examples/camel-example-cxf-proxy/pom.xml | 17 +++-
examples/camel-example-cxf-tomcat/pom.xml | 15 +++-
.../hello-camel-grpc-server-kubernetes/pom.xml | 15 +++-
examples/camel-example-loan-broker-cxf/pom.xml | 17 +++-
examples/camel-example-loan-broker-jms/pom.xml | 17 +++-
examples/camel-example-management/pom.xml | 17 +++-
examples/camel-example-pojo-messaging/pom.xml | 17 +++-
examples/camel-example-rabbitmq/pom.xml | 17 +++-
examples/camel-example-reportincident/pom.xml | 17 +++-
examples/camel-example-rest-producer/pom.xml | 17 +++-
.../camel-example-spring-boot-activemq/pom.xml | 17 +++-
.../pom.xml | 17 +++-
.../pom.xml | 17 +++-
examples/camel-example-spring-boot-master/pom.xml | 17 +++-
examples/camel-example-spring-boot-pojo/pom.xml | 17 +++-
.../camel-example-spring-boot-rest-jpa/pom.xml | 17 +++-
.../pom.xml | 17 +++-
examples/camel-example-spring-boot-xml/pom.xml | 17 +++-
examples/camel-example-spring-boot/pom.xml | 17 +++-
examples/camel-example-spring-jms/pom.xml | 17 +++-
examples/camel-example-transformer-demo/pom.xml | 17 +++-
.../camel-example-validator-spring-boot/pom.xml | 17 +++-
parent/pom.xml | 66 ++++++++++++++--
platforms/camel-catalog-rest/pom.xml | 4 +-
platforms/spring-boot/components-starter/pom.xml | 17 +++-
tests/camel-blueprint-test/pom.xml | 17 +++-
tooling/apt/pom.xml | 16 ++++
.../pom.xml | 2 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 2 +-
tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 2 +-
70 files changed, 1247 insertions(+), 280 deletions(-)
diff --git a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
index c439407..b584ec6 100644
--- a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
@@ -152,9 +152,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -167,5 +167,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 4515891..3deb094 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -660,9 +660,9 @@
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<dependencies>
@@ -715,6 +715,37 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>apt</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ <version>${soap-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
</project>
diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml
index 790bc26..450f3ce 100644
--- a/components/camel-bam/pom.xml
+++ b/components/camel-bam/pom.xml
@@ -210,9 +210,9 @@
</profile>
<profile>
- <id>jdk9+-hibernate</id>
+ <id>jdk9-10-hibernate</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<testResources>
@@ -243,5 +243,35 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/profiles/hibernate</directory>
+ </testResource>
+ </testResources>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index 413f63e..b19ce8e 100644
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -105,9 +105,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -121,5 +121,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 86711ce..a62d8c3 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -412,10 +412,10 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<executions>
<execution>
<id>generate-schema</id>
@@ -489,9 +489,9 @@
</build>
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
<property>
<name>!os.unsupported.schemagen</name>
</property>
@@ -502,7 +502,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -553,6 +553,63 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <version>2.4</version>
+ <dependencies>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>include-sources</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <echo>Including source code from camel-core-xml in the camel-blueprint-sources.jar</echo>
+ <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar"
+ update="true">
+ <fileset dir="${basedir}/../camel-core-osgi/src/main/java" includes="**/*"/>
+ <fileset dir="${basedir}/../camel-core-xml/src/main/java" includes="**/*"/>
+ </jar>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<reporting>
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index 585565f..eb5efd5 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -92,9 +92,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -107,5 +107,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 3597f0a..ae440dd 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -501,13 +501,20 @@
</dependencies>
+ </profile>
+
+ <profile>
+ <id>jdk9-10--build</id>
+ <activation>
+ <jdk>[9,10]</jdk>
+ </activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>true</reuseForks>
- <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar --patch-module java.xml.bind=${project.basedir}/target/java9 ${camel.surefire.fork.vmargs} --add-opens java.base/java.lang=java.xml.bind</argLine>
+ <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${annotation-api-version}.jar --patch-module java.xml.bind=${project.basedir}/target/java9 ${camel.surefire.fork.vmargs} --add-opens java.base/java.lang=java.xml.bind</argLine>
</configuration>
</plugin>
<plugin>
@@ -526,7 +533,7 @@
<artifactItem>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>${annotation-api-version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.basedir}/target/java9</outputDirectory>
@@ -568,6 +575,24 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-context/pom.xml b/components/camel-context/pom.xml
index 9148299..2b96631 100644
--- a/components/camel-context/pom.xml
+++ b/components/camel-context/pom.xml
@@ -86,9 +86,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -101,5 +101,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 02e1480..a978cff 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -203,15 +203,22 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>6.2</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -225,6 +232,26 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>webservices-api</artifactId>
+ <version>${webservices-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index a9b3cad..3566a65 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -228,4 +228,26 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 6982cd3..6b3b108 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -149,9 +149,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -164,5 +164,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index 101bed7..ddac318 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -190,9 +190,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -205,6 +205,24 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 10aebc4..a73f7fe 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -76,67 +76,33 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
- <id>jdk8-build</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- TODO: This is a temporary workaround until org.codehaus.mojo:jaxb2-maven-plugin supports JDK9.
- (https://github.com/mojohaus/jaxb2-maven-plugin/issues/43). We need to add the plugin back
- once we are sure it works on both JDK8 and JDK9.
- See https://issues.apache.org/jira/browse/CAMEL-10141 for more info. -->
- <id>jdk9+-build</id>
+ <id>jdk11+-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[11,)</jdk>
</activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-plugin</artifactId>
- <version>${cxf-xjc-plugin-version}</version>
- <configuration>
- <extensions>
- <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
- </extensions>
- </configuration>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
- <sourceRoot>${basedir}/target/xjc</sourceRoot>
- <xsdOptions>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/notifications.xsd</xsd>
- <packagename>org.apache.camel.component.jmx.jaxb</packagename>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
</project>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 4c9cc48..ce64948 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -142,9 +142,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -158,5 +158,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index dca3ecf..6fe12c1 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -84,23 +84,36 @@
</dependencies>
<profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <profile>
+ <id>jdk9-10-build</id>
+ <activation>
+ <jdk>[9,10]</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
+ <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-ruby/pom.xml b/components/camel-ruby/pom.xml
index c3cd5a4..f7e680f 100644
--- a/components/camel-ruby/pom.xml
+++ b/components/camel-ruby/pom.xml
@@ -80,9 +80,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -95,5 +95,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index c210462..c07d890 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -104,6 +104,10 @@
<build>
<plugins>
<plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-plugin</artifactId>
<version>${cxf-xjc-plugin-version}</version>
@@ -202,76 +206,27 @@
<profiles>
<profile>
- <id>jdk8-build</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- TODO: This is a temporary workaround until org.codehaus.mojo:jaxb2-maven-plugin supports JDK9.
- (https://github.com/mojohaus/jaxb2-maven-plugin/issues/43). We need to add the plugin back
- once we are sure it works on both JDK8 and JDK9.
- See https://issues.apache.org/jira/browse/CAMEL-10141 for more info. -->
- <id>jdk9+-build</id>
+ <id>jdk11+-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[11,)</jdk>
</activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-plugin</artifactId>
- <version>${cxf-xjc-plugin-version}</version>
- <configuration>
- <extensions>
- <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
- </extensions>
- </configuration>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
- <sourceRoot>${basedir}/target/xjc</sourceRoot>
- <xsdOptions>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/soap.xsd</xsd>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/soap12.xsd</xsd>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/xml.xsd</xsd>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>webservices-api</artifactId>
+ <version>${webservices-api-version}</version>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
</project>
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index 182bf27..15b6957 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -159,9 +159,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -175,5 +175,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml
index c8a40d6..7f0e46a 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -96,9 +96,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -112,5 +112,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index bb7cea9..e1d2927 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -188,16 +188,16 @@
<profiles>
<profile>
- <id>java9+</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>--patch-module java.xml.bind=${project.basedir}/target/java9/stax-ex-1.7.8.jar --patch-module java.xml.ws=${project.basedir}/target/java9/saaj-impl-1.3.28.jar --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar ${camel.surefire.fork.vmargs} --add-exports=java.xml/com.sun.org.apache.xerces.internal.dom=java.xml.ws --add-exports=java.xml.bind/org.jvnet.staxex.util=java.xml.ws</argLine>
+ <argLine>--patch-module java.xml.bind=${project.basedir}/target/java9/stax-ex-1.7.8.jar --patch-module java.xml.ws=${project.basedir}/target/java9/saaj-impl-1.3.28.jar --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${annotation-api-version}.jar ${camel.surefire.fork.vmargs} --add-exports=java.xml/com.sun.org.apache.xerces.internal.dom=java.xml.ws --add-exports=java.xml.bind/org.jvnet.staxex.util=java.xml.ws</argLine>
</configuration>
</plugin>
<plugin>
@@ -224,7 +224,7 @@
<artifactItem>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>${annotation-api-version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.basedir}/target/java9</outputDirectory>
@@ -247,5 +247,23 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 72f88e0..e9e1134 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -575,7 +575,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<executions>
<execution>
<id>generate schema</id>
@@ -598,9 +598,9 @@
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<dependencies>
<!-- xmltokenizer using woodstox -->
@@ -614,15 +614,9 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -652,6 +646,58 @@
<createJavaDocAnnotations>false</createJavaDocAnnotations>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>generate schema</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>schemagen</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>${project.build.directory}/schema</outputDirectory>
+ <sources>
+ <source>${project.build.directory}/schema-src</source>
+ </sources>
+ <createJavaDocAnnotations>false</createJavaDocAnnotations>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index d032fc2..60308de 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -87,9 +87,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -102,5 +102,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml
index c5f740e..97544a2 100644
--- a/components/camel-telegram/pom.xml
+++ b/components/camel-telegram/pom.xml
@@ -141,9 +141,9 @@
</build>
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -156,6 +156,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index 175073b..931f953 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -178,9 +178,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -193,5 +193,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml
index a406a50..0a6be29 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -76,9 +76,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -92,5 +92,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml
index 545d167..63ca268 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -72,9 +72,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -87,5 +87,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-testcontainers-spring/pom.xml b/components/camel-testcontainers-spring/pom.xml
index 9be4a41..8f4908d 100644
--- a/components/camel-testcontainers-spring/pom.xml
+++ b/components/camel-testcontainers-spring/pom.xml
@@ -75,9 +75,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -91,6 +91,20 @@
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
<!-- activate integration test if the docker socket file is accessible -->
<profile>
<id>testcontainers-spring-integration-tests-docker-file</id>
diff --git a/components/camel-testcontainers/pom.xml b/components/camel-testcontainers/pom.xml
index 4f95cbd..4a07ea6 100644
--- a/components/camel-testcontainers/pom.xml
+++ b/components/camel-testcontainers/pom.xml
@@ -77,9 +77,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -93,6 +93,20 @@
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
<!-- activate integration test if the docker socket file is accessible -->
<profile>
<id>testcontainers-integration-tests-docker-file</id>
diff --git a/components/camel-testng/pom.xml b/components/camel-testng/pom.xml
index 1ad175d..3bced62 100644
--- a/components/camel-testng/pom.xml
+++ b/components/camel-testng/pom.xml
@@ -84,9 +84,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -100,5 +100,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 7dc8d48..68576eb 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -115,4 +115,20 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index 41b560b..d80c62a 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -127,9 +127,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -142,6 +142,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/connectors/examples/beverage-component/pom.xml b/connectors/examples/beverage-component/pom.xml
index 48d41e2..89d3329 100644
--- a/connectors/examples/beverage-component/pom.xml
+++ b/connectors/examples/beverage-component/pom.xml
@@ -95,9 +95,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -110,5 +110,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/connectors/examples/foo-bar-wine-example/pom.xml b/connectors/examples/foo-bar-wine-example/pom.xml
index 270dd0e..39466c8 100644
--- a/connectors/examples/foo-bar-wine-example/pom.xml
+++ b/connectors/examples/foo-bar-wine-example/pom.xml
@@ -107,9 +107,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -122,5 +122,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/connectors/examples/petstore-example/pom.xml b/connectors/examples/petstore-example/pom.xml
index cb495e9..9a050ca 100644
--- a/connectors/examples/petstore-example/pom.xml
+++ b/connectors/examples/petstore-example/pom.xml
@@ -110,9 +110,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -125,5 +125,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cafe/pom.xml b/examples/camel-example-cafe/pom.xml
index 969c662..818fdbf 100644
--- a/examples/camel-example-cafe/pom.xml
+++ b/examples/camel-example-cafe/pom.xml
@@ -123,9 +123,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -138,5 +138,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml
index 6b116e8..656cc9c 100644
--- a/examples/camel-example-cdi-metrics/pom.xml
+++ b/examples/camel-example-cdi-metrics/pom.xml
@@ -131,9 +131,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -146,5 +146,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml
index 9715d4b..c529cf2 100644
--- a/examples/camel-example-cdi-properties/pom.xml
+++ b/examples/camel-example-cdi-properties/pom.xml
@@ -128,9 +128,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -143,5 +143,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml
index 1647a30..e395277 100644
--- a/examples/camel-example-cdi-rest-servlet/pom.xml
+++ b/examples/camel-example-cdi-rest-servlet/pom.xml
@@ -172,7 +172,7 @@
</dependencies>
</profile>
<profile>
- <id>jdk9+-build-jetty</id>
+ <id>jdk9+-jetty</id>
<activation>
<jdk>[9,)</jdk>
</activation>
@@ -202,6 +202,12 @@
</exclusions>
</dependency>
</dependencies>
+ </profile>
+ <profile>
+ <id>jdk9-10-build</id>
+ <activation>
+ <jdk>[9,10]</jdk>
+ </activation>
<build>
<plugins>
<plugin>
@@ -213,6 +219,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml
index 8732426..7e14ece 100644
--- a/examples/camel-example-cdi-test/pom.xml
+++ b/examples/camel-example-cdi-test/pom.xml
@@ -112,9 +112,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -127,5 +127,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cxf-blueprint/pom.xml b/examples/camel-example-cxf-blueprint/pom.xml
index 32652cb..22c98a1 100644
--- a/examples/camel-example-cxf-blueprint/pom.xml
+++ b/examples/camel-example-cxf-blueprint/pom.xml
@@ -102,9 +102,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -117,5 +117,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cxf-proxy/pom.xml b/examples/camel-example-cxf-proxy/pom.xml
index 49dfa31..d7e58bf 100644
--- a/examples/camel-example-cxf-proxy/pom.xml
+++ b/examples/camel-example-cxf-proxy/pom.xml
@@ -154,9 +154,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -169,5 +169,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-cxf-tomcat/pom.xml b/examples/camel-example-cxf-tomcat/pom.xml
index fd50281..7af41ff 100644
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -138,7 +138,7 @@
</properties>
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
<jdk>[9,)</jdk>
</activation>
@@ -153,6 +153,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
index b526418..535e77b 100644
--- a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
+++ b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
@@ -165,5 +165,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/camel-example-loan-broker-cxf/pom.xml b/examples/camel-example-loan-broker-cxf/pom.xml
index 3be3754..789a221 100644
--- a/examples/camel-example-loan-broker-cxf/pom.xml
+++ b/examples/camel-example-loan-broker-cxf/pom.xml
@@ -172,9 +172,9 @@
</properties>
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -187,6 +187,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-loan-broker-jms/pom.xml b/examples/camel-example-loan-broker-jms/pom.xml
index 38ff034..a93fc08 100644
--- a/examples/camel-example-loan-broker-jms/pom.xml
+++ b/examples/camel-example-loan-broker-jms/pom.xml
@@ -180,9 +180,9 @@
</properties>
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -195,6 +195,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-management/pom.xml b/examples/camel-example-management/pom.xml
index f60ff98..12d56ca 100644
--- a/examples/camel-example-management/pom.xml
+++ b/examples/camel-example-management/pom.xml
@@ -140,9 +140,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -155,5 +155,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/camel-example-pojo-messaging/pom.xml
index d4a4d99..986a083 100644
--- a/examples/camel-example-pojo-messaging/pom.xml
+++ b/examples/camel-example-pojo-messaging/pom.xml
@@ -158,9 +158,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -173,5 +173,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-rabbitmq/pom.xml b/examples/camel-example-rabbitmq/pom.xml
index 00c88dc..0f83223 100644
--- a/examples/camel-example-rabbitmq/pom.xml
+++ b/examples/camel-example-rabbitmq/pom.xml
@@ -138,9 +138,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -153,5 +153,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml
index 0cffa44..a164b1c 100644
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -198,9 +198,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -213,5 +213,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-rest-producer/pom.xml b/examples/camel-example-rest-producer/pom.xml
index d3a88e7..4f1edf1 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -134,9 +134,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -149,5 +149,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-activemq/pom.xml b/examples/camel-example-spring-boot-activemq/pom.xml
index 6ab6da6..9ddc478 100644
--- a/examples/camel-example-spring-boot-activemq/pom.xml
+++ b/examples/camel-example-spring-boot-activemq/pom.xml
@@ -127,9 +127,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -143,6 +143,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-clustered-route-controller/pom.xml b/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
index fac7c9c..54d9fe9 100644
--- a/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
@@ -48,9 +48,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -63,5 +63,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-health-checks/pom.xml b/examples/camel-example-spring-boot-health-checks/pom.xml
index ecbb3bb..55e68c9 100644
--- a/examples/camel-example-spring-boot-health-checks/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/pom.xml
@@ -49,9 +49,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -64,5 +64,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-master/pom.xml b/examples/camel-example-spring-boot-master/pom.xml
index 034e6f9..7e6b8f5 100644
--- a/examples/camel-example-spring-boot-master/pom.xml
+++ b/examples/camel-example-spring-boot-master/pom.xml
@@ -114,9 +114,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -129,5 +129,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-pojo/pom.xml b/examples/camel-example-spring-boot-pojo/pom.xml
index 7920fe0..2785969 100644
--- a/examples/camel-example-spring-boot-pojo/pom.xml
+++ b/examples/camel-example-spring-boot-pojo/pom.xml
@@ -112,9 +112,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -127,5 +127,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-rest-jpa/pom.xml b/examples/camel-example-spring-boot-rest-jpa/pom.xml
index a79b32d..5c94611 100644
--- a/examples/camel-example-spring-boot-rest-jpa/pom.xml
+++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml
@@ -145,9 +145,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -160,6 +160,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
index 6210564..42a9c0f 100644
--- a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
@@ -141,9 +141,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -156,5 +156,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot-xml/pom.xml b/examples/camel-example-spring-boot-xml/pom.xml
index 29e6a0a..1055a66 100644
--- a/examples/camel-example-spring-boot-xml/pom.xml
+++ b/examples/camel-example-spring-boot-xml/pom.xml
@@ -139,9 +139,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -154,5 +154,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-boot/pom.xml b/examples/camel-example-spring-boot/pom.xml
index 64808c4..4c3e662 100644
--- a/examples/camel-example-spring-boot/pom.xml
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -138,9 +138,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -153,5 +153,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml
index 64fd1e4..2c9f819 100644
--- a/examples/camel-example-spring-jms/pom.xml
+++ b/examples/camel-example-spring-jms/pom.xml
@@ -145,9 +145,9 @@
</properties>
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -160,6 +160,19 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
diff --git a/examples/camel-example-transformer-demo/pom.xml b/examples/camel-example-transformer-demo/pom.xml
index a85874b..37a9939 100644
--- a/examples/camel-example-transformer-demo/pom.xml
+++ b/examples/camel-example-transformer-demo/pom.xml
@@ -106,9 +106,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -121,5 +121,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/examples/camel-example-validator-spring-boot/pom.xml b/examples/camel-example-validator-spring-boot/pom.xml
index 417f2b4..b3bde27 100644
--- a/examples/camel-example-validator-spring-boot/pom.xml
+++ b/examples/camel-example-validator-spring-boot/pom.xml
@@ -127,9 +127,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -142,5 +142,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index b203389..707dfc5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,10 +40,12 @@
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
- <activemq-version>5.15.4</activemq-version>
+ <activation-api-version>1.2.0</activation-api-version>
<activemq-artemis-version>2.6.2</activemq-artemis-version>
+ <activemq-version>5.15.4</activemq-version>
<aether-version>1.0.2.v20150114</aether-version>
<ahc-version>2.5.2</ahc-version>
+ <annotation-api-version>1.3.2</annotation-api-version>
<ant-bundle-version>1.7.0_6</ant-bundle-version>
<antlr-bundle-version>3.5.2_1</antlr-bundle-version>
<antlr-runtime-bundle-version>3.5.2_1</antlr-runtime-bundle-version>
@@ -170,7 +172,7 @@
<couchbase-client-version>1.4.13</couchbase-client-version>
<couchbase-client-bundle-version>1.4.13_1</couchbase-client-bundle-version>
<curator-version>2.12.0</curator-version>
- <cxf-version>3.2.5</cxf-version>
+ <cxf-version>3.3.0-SNAPSHOT</cxf-version><!-- we need SNAPSHOT version for Java 11 support, see CXF-7741 -->
<cxf-version-range>[3.1,4.0)</cxf-version-range>
<cxf-xjc-plugin-version>3.2.0</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.2.0</cxf-xjc-utils-version>
@@ -625,6 +627,7 @@
<snakeyaml-version>1.21</snakeyaml-version>
<snappy-version>1.1.4</snappy-version>
<snmp4j-version>2.6.2_1</snmp4j-version>
+ <soap-api-version>1.4.0</soap-api-version>
<solr-bundle-version>7.2.1_1</solr-bundle-version>
<!-- solr version aligned with lucene -->
<solr-version>7.2.1</solr-version>
@@ -708,6 +711,7 @@
<vertx-jackson-version>2.9.0</vertx-jackson-version>
<vysper-version>0.7</vysper-version>
<web3j-version>3.4.0</web3j-version>
+ <webservices-api-version>2.1-b16</webservices-api-version>
<weld1-version>1.1.28.Final</weld1-version>
<weld2-version>2.4.7.Final</weld2-version>
<weld3-version>3.0.4.Final</weld3-version>
@@ -5242,7 +5246,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>
@@ -5715,9 +5719,9 @@
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<properties>
<cxf.codegen.jvmArgs>--add-modules java.activation,java.xml.bind,java.xml.ws --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.marshaller=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-open [...]
@@ -5771,5 +5775,57 @@
</pluginManagement>
</build>
</profile>
+
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <properties>
+ <cxf.codegen.jvmArgs>--add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED</cxf.codegen.jvmArgs>
+ <cxf.xjc.jvmArgs>--add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED</cxf.xjc.jvmArgs>
+ <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
+ <camel.surefire.fork.vmargs>--add-modules java.sql --add-opens java.base/javax.net=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add [...]
+ </properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-package-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin-version}</version>
+ <configuration>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ <maxmem>512M</maxmem>
+ <fork>true</fork>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!--lets avoid polluting every pom.xml as these settings are almost always needed-->
+ <configuration>
+ <argLine>${camel.surefire.fork.vmargs}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/platforms/camel-catalog-rest/pom.xml b/platforms/camel-catalog-rest/pom.xml
index f9c4c3b..332ce41 100644
--- a/platforms/camel-catalog-rest/pom.xml
+++ b/platforms/camel-catalog-rest/pom.xml
@@ -184,7 +184,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar ${camel.surefire.fork.vmargs}</argLine>
+ <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${annotation-api-version}.jar ${camel.surefire.fork.vmargs}</argLine>
</configuration>
</plugin>
<plugin>
@@ -203,7 +203,7 @@
<artifactItem>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>${annotation-api-version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.basedir}/target/java9</outputDirectory>
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index d961b69..b20c97b 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -370,9 +370,9 @@
</modules>
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -385,5 +385,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/tests/camel-blueprint-test/pom.xml b/tests/camel-blueprint-test/pom.xml
index af08026..939129b 100644
--- a/tests/camel-blueprint-test/pom.xml
+++ b/tests/camel-blueprint-test/pom.xml
@@ -64,9 +64,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -79,5 +79,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/tooling/apt/pom.xml b/tooling/apt/pom.xml
index 6afd3aa..c5aefbc 100644
--- a/tooling/apt/pom.xml
+++ b/tooling/apt/pom.xml
@@ -97,4 +97,20 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
index c3546ca..9837ab6 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
@@ -150,7 +150,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
+ <version>3.6-SNAPSHOT</version>
<configuration>
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 47cf92a..1456554 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -196,7 +196,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
+ <version>${annotation-api-version}</version>
</dependency>
</dependencies>
</profile>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index 9c7e449..aa0d93c 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -114,7 +114,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
+ <version>${annotation-api-version}</version>
</dependency>
</dependencies>
</profile>
[camel] 03/04: CAMEL-12618: Support APT 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 06f7aecc0c43d4d4b0d477e5309dfa80a7e1a2b2
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Jul 16 10:46:23 2018 +0200
CAMEL-12618: Support APT on Java 11
With this the annotation processors support the latest Java source
version thus enabling them to work on Java >8.
Also renames two classes that are not annotation processors so the
distinction can be seen from the class name.
---
...ationProcessor.java => CoreEipAnnotationProcessorHelper.java} | 2 +-
.../org/apache/camel/tools/apt/EndpointAnnotationProcessor.java | 6 +++++-
.../org/apache/camel/tools/apt/ModelAnnotationProcessor.java | 9 ++++++---
...tationProcessor.java => SpringAnnotationProcessorHelper.java} | 7 +------
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
similarity index 99%
rename from tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
rename to tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
index 4b66859..1849903 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
@@ -59,7 +59,7 @@ import static org.apache.camel.tools.apt.helper.Strings.safeNull;
/**
* Process all camel-core's model classes (EIPs and DSL) and generate json schema documentation
*/
-public class CoreEipAnnotationProcessor {
+public class CoreEipAnnotationProcessorHelper {
// special when using expression/predicates in the model
private static final String ONE_OF_TYPE_NAME = "org.apache.camel.model.ExpressionSubElementDefinition";
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index bd603a7..76e2225 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -70,7 +70,6 @@ import static org.apache.camel.tools.apt.helper.Strings.isNullOrEmpty;
* Processes all Camel {@link UriEndpoint}s and generate json schema documentation for the endpoint/component.
*/
@SupportedAnnotationTypes({"org.apache.camel.spi.*"})
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
public class EndpointAnnotationProcessor extends AbstractProcessor {
// CHECKSTYLE:OFF
@@ -94,6 +93,11 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
return true;
}
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+
private void processEndpointClass(final RoundEnvironment roundEnv, final TypeElement classElement) {
final UriEndpoint uriEndpoint = classElement.getAnnotation(UriEndpoint.class);
if (uriEndpoint != null) {
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
index c226b2e..ee14fe7 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
@@ -33,11 +33,10 @@ import static org.apache.camel.tools.apt.helper.Strings.canonicalClassName;
* APT compiler plugin to generate JSon Schema for all EIP models and camel-spring's <camelContext> types.
*/
@SupportedAnnotationTypes({"javax.xml.bind.annotation.*", "org.apache.camel.spi.Label"})
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
public class ModelAnnotationProcessor extends AbstractProcessor {
- private CoreEipAnnotationProcessor coreProcessor = new CoreEipAnnotationProcessor();
- private SpringAnnotationProcessor springProcessor = new SpringAnnotationProcessor();
+ private CoreEipAnnotationProcessorHelper coreProcessor = new CoreEipAnnotationProcessorHelper();
+ private SpringAnnotationProcessorHelper springProcessor = new SpringAnnotationProcessorHelper();
@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
@@ -68,4 +67,8 @@ public class ModelAnnotationProcessor extends AbstractProcessor {
return true;
}
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
}
\ No newline at end of file
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessorHelper.java
similarity index 98%
rename from tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
rename to tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessorHelper.java
index d7357cd..01ca8f8 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessorHelper.java
@@ -24,9 +24,6 @@ import java.util.Set;
import java.util.TreeSet;
import javax.annotation.processing.ProcessingEnvironment;
import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.SourceVersion;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
@@ -56,9 +53,7 @@ import static org.apache.camel.tools.apt.helper.Strings.safeNull;
/**
* Process camel-spring's <camelContext> and generate json schema documentation
*/
-@SupportedAnnotationTypes({"javax.xml.bind.annotation.*", "org.apache.camel.spi.Label"})
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
-public class SpringAnnotationProcessor {
+public class SpringAnnotationProcessorHelper {
protected void processModelClass(final ProcessingEnvironment processingEnv, final RoundEnvironment roundEnv, final TypeElement classElement) {
final String javaTypeName = canonicalClassName(classElement.getQualifiedName().toString());
[camel] 01/04: Temporary disable JDK 9 build
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 9015bef7a2fc048e3474569e387c602d2c84c33b
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jul 13 11:47:05 2018 +0200
Temporary disable JDK 9 build
---
Jenkinsfile.daily | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index f49f417..666df82 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -23,7 +23,7 @@ def BUILD_JDK_NAME = env.JDK_NAME ?: 'JDK 1.8 (latest)'
def MAVEN_PARAMS = "-U -B -e -fae -V -Dmaven.repo.local=${LOCAL_REPOSITORY} -Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2"
-def jdk9_result, jdk10_result, jdk11_result
+def jdk10_result, jdk11_result
pipeline {
@@ -53,24 +53,6 @@ pipeline {
}
}
- 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)'
@@ -112,7 +94,7 @@ pipeline {
post {
always {
script {
- currentBuild.result = jdk9_result == 0 && jdk10_result == 0 && jdk11_result == 0 ? 'SUCCESS' : 'FAILURE'
+ currentBuild.result = jdk10_result == 0 && jdk11_result == 0 ? 'SUCCESS' : 'FAILURE'
}
}
}