This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit d057297a575726e2919420285de7b35b229a0bc9 Merge: 9f562b9370a 5f761bfcabf Author: Croway <[email protected]> AuthorDate: Mon Mar 13 16:40:44 2023 +0100 Merge branch 'camel-3.x' of github.com:apache/camel into camel-3.x bom/camel-bom/pom.xml | 10 + camel-dependencies/pom.xml | 4 +- catalog/camel-allcomponents/pom.xml | 10 + .../apache/camel/catalog/components/direct-vm.json | 2 +- .../org/apache/camel/catalog/components/vm.json | 2 +- .../camel-dhis2-api}/pom.xml | 42 ++- .../services/org/apache/camel/other.properties | 7 + .../src/generated/resources/dhis2-api.json | 14 + .../apache/camel/component/dhis2/api/Dhis2Get.java | 97 ++++++ .../camel/component/dhis2/api/Dhis2Post.java | 57 ++++ .../component/dhis2/api/Dhis2ResourceTables.java | 65 ++++ .../component/dhis2/api/Dhis2GetTestCase.java | 140 +++++++++ .../component/dhis2/api/Dhis2PostTestCase.java | 79 +++++ .../camel-dhis2/camel-dhis2-component/pom.xml | 164 ++++++++++ .../signatures/file-sig-api.txt | 21 ++ .../component/dhis2/Dhis2ComponentConfigurer.java | 105 +++++++ .../dhis2/Dhis2ConfigurationConfigurer.java | 79 +++++ .../component/dhis2/Dhis2EndpointConfigurer.java | 222 ++++++++++++++ .../component/dhis2/Dhis2EndpointUriFactory.java | 111 +++++++ .../dhis2/Dhis2GetEndpointConfiguration.java | 89 ++++++ .../Dhis2GetEndpointConfigurationConfigurer.java | 147 +++++++++ .../dhis2/Dhis2PostEndpointConfiguration.java | 56 ++++ .../Dhis2PostEndpointConfigurationConfigurer.java | 126 ++++++++ .../Dhis2ResourceTablesEndpointConfiguration.java | 67 +++++ ...ourceTablesEndpointConfigurationConfigurer.java | 124 ++++++++ .../dhis2/internal/Dhis2ApiCollection.java | 77 +++++ .../component/dhis2/internal/Dhis2ApiName.java | 32 ++ .../dhis2/internal/Dhis2GetApiMethod.java | 61 ++++ .../dhis2/internal/Dhis2PostApiMethod.java | 50 ++++ .../internal/Dhis2ResourceTablesApiMethod.java | 51 ++++ .../services/org/apache/camel/component.properties | 8 +- .../services/org/apache/camel/component/dhis2 | 2 + .../org/apache/camel/configurer/dhis2-component | 2 + .../org/apache/camel/configurer/dhis2-endpoint | 2 + ...apache.camel.component.dhis2.Dhis2Configuration | 2 + ...l.component.dhis2.Dhis2GetEndpointConfiguration | 2 + ....component.dhis2.Dhis2PostEndpointConfiguration | 2 + ....dhis2.Dhis2ResourceTablesEndpointConfiguration | 2 + .../org/apache/camel/urifactory/dhis2-endpoint | 2 + .../org/apache/camel/component/dhis2/dhis2.json | 74 +++++ .../src/main/docs/dhis2-component.adoc | 329 +++++++++++++++++++++ .../camel/component/dhis2/Dhis2Component.java | 86 ++++++ .../camel/component/dhis2/Dhis2Configuration.java | 97 ++++++ .../camel/component/dhis2/Dhis2Consumer.java | 29 ++ .../camel/component/dhis2/Dhis2Endpoint.java | 112 +++++++ .../camel/component/dhis2/Dhis2Producer.java | 28 ++ .../component/dhis2/internal/Dhis2Constants.java | 29 ++ .../dhis2/internal/Dhis2PropertiesHelper.java | 40 +++ .../component/dhis2/AbstractDhis2TestSupport.java | 85 ++++++ .../apache/camel/component/dhis2/Dhis2GetIT.java | 97 ++++++ .../apache/camel/component/dhis2/Dhis2PostIT.java | 71 +++++ .../component/dhis2/Dhis2ResourceTablesIT.java | 67 +++++ .../apache/camel/component/dhis2/Environment.java | 108 +++++++ .../src/test/resources/dhis.conf | 5 + .../src/test/resources/log4j2-test.xml} | 35 +-- .../src/test/resources/test-options.properties | 18 ++ components/{camel-vm => camel-dhis2}/pom.xml | 26 +- components/camel-directvm/pom.xml | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../apache/camel/component/directvm/direct-vm.json | 2 +- .../src/main/docs/direct-vm-component.adoc | 5 +- .../djl/ImageClassificationLocalTest.java | 2 +- .../component/djl/ImageClassificationTest.java | 2 +- .../test/resources/models/mnist/mlp-0007.params | Bin 438234 -> 0 bytes .../test/resources/models/mnist/mlp-0020.params | Bin 0 -> 438290 bytes .../component/micrometer/MicrometerUtils.java | 27 +- .../micrometer/MicrometerComponentTest.java | 53 +++- components/camel-vm/pom.xml | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../org/apache/camel/component/vm/vm.json | 2 +- .../camel-vm/src/main/docs/vm-component.adoc | 5 +- .../camel/component/zookeeper/cloud/MetaData.java | 32 ++ .../zookeeper/cloud/ZooKeeperServiceDiscovery.java | 4 - .../zookeeper/cloud/ZooKeeperServiceRegistry.java | 12 - .../SpringZooKeeperServiceCallRouteIT.java | 14 +- .../integration/ZooKeeperServiceCallRouteIT.java | 16 +- .../integration/ZooKeeperServiceDiscoveryIT.java | 11 +- .../ZooKeeperServiceRegistrationITBase.java | 11 +- components/pom.xml | 1 + .../modules/ROOT/examples/json/dhis2.json | 1 + docs/components/modules/ROOT/nav.adoc | 1 + .../modules/ROOT/pages/dhis2-component.adoc | 1 + .../modules/others/examples/json/dhis2-api.json | 1 + .../component/ComponentsBuilderFactory.java | 2 + .../dsl/DirectVmComponentBuilderFactory.java | 1 + .../component/dsl/VmComponentBuilderFactory.java | 1 + .../src/generated/resources/metadata.json | 4 +- .../builder/endpoint/StaticEndpointBuilders.java | 4 + .../dsl/DirectVmEndpointBuilderFactory.java | 3 + .../endpoint/dsl/VmEndpointBuilderFactory.java | 3 + .../dsl/jbang/core/commands/CamelJBangMain.java | 8 +- .../core/commands/version/VersionCommand.java | 37 +++ .../jbang/core/commands/version/VersionGet.java | 53 ++++ .../jbang/core/commands/version/VersionList.java | 191 ++++++++++++ .../camel/dsl/jbang/core/common/VersionHelper.java | 44 ++- .../camel/main/download/DependencyDownloader.java | 14 + .../main/download/MavenDependencyDownloader.java | 150 ++++++++++ .../org/apache/camel/main/util}/VersionHelper.java | 38 ++- .../java/org/apache/camel/main/util/XmlHelper.java | 63 ++++ parent/pom.xml | 14 +- 100 files changed, 4187 insertions(+), 125 deletions(-)
