You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/03/06 22:37:11 UTC
[camel-k-runtime] branch master updated (330ffca -> ced4a97)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git.
from 330ffca chore: cleanup CamelCapability model
add e848c8f add support for routes loaders interceptors #227
add a327e2e Adapt tests to new model definitions in camel 3.1.x
add 67883e4 Adapt to latest runtime bits
add 61e1a83 Disable tests because of https://github.com/apache/camel-k-runtime/issues/236
add 4c4440e Adapt to camel 3.1.x tooling
add f5d973e add support for routes loaders interceptors #227
add b2b3e32 Adapt to camel 3.1.0 and camel-quarkus 1.0.0-M4
add 617ec64 Update to spock 2.0-M2-groovy-3.0
add 08145b1 Add camel-k-runtime-example-groovy
add 8386009 Webhook endpoint may not be fully initialized when the route policy is applied #236
add 9e5a46a Replace camel-swagger-rest-dsl-generator with camel-openapi-rest-dsl-generator #232
add a1ddb91 Allow to configure default properties values #250
add 4594553 camel-k-loader-xml - Use camel-xml-io for loading XML #246
add 09d2712 Set version to 1.2.0-SNAPSHOT
add ef3c9b7 Update native image configuration to the latest Quarkus standards
add 23c130f Update log4j to v2.13.1
add 7ff9b42 Update kotlin to v1.3.70
add c74f47e Allow to configure default properties values #250 (fix for file not found)
add ed976bb Fix CS
add ced4a97 Fix camel-k-loader-xml failure on Java 11
No new revisions were added by this update.
Summary of changes:
camel-k-loader-groovy/pom.xml | 6 +-
.../k/loader/groovy/GroovySourceLoader.groovy | 5 +-
.../apache/camel/k/loader/groovy/LoaderTest.groovy | 12 +-
camel-k-loader-java/pom.xml | 2 +-
.../camel/k/loader/java/JavaSourceLoader.java | 9 +-
.../camel/k/loader/java/RoutesLoaderTest.java | 27 ++-
camel-k-loader-js/pom.xml | 2 +-
.../camel/k/loader/js/JavaScriptSourceLoader.java | 4 +-
.../apache/camel/k/loader/js/RoutesLoaderTest.java | 11 +-
camel-k-loader-knative/pom.xml | 196 ---------------------
.../k/loader/knative/KnativeSourceLoader.java | 143 ---------------
camel-k-loader-kotlin/pom.xml | 2 +-
.../camel/k/loader/kotlin/KotlinSourceLoader.kt | 4 +-
.../org/apache/camel/k/loader/kotlin/LoaderTest.kt | 13 +-
camel-k-loader-xml/pom.xml | 24 +--
.../apache/camel/k/loader/xml/XmlSourceLoader.java | 37 ++--
.../camel/k/loader/xml/RoutesLoaderTest.java | 19 +-
.../camel-k-loader-yaml-common/pom.xml | 2 +-
.../k/loader/yaml/parser/WireTapStepParser.java | 4 +-
camel-k-loader-yaml/camel-k-loader-yaml/pom.xml | 6 +-
.../camel/k/loader/yaml/YamlSourceLoader.java | 11 +-
.../k/loader/yaml/parser/AggregateTest.groovy | 6 +-
.../k/loader/yaml/parser/ClaimCheckTest.groovy | 4 +-
.../camel/k/loader/yaml/parser/DelayTest.groovy | 4 +-
.../camel/k/loader/yaml/parser/LogTest.groovy | 4 +-
.../camel/k/loader/yaml/parser/LoopTest.groovy | 4 +-
.../k/loader/yaml/parser/MulticastTest.groovy | 4 +-
.../k/loader/yaml/parser/RecipientListTest.groovy | 8 +-
.../k/loader/yaml/parser/ResequenceTest.groovy | 8 +-
.../camel/k/loader/yaml/parser/SampleTest.groovy | 2 +-
.../camel/k/loader/yaml/parser/ThreadsTest.groovy | 2 +-
camel-k-loader-yaml/pom.xml | 2 +-
camel-k-main/camel-k-runtime-health/pom.xml | 2 +-
camel-k-main/camel-k-runtime-inspector/pom.xml | 2 +-
camel-k-main/camel-k-runtime-main/pom.xml | 2 +-
.../apache/camel/k/main/ApplicationRuntime.java | 27 ++-
.../org/apache/camel/k/main/PropertiesTest.java | 50 ++++--
camel-k-main/pom.xml | 2 +-
.../camel-k-quarkus-core/deployment/pom.xml | 2 +-
.../quarkus/deployment/DeploymentProcessor.java | 2 +-
.../deployment/devmode/HotReplacementSetup.java | 26 ---
....quarkus.deployment.devmode.HotReplacementSetup | 18 --
camel-k-quarkus/camel-k-quarkus-core/it/pom.xml | 23 +--
camel-k-quarkus/camel-k-quarkus-core/pom.xml | 2 +-
.../camel-k-quarkus-core/runtime/pom.xml | 7 +-
.../k/core/quarkus/RuntimeListenerAdapter.java | 28 +++
.../core/quarkus/devmode/HotReplacementSetup.java | 11 +-
.../io.quarkus.dev.spi.HotReplacementSetup | 2 +-
.../camel-k-quarkus-knative/deployment/pom.xml | 2 +-
camel-k-quarkus/camel-k-quarkus-knative/pom.xml | 2 +-
.../camel-k-quarkus-knative/runtime/pom.xml | 4 +-
.../deployment/pom.xml | 2 +-
.../camel-k-quarkus-loader-groovy/pom.xml | 2 +-
.../camel-k-quarkus-loader-groovy/runtime/pom.xml | 2 +-
.../camel-k-quarkus-loader-java/deployment/pom.xml | 2 +-
.../camel-k-quarkus-loader-java/pom.xml | 2 +-
.../camel-k-quarkus-loader-java/runtime/pom.xml | 2 +-
.../camel-k-quarkus-loader-js/deployment/pom.xml | 2 +-
.../js/quarkus/deployment/DeploymentProcessor.java | 5 +-
.../camel-k-quarkus-loader-js/it/pom.xml | 30 +---
.../loader/js/quarkus/deployment/Application.java | 5 +
camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml | 2 +-
.../camel-k-quarkus-loader-js/runtime/pom.xml | 2 +-
.../deployment/pom.xml | 71 --------
.../loader/knative/quarkus/deployment/Feature.java | 29 ---
.../camel-k-quarkus-loader-knative/pom.xml | 36 ----
.../camel-k-quarkus-loader-knative/runtime/pom.xml | 86 ---------
.../deployment/pom.xml | 2 +-
.../camel-k-quarkus-loader-kotlin/pom.xml | 2 +-
.../camel-k-quarkus-loader-kotlin/runtime/pom.xml | 2 +-
.../camel-k-quarkus-loader-xml/deployment/pom.xml | 6 +-
.../{Feature.java => DeploymentProcessor.java} | 18 +-
.../camel-k-quarkus-loader-xml/it/pom.xml | 26 +--
.../loader/xml/quarkus/deployment/Application.java | 5 +-
camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml | 2 +-
.../camel-k-quarkus-loader-xml/runtime/pom.xml | 6 +-
.../k/loader/xml/quarkus/XmlLoaderRecorder.java | 40 +++++
.../camel-k-quarkus-loader-yaml/deployment/pom.xml | 2 +-
.../camel-k-quarkus-loader-yaml/it/pom.xml | 27 +--
.../yaml/quarkus/deployment/Application.java | 5 +-
.../camel-k-quarkus-loader-yaml/pom.xml | 2 +-
.../camel-k-quarkus-loader-yaml/runtime/pom.xml | 2 +-
.../camel-k-runtime-quarkus/deployment/pom.xml | 2 +-
camel-k-quarkus/camel-k-runtime-quarkus/pom.xml | 2 +-
.../camel-k-runtime-quarkus/runtime/pom.xml | 2 +-
.../ApplicationRuntimeConfigSourceProvider.java | 55 ------
...se.microprofile.config.spi.ConfigSourceProvider | 17 --
camel-k-quarkus/pom.xml | 3 +-
camel-k-runtime-bom/pom.xml | 7 +-
camel-k-runtime-core/pom.xml | 2 +-
.../main/java/org/apache/camel/k/Constants.java | 14 +-
.../src/main/java/org/apache/camel/k/Runtime.java | 56 +++++-
.../src/main/java/org/apache/camel/k/Source.java | 2 +
.../main/java/org/apache/camel/k/SourceLoader.java | 79 ++++++++-
.../src/main/java/org/apache/camel/k/Sources.java | 36 +++-
.../apache/camel/k/listener/RoutesConfigurer.java | 33 +++-
...ntextConfigurer.java => RuntimeConfigurer.java} | 27 +--
.../apache/camel/k/support/PropertiesSupport.java | 63 ++++---
.../org/apache/camel/k/support/RuntimeSupport.java | 81 ++++++++-
.../services/org.apache.camel.k.Runtime$Listener | 1 +
.../apache/camel/k/support/RuntimeSupportTest.java | 6 +-
camel-k-runtime-cron/pom.xml | 13 +-
.../camel/k/cron/CronRoutePolicyFactory.java | 72 --------
.../apache/camel/k/cron/CronRuntimeListener.java | 82 ---------
.../camel/k/cron/CronSourceLoaderInterceptor.java | 99 +++++++++++
.../java/org/apache/camel/k/cron/CronTest.java | 23 +--
camel-k-runtime-knative/pom.xml | 99 ++++++++++-
.../knative/KnativeSourceLoaderInterceptor.java | 72 ++++++++
.../knative/yaml/parser/KnativeConverterTest.java | 11 +-
.../knative/KnativeSourceRoutesLoaderTest.java | 56 +++---
.../src/test/resources/sources}/routes.groovy | 0
.../src/test/resources/sources}/routes.java | 0
.../src/test/resources/sources}/routes.js | 0
.../src/test/resources/sources}/routes.kts | 0
.../src/test/resources/sources}/routes.xml | 0
.../src/test/resources/sources}/routes.yaml | 0
camel-k-runtime-master/pom.xml | 2 +-
camel-k-runtime-webhook/pom.xml | 2 +-
.../camel/k/webhook/WebhookRoutePolicyFactory.java | 32 ++--
camel-knative/camel-knative-api/pom.xml | 35 ++--
.../knative/spi/CloudEventTypeConverterLoader.java | 36 ++++
.../services/org/apache/camel/TypeConverterLoader | 2 +
camel-knative/camel-knative-http/pom.xml | 19 +-
.../component/knative/http/KnativeHttpTest.java | 2 +-
camel-knative/camel-knative/pom.xml | 35 ++--
.../knative/KnativeComponentConfigurer.java | 38 ++++
.../knative/KnativeEndpointConfigurer.java | 51 ++++++
.../services/org/apache/camel/component/knative | 2 +
.../org/apache/camel/configurer/knative-component | 2 +
.../org/apache/camel/configurer/knative-endpoint | 2 +
.../apache/camel/component/knative/knative.json | 52 ++++++
.../camel/component/knative/KnativeComponent.java | 3 +
.../component/knative/KnativeConfiguration.java | 6 +-
.../knative/ce/AbstractCloudEventProcessor.java | 3 +-
camel-knative/pom.xml | 2 +-
distribution/pom.xml | 2 +-
.../data}/application.properties | 6 +-
.../data/routes.groovy | 2 +-
.../pom.xml | 16 +-
examples/camel-k-runtime-example-health/pom.xml | 2 +-
examples/camel-k-runtime-example-knative/pom.xml | 2 +-
.../camel-k-runtime-example-quarkus-groovy/pom.xml | 2 +-
.../camel-k-runtime-example-quarkus-java/pom.xml | 2 +-
.../camel-k-runtime-example-quarkus-js/pom.xml | 28 +--
.../pom.xml | 24 +--
.../data/application.properties | 4 +-
.../data/routes.xml | 25 ++-
.../pom.xml | 36 +---
.../src/main/resources/application.properties | 0
.../data/application.properties | 2 +-
.../data/conf.d/user.properties | 6 +-
.../data/routes.yaml | 2 +-
.../camel-k-runtime-example-quarkus-yaml/pom.xml | 42 +++--
examples/camel-k-runtime-example-yaml/pom.xml | 12 +-
.../src/main/resources/conf.d/user.properties} | 9 +-
.../src/main/resources/conf/application.properties | 8 +-
.../src/main/resources/routes.yaml | 16 +-
examples/pom.xml | 4 +-
pom.xml | 30 ++--
tooling/camel-k-annotations/pom.xml | 2 +-
.../{Loader.java => LoaderInterceptor.java} | 4 +-
tooling/camel-k-apt/pom.xml | 21 ++-
.../apache/camel/k/tooling/apt/CamelProcessor.java | 15 +-
.../services/javax.annotation.processing.Processor | 2 +-
tooling/camel-k-maven-plugin/pom.xml | 15 +-
.../src/it/generate-catalog-main/pom.xml | 4 +-
.../src/it/generate-catalog-main/verify.groovy | 2 +-
.../src/it/generate-catalog-quarkus/pom.xml | 4 +-
.../src/it/generate-catalog-quarkus/verify.groovy | 4 +-
.../src/it/generate-rest-dsl-from-v2/document.json | 46 +++++
.../pom.xml | 13 +-
.../src/it/generate-rest-dsl-from-v2/verify.groovy | 17 +-
.../src/it/generate-rest-dsl-from-v3/document.yaml | 127 +++++++++++++
.../pom.xml | 13 +-
.../generate-rest-dsl-from-v3/verify.groovy} | 30 ++--
.../camel/k/tooling/maven/GenerateCatalogMojo.java | 60 +++----
.../camel/k/tooling/maven/GenerateRestXML.java | 48 +++--
tooling/pom.xml | 2 +-
178 files changed, 1699 insertions(+), 1581 deletions(-)
delete mode 100644 camel-k-loader-knative/pom.xml
delete mode 100644 camel-k-loader-knative/src/main/java/org/apache/camel/k/loader/knative/KnativeSourceLoader.java
delete mode 100644 camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/devmode/HotReplacementSetup.java
delete mode 100644 camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/resources/META-INF/services/io.quarkus.deployment.devmode.HotReplacementSetup
copy camel-k-loader-java/src/test/resources/MyRoutesWithNameOverride.java => camel-k-quarkus/camel-k-quarkus-core/runtime/src/main/java/org/apache/camel/k/core/quarkus/devmode/HotReplacementSetup.java (77%)
copy camel-k-runtime-core/src/test/resources/META-INF/services/org/apache/camel/k/customizer/name => camel-k-quarkus/camel-k-quarkus-core/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup (92%)
delete mode 100644 camel-k-quarkus/camel-k-quarkus-loader-knative/deployment/pom.xml
delete mode 100644 camel-k-quarkus/camel-k-quarkus-loader-knative/deployment/src/main/java/org/apache/camel/k/loader/knative/quarkus/deployment/Feature.java
delete mode 100644 camel-k-quarkus/camel-k-quarkus-loader-knative/pom.xml
delete mode 100644 camel-k-quarkus/camel-k-quarkus-loader-knative/runtime/pom.xml
copy camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/src/main/java/org/apache/camel/k/loader/xml/quarkus/deployment/{Feature.java => DeploymentProcessor.java} (58%)
create mode 100644 camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/src/main/java/org/apache/camel/k/loader/xml/quarkus/XmlLoaderRecorder.java
delete mode 100644 camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRuntimeConfigSourceProvider.java
delete mode 100644 camel-k-quarkus/camel-k-runtime-quarkus/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
copy camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/{ContextConfigurer.java => RuntimeConfigurer.java} (64%)
delete mode 100644 camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronRoutePolicyFactory.java
delete mode 100644 camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronRuntimeListener.java
create mode 100644 camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronSourceLoaderInterceptor.java
create mode 100644 camel-k-runtime-knative/src/main/java/org/apache/camel/k/loader/knative/KnativeSourceLoaderInterceptor.java
rename {camel-k-loader-knative => camel-k-runtime-knative}/src/test/java/org/apache/camel/k/loader/knative/KnativeSourceRoutesLoaderTest.java (75%)
rename {camel-k-loader-knative/src/test/resources => camel-k-runtime-knative/src/test/resources/sources}/routes.groovy (100%)
rename {camel-k-loader-knative/src/test/resources => camel-k-runtime-knative/src/test/resources/sources}/routes.java (100%)
rename {camel-k-loader-knative/src/test/resources => camel-k-runtime-knative/src/test/resources/sources}/routes.js (100%)
rename {camel-k-loader-knative/src/test/resources => camel-k-runtime-knative/src/test/resources/sources}/routes.kts (100%)
rename {camel-k-loader-knative/src/test/resources => camel-k-runtime-knative/src/test/resources/sources}/routes.xml (100%)
rename {camel-k-loader-knative/src/test/resources => camel-k-runtime-knative/src/test/resources/sources}/routes.yaml (100%)
create mode 100644 camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/CloudEventTypeConverterLoader.java
create mode 100644 camel-knative/camel-knative-api/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
create mode 100644 camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeComponentConfigurer.java
create mode 100644 camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeEndpointConfigurer.java
create mode 100644 camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/component/knative
create mode 100644 camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/configurer/knative-component
create mode 100644 camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/configurer/knative-endpoint
create mode 100644 camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json
copy examples/{camel-k-runtime-example-knative/src/main/resources => camel-k-runtime-example-groovy/data}/application.properties (92%)
copy examples/{camel-k-runtime-example-quarkus-groovy => camel-k-runtime-example-groovy}/data/routes.groovy (97%)
copy examples/{camel-k-runtime-example-health => camel-k-runtime-example-groovy}/pom.xml (85%)
copy examples/{camel-k-runtime-example-quarkus-java => camel-k-runtime-example-quarkus-xml}/data/application.properties (97%)
rename camel-k-loader-knative/src/test/resources/log4j2-test.xml => examples/camel-k-runtime-example-quarkus-xml/data/routes.xml (67%)
copy examples/{camel-k-runtime-example-quarkus-yaml => camel-k-runtime-example-quarkus-xml}/pom.xml (81%)
copy examples/{camel-k-runtime-example-quarkus-yaml => camel-k-runtime-example-quarkus-xml}/src/main/resources/application.properties (100%)
copy camel-k-main/camel-k-runtime-main/src/test/resources/conf.d/001/conf.properties => examples/camel-k-runtime-example-quarkus-yaml/data/conf.d/user.properties (96%)
copy examples/{camel-k-runtime-example-knative/src/main/resources/application.properties => camel-k-runtime-example-yaml/src/main/resources/conf.d/user.properties} (91%)
copy tooling/camel-k-annotations/src/main/java/org/apache/camel/k/annotation/{Loader.java => LoaderInterceptor.java} (94%)
rename camel-k-runtime-cron/src/main/resources/META-INF/services/org.apache.camel.k.Runtime$Listener => tooling/camel-k-apt/src/main/resources/META-INF/services/javax.annotation.processing.Processor (94%)
create mode 100644 tooling/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v2/document.json
copy tooling/camel-k-maven-plugin/src/it/{generate-catalog-main => generate-rest-dsl-from-v2}/pom.xml (89%)
copy camel-k-loader-groovy/src/test/resources/routes-with-component-wrong-property-configuration.groovy => tooling/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v2/verify.groovy (70%)
create mode 100644 tooling/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v3/document.yaml
copy tooling/camel-k-maven-plugin/src/it/{generate-catalog-main => generate-rest-dsl-from-v3}/pom.xml (89%)
copy tooling/camel-k-maven-plugin/src/{main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java => it/generate-rest-dsl-from-v3/verify.groovy} (56%)