You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by fm...@apache.org on 2024/01/25 12:46:13 UTC
(camel-spring-boot) branch camel-spring-boot-4.0.0-branch updated (bdac313dec9 -> f334dab28c1)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a change to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
from bdac313dec9 Upgrade failing test to FHIR 6.6.1 (#931)
new 65a1a102412 Override infinispan-bom
new e997a5ea288 Added omp dependency for PME alignment.
new 2590207ba8b Disable artifacts tests (#267)
new 54857d93274 Remove compiler plugin from archetype
new 2490746804f Remove camel-jq-starter from list of productized starters; has a -pre… (#266)
new 610e2a200f4 Upgrade to spring-boot 3.1.4 (#953)
new 9ac3cb0e88b CAMEL-19869: camel-infinispan - Disable failing ITs (#944)
new ced53451b69 CAMEL-19854: camel-kafka - Disable the test KafkaConsumerHealthCheckIT (#945)
new 84e08db31b2 CAMEL-19851: camel-http - Allow to configure timeouts natively (#942)
new aef47c69e5f [CAMEL-19854]re-enable KafkaConsumerHealthCheckIT as it's OK now
new 67ad1e95eee Regeneration
new 0aa5bf5a233 Fix archetype pom
new 9188e68c57c Disables failing tests
new 7b194c485e6 Override avro/commons-compress (#273)
new e27fedc5813 Add snappy-java override (#272)
new 62f4c1df83f Fix typo
new 27f63e754fa Make test compliant with quay mirroring
new 054241d122f Provide an override for guava (#276)
new 7fcf5b2e108 Add a netty-bom override (#277)
new c2df983a1d5 Add override for the jetty-bom (#280)
new 267ca0d51fc CAMEL-19955: Review the usage of Protostream
new 4ed54d12f70 Change avro version to match camel's avro (1.11.3) (#283)
new 2faa5c55306 Override tomcat version coming in from sb to 10.1.14 (#284)
new ddf1d708ad4 Upgrade spring-boot to 3.1.5, align tomcat with spring-boot (#287)
new a4218590f23 [infinispan] Client property configurable in tests (#995)
new 1ac17b0257b Externalize passwords into properties files, set features to DocumentBuilderFactory (#986)
new 82b0eabc538 Externalize credentials to properties files for SAST tests (#988)
new 1d525e1dd0a Set features to DocumentBuilderFactory to protect from XXE; fix for SAST (#989)
new 3c4771821a3 Add a check for path traversal for SAST tests (#990)
new 013945d9850 Fix CS
new c36fe3d1d09 Add snyk file to ignore tests in SAST analysis
new 478f4f373fc fix: Adapt JAXBRuntimeHints to the behavior change in Spring 6.0.13 (#984) (#291)
new be03f72ee6d Add repository/pluginRepository entries to archetype (#304)
new 141a5fa8ddf Upgrade tomcat to 10.1.16 (#306)
new ad45178c4a4 Upgrade to spring-boot 3.1.6 (#305)
new 181f5e6a835 CSB-3042: [camel-mail] java.lang.ClassNotFoundException: org.eclipse.angus.mail.imap.IMAPStore
new 922dab1fd82 Override logback to 1.4.14 (#308)
new d7d32d9b858 Override reactory-netty-http to 1.1.13 (#309)
new e3a84a1d41c Override version of org.json:json - need a newer version than the one coming in from spring boot (#311)
new f334dab28c1 Add dependencyManagement entries for artifacts being overwritten in redhat BOM (#312)
The 40 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:
.gitignore | 1 +
.mvn/excludes.txt | 1 +
.snyk | 4 +
Jenkinsfile.redhat | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 39 +-
archetypes/pom.xml | 2 +-
.../springboot/catalog/components/aws2-cw.json | 2 +-
.../springboot/catalog/components/aws2-ddb.json | 2 +-
.../catalog/components/aws2-ddbstream.json | 2 +-
.../catalog/components/aws2-kinesis-firehose.json | 2 +-
.../catalog/components/aws2-kinesis.json | 2 +-
.../springboot/catalog/components/aws2-lambda.json | 2 +-
.../springboot/catalog/components/aws2-s3.json | 2 +-
.../springboot/catalog/components/aws2-sns.json | 6 +-
.../springboot/catalog/components/aws2-sqs.json | 2 +-
.../catalog/components/elasticsearch.json | 65 ++--
.../camel/springboot/catalog/components/kafka.json | 8 +-
.../catalog/components/spring-rabbitmq.json | 19 +-
.../cw/springboot/Cw2ComponentConfiguration.java | 2 +-
.../ddb/springboot/Ddb2ComponentConfiguration.java | 2 +-
.../Ddb2StreamComponentConfiguration.java | 2 +-
.../component/aws2/ddbstream/Ddb2StreamTest.java | 2 +
.../KinesisFirehose2ComponentConfiguration.java | 2 +-
.../springboot/Kinesis2ComponentConfiguration.java | 3 +-
.../aws2/kinesis/KinesisComponentTest.java | 2 +
.../springboot/Lambda2ComponentConfiguration.java | 2 +-
.../springboot/AWS2S3ComponentConfiguration.java | 3 +-
.../src/main/docs/aws2-sns.json | 4 +-
.../sns/springboot/Sns2ComponentConfiguration.java | 14 +-
.../sqs/springboot/Sqs2ComponentConfiguration.java | 2 +-
.../src/main/docs/elasticsearch.json | 7 +
.../ElasticsearchComponentConfiguration.java | 18 +
.../remote/springboot/ftp/FtpEmbeddedService.java | 24 +-
.../src/test/resources/users.properties | 5 +
.../springboot/HttpComponentTimeoutConverter.java} | 45 +--
...rk.boot.autoconfigure.AutoConfiguration.imports | 1 +
.../HttpComponentTimeoutConverterTest.java | 125 ++++++
.../camel-infinispan-starter/pom.xml | 12 +-
.../InfinispanRemoteAggregationRepositoryIT.java | 2 +
...panRemoteAggregationRepositoryOperationsIT.java | 2 +
.../remote/InfinispanRemoteConfigurationIT.java | 4 +-
.../remote/InfinispanRemoteTestSupport.java | 4 +-
.../InfinispanRemoteClusteredTestSupport.java | 52 ++-
...ptedPropertiesIvGeneratorAutoDetectionTest.java | 18 +-
...ptedPropertiesCustomConfigurationBeansTest.java | 17 +-
...ertiesDisabledCustomConfigurationBeansTest.java | 2 +-
.../EncryptedPropertiesDisabledTest.java | 2 +-
.../jasypt/springboot/EncryptedPropertiesTest.java | 2 +-
...tBase.java => EncryptedPropertiesTestBase.java} | 2 +-
.../src/test/resources/test.properties | 2 +
.../springboot/test/AddCommentProducerTest.java | 8 +-
.../springboot/test/AddIssueLinkProducerTest.java | 6 +-
.../jira/springboot/test/AddIssueProducerTest.java | 6 +-
.../springboot/test/AddWorkLogProducerTest.java | 3 +-
.../springboot/test/AttachFileProducerTest.java | 5 +-
.../springboot/test/DeleteIssueProducerTest.java | 3 +-
.../springboot/test/FetchCommentsProducerTest.java | 6 +-
.../springboot/test/FetchIssueProducerTest.java | 3 +-
.../jira/springboot/test/JiraTestConstants.java | 27 +-
.../springboot/test/NewCommentsConsumerTest.java | 6 +-
.../springboot/test/NewIssuesConsumerTest.java | 6 +-
.../test/TransitionIssueProducerTest.java | 3 +-
.../springboot/test/UpdateIssueProducerTest.java | 6 +-
.../springboot/test/WatchUpdatesConsumerTest.java | 6 +-
.../jira/springboot/test/WatcherProducerTest.java | 6 +-
.../src/test/resources/jiraauth.properties | 3 +
.../camel-kafka-starter/src/main/docs/kafka.json | 4 +-
.../springboot/KafkaComponentConfiguration.java | 4 +-
.../integration/AbstractMongoDbITSupport.java | 15 +-
.../MongoDbCredentialsFromUriConnectionIT.java | 18 +-
.../integration/MongoDbFindOperationIT.java | 2 +-
.../meta/integration/MongoDbMetaExtensionIT.java | 26 +-
.../integration/MongoDbVerifierExtensionIT.java | 48 ++-
.../src/test/resources/test.properties | 11 +
.../NettyComponentConfigurationTest.java | 22 +-
.../nettycomponentconfigurationtest.properties | 1 +
.../salesforce/springboot/RawPayloadTest.java | 19 +-
.../src/test/resources/rawpayload.properties | 1 +
.../xml/jaxb/springboot/JAXBRuntimeHints.java | 11 +-
.../org/apache/camel/xml/jaxb/springboot/Book.java | 1 -
.../zipfile/springboot/ZipFileDataFormatTest.java | 12 +-
components-starter/pom.xml | 2 +-
pom.xml | 59 ++-
.../required-productized-camel-artifacts.txt | 1 -
.../itest/springboot/util/DependencyResolver.java | 3 +
tooling/camel-spring-boot-bom/pom.xml | 8 +-
tooling/camel-spring-boot-dependencies/pom.xml | 430 +++++++++++----------
.../springboot/maven/SpringBootStarterMojo.java | 7 +-
.../src/main/resources/pom.xml | 119 ++++++
tooling/redhat-camel-spring-boot-bom/pom.xml | 127 +++++-
90 files changed, 1109 insertions(+), 494 deletions(-)
create mode 100644 .snyk
create mode 100644 components-starter/camel-ftp-starter/src/test/resources/users.properties
copy components-starter/{camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConverter.java => camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverter.java} (60%)
create mode 100644 components-starter/camel-http-starter/src/test/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverterTest.java
rename components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/{EncryptedProperiesTestBase.java => EncryptedPropertiesTestBase.java} (97%)
create mode 100644 components-starter/camel-jasypt-starter/src/test/resources/test.properties
create mode 100644 components-starter/camel-jira-starter/src/test/resources/jiraauth.properties
create mode 100644 components-starter/camel-mongodb-starter/src/test/resources/test.properties
create mode 100644 components-starter/camel-netty-starter/src/test/resources/nettycomponentconfigurationtest.properties
create mode 100644 components-starter/camel-salesforce-starter/src/test/resources/rawpayload.properties
(camel-spring-boot) 24/40: Upgrade spring-boot to 3.1.5, align tomcat with spring-boot (#287)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit ddf1d708ad449d3269971acd8faadf6bd841b187
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Thu Oct 19 15:10:15 2023 -0400
Upgrade spring-boot to 3.1.5, align tomcat with spring-boot (#287)
---
pom.xml | 4 ++--
tooling/redhat-camel-spring-boot-bom/pom.xml | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 55b1dee7a01..1afe19abab8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<compiler.fork>false</compiler.fork>
<!-- Spring-Boot target version -->
- <spring-boot-version>3.1.4</spring-boot-version>
+ <spring-boot-version>3.1.5</spring-boot-version>
<!-- Camel target version -->
<camel-version>4.0.0.redhat-00025</camel-version>
@@ -140,7 +140,7 @@
<springdoc-version>2.2.0</springdoc-version>
<surefire.version>${maven-surefire-plugin-version}</surefire.version>
<swagger-parser-v3-version>2.1.10</swagger-parser-v3-version>
- <tomcat-version>10.1.14</tomcat-version>
+ <tomcat-version>10.1.15</tomcat-version>
<cyclonedx-maven-plugin-version>2.7.9</cyclonedx-maven-plugin-version>
<!-- Added for productized build - plexus versions used by patch maven plugin -->
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index a0d9e74d5ae..839af98c608 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -117,37 +117,37 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-annotations-api</artifactId>
- <version>10.1.14</version>
+ <version>10.1.15</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
- <version>10.1.14</version>
+ <version>10.1.15</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jsp-api</artifactId>
- <version>10.1.14</version>
+ <version>10.1.15</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>10.1.14</version>
+ <version>10.1.15</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
- <version>10.1.14</version>
+ <version>10.1.15</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
- <version>10.1.14</version>
+ <version>10.1.15</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
- <version>10.1.14</version>
+ <version>10.1.15</version>
</dependency>
<!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter -->
<dependency>
@@ -229,7 +229,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>3.1.4</version>
+ <version>3.1.5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
(camel-spring-boot) 35/40: Upgrade to spring-boot 3.1.6 (#305)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit ad45178c4a49ca29b7be5bfe3ee5bc1d610f2788
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Tue Dec 5 10:04:28 2023 -0500
Upgrade to spring-boot 3.1.6 (#305)
(camel-spring-boot) 18/40: Provide an override for guava (#276)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 054241d122fc591e8bd1004fdbb229a023d2c569
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Tue Oct 10 09:57:01 2023 -0400
Provide an override for guava (#276)
---
components-starter/camel-hl7-starter/src/main/docs/hl7.json | 10 ++++------
.../src/main/resources/pom.xml | 7 +++++++
tooling/redhat-camel-spring-boot-bom/pom.xml | 6 ++++++
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/components-starter/camel-hl7-starter/src/main/docs/hl7.json b/components-starter/camel-hl7-starter/src/main/docs/hl7.json
index d55f4936959..0c26b75a652 100644
--- a/components-starter/camel-hl7-starter/src/main/docs/hl7.json
+++ b/components-starter/camel-hl7-starter/src/main/docs/hl7.json
@@ -9,7 +9,7 @@
"name": "camel.dataformat.hl7.customizer",
"type": "org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType": "org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration",
- "sourceMethod": "getCustomizer()"
+ "sourceMethod": "public org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon.CustomizerProperties getCustomizer() "
},
{
"name": "camel.language.hl7terser",
@@ -20,7 +20,7 @@
"name": "camel.language.hl7terser.customizer",
"type": "org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties",
"sourceType": "org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration",
- "sourceMethod": "getCustomizer()"
+ "sourceMethod": "public org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon.CustomizerProperties getCustomizer() "
}
],
"properties": [
@@ -39,8 +39,7 @@
"name": "camel.dataformat.hl7.validate",
"type": "java.lang.Boolean",
"description": "Whether to validate the HL7 message Is by default true.",
- "sourceType": "org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration",
- "defaultValue": true
+ "sourceType": "org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration"
},
{
"name": "camel.language.hl7terser.customizer.enabled",
@@ -69,8 +68,7 @@
"name": "camel.language.hl7terser.trim",
"type": "java.lang.Boolean",
"description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks",
- "sourceType": "org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration",
- "defaultValue": true
+ "sourceType": "org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration"
}
],
"hints": []
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index d45914411d5..d77f378a930 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -90,6 +90,12 @@
<artifactId>undertow-servlet</artifactId>
<version>${undertow-version}</version>
</dependency>
+ <!-- Overrides guava -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava-version}</version>
+ </dependency>
<!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter -->
<dependency>
<groupId>org.apache.avro</groupId>
@@ -101,6 +107,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress-version}</version>
+ </dependency>
<!-- Overrides snappy-java -->
<dependency>
<groupId>org.xerial.snappy</groupId>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 9da59641396..43e35d63f61 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -90,6 +90,12 @@
<artifactId>undertow-servlet</artifactId>
<version>2.3.7.Final</version>
</dependency>
+ <!-- Overrides guava -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>32.1.2-jre</version>
+ </dependency>
<!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter -->
<dependency>
<groupId>org.apache.avro</groupId>
(camel-spring-boot) 15/40: Add snappy-java override (#272)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit e27fedc5813efee085c3afbcab8d3ea7229deb1c
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Fri Sep 29 14:16:41 2023 -0400
Add snappy-java override (#272)
---
.../src/main/resources/pom.xml | 5 +++++
tooling/redhat-camel-spring-boot-bom/pom.xml | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index e1fa685691f..d45914411d5 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -101,6 +101,11 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress-version}</version>
+ <!-- Overrides snappy-java -->
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <version>${snappy-java-version}</version>
</dependency>
<!-- Overrides elastic-search dependency since SB is using an older version -->
<dependency>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 8a5ffad44ee..641d35d7c18 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -101,6 +101,11 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.21</version>
+ <!-- Overrides snappy-java -->
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <version>${snappy-java-version}</version>
</dependency>
<!-- Overrides elastic-search dependency since SB is using an older version -->
<dependency>
(camel-spring-boot) 30/40: Fix CS
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 013945d9850232ad43b287b3c75a8a2c59369bee
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Oct 26 09:42:36 2023 +0200
Fix CS
---
.../org/apache/camel/itest/springboot/util/DependencyResolver.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
index 5b9566d22ec..e140b38d958 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
@@ -151,9 +151,9 @@ public final class DependencyResolver {
}
private static String xpath(File pom, String expression) throws Exception {
- factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl",true);
- factory.setFeature("http://xml.org/sax/features/external-general-entities",false);
- factory.setFeature("http://xml.org/sax/features/external-parameter-entities",false);
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+ factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.parse(pom);
XPath xpath = xPathfactory.newXPath();
(camel-spring-boot) 01/40: Override infinispan-bom
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 65a1a102412c4b0eb8578bbffe45828a6fba031d
Author: Croway <fe...@gmail.com>
AuthorDate: Mon Sep 18 10:48:48 2023 +0200
Override infinispan-bom
---
.../src/main/resources/pom.xml | 7 +++++++
tooling/redhat-camel-spring-boot-bom/pom.xml | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 898f178c168..4945d735ad2 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -141,6 +141,13 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-bom</artifactId>
+ <version>${infinispan-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- Spring Boot Dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index fbd9d154744..87239d9cfb2 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -141,6 +141,13 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-bom</artifactId>
+ <version>14.0.11.Final</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- Spring Boot Dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
(camel-spring-boot) 19/40: Add a netty-bom override (#277)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 7fcf5b2e108d862a683e21bc7a2833b8f4667cf3
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Wed Oct 11 14:35:43 2023 -0400
Add a netty-bom override (#277)
---
components-starter/camel-hl7-starter/src/main/docs/hl7.json | 10 ++++++----
.../src/main/resources/pom.xml | 10 ++++++++++
tooling/redhat-camel-spring-boot-bom/pom.xml | 10 ++++++++++
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/components-starter/camel-hl7-starter/src/main/docs/hl7.json b/components-starter/camel-hl7-starter/src/main/docs/hl7.json
index 0c26b75a652..d55f4936959 100644
--- a/components-starter/camel-hl7-starter/src/main/docs/hl7.json
+++ b/components-starter/camel-hl7-starter/src/main/docs/hl7.json
@@ -9,7 +9,7 @@
"name": "camel.dataformat.hl7.customizer",
"type": "org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType": "org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration",
- "sourceMethod": "public org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon.CustomizerProperties getCustomizer() "
+ "sourceMethod": "getCustomizer()"
},
{
"name": "camel.language.hl7terser",
@@ -20,7 +20,7 @@
"name": "camel.language.hl7terser.customizer",
"type": "org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties",
"sourceType": "org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration",
- "sourceMethod": "public org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon.CustomizerProperties getCustomizer() "
+ "sourceMethod": "getCustomizer()"
}
],
"properties": [
@@ -39,7 +39,8 @@
"name": "camel.dataformat.hl7.validate",
"type": "java.lang.Boolean",
"description": "Whether to validate the HL7 message Is by default true.",
- "sourceType": "org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration"
+ "sourceType": "org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration",
+ "defaultValue": true
},
{
"name": "camel.language.hl7terser.customizer.enabled",
@@ -68,7 +69,8 @@
"name": "camel.language.hl7terser.trim",
"type": "java.lang.Boolean",
"description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks",
- "sourceType": "org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration"
+ "sourceType": "org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration",
+ "defaultValue": true
}
],
"hints": []
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index d77f378a930..f69bc18469f 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -68,6 +68,16 @@
<!-- These are place holder dependency management entries -->
<dependencyManagement>
<dependencies>
+
+ <!-- Netty bom -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-bom</artifactId>
+ <version>${netty-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<!-- Insert third party overrides here -->
<dependency>
<groupId>org.yaml</groupId>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 43e35d63f61..f0b0219bbe9 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -68,6 +68,16 @@
<!-- These are place holder dependency management entries -->
<dependencyManagement>
<dependencies>
+
+ <!-- Netty bom -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-bom</artifactId>
+ <version>4.1.96.Final</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<!-- Insert third party overrides here -->
<dependency>
<groupId>org.yaml</groupId>
(camel-spring-boot) 37/40: Override logback to 1.4.14 (#308)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 922dab1fd82adf1048ce5fd6afd866a60410ad01
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Tue Dec 5 14:01:29 2023 -0500
Override logback to 1.4.14 (#308)
---
pom.xml | 1 +
.../src/main/resources/pom.xml | 16 ++++++++++++++++
tooling/redhat-camel-spring-boot-bom/pom.xml | 16 ++++++++++++++++
3 files changed, 33 insertions(+)
diff --git a/pom.xml b/pom.xml
index ce977d5c8c6..f0f176959fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,7 @@
<graal-sdk-version>22.3.2</graal-sdk-version>
<jakarta-jaxb-version>4.0.0</jakarta-jaxb-version>
<jaxb-version>2.3.0</jaxb-version>
+ <logback-version>1.4.14</logback-version>
<maven-compiler-plugin-version>3.11.0</maven-compiler-plugin-version>
<maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version>
<maven-surefire-plugin-version>3.1.2</maven-surefire-plugin-version>
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 28c4b7a7b4c..50fb912dc3f 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -113,6 +113,22 @@
<artifactId>guava</artifactId>
<version>${guava-version}</version>
</dependency>
+ <!-- Overrides for logback -->
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-access</artifactId>
+ <version>${logback-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback-version}</version>
+ </dependency>
<!-- Overrides for tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 33329740943..28e57d9c93f 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -113,6 +113,22 @@
<artifactId>guava</artifactId>
<version>32.1.2.jre-redhat-00001</version>
</dependency>
+ <!-- Overrides for logback -->
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-access</artifactId>
+ <version>1.4.14</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.4.14</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>1.4.14</version>
+ </dependency>
<!-- Overrides for tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>
(camel-spring-boot) 38/40: Override reactory-netty-http to 1.1.13 (#309)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit d7d32d9b8582435257c535b3e3ec49033af3fc9e
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Tue Dec 5 20:13:02 2023 -0500
Override reactory-netty-http to 1.1.13 (#309)
---
pom.xml | 1 +
.../src/main/resources/pom.xml | 6 ++++++
tooling/redhat-camel-spring-boot-bom/pom.xml | 6 ++++++
3 files changed, 13 insertions(+)
diff --git a/pom.xml b/pom.xml
index f0f176959fb..4afc2586737 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,7 @@
<maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version>
<maven-surefire-plugin-version>3.1.2</maven-surefire-plugin-version>
<mycila-license-version>3.0</mycila-license-version>
+ <reactor-netty-version>1.1.13</reactor-netty-version>
<springdoc-version>2.2.0</springdoc-version>
<surefire.version>${maven-surefire-plugin-version}</surefire.version>
<swagger-parser-v3-version>2.1.10</swagger-parser-v3-version>
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 50fb912dc3f..0031736cc58 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -129,6 +129,12 @@
<artifactId>logback-core</artifactId>
<version>${logback-version}</version>
</dependency>
+ <!-- Override for reactor-netty-http -->
+ <dependency>
+ <groupId>io.projectreactor.netty</groupId>
+ <artifactId>reactor-netty-http</artifactId>
+ <version>${reactor-netty-version}</version>
+ </dependency>
<!-- Overrides for tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 28e57d9c93f..56d5fda0ae1 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -129,6 +129,12 @@
<artifactId>logback-core</artifactId>
<version>1.4.14</version>
</dependency>
+ <!-- Override for reactor-netty-http -->
+ <dependency>
+ <groupId>io.projectreactor.netty</groupId>
+ <artifactId>reactor-netty-http</artifactId>
+ <version>1.1.13</version>
+ </dependency>
<!-- Overrides for tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>
(camel-spring-boot) 11/40: Regeneration
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 67ad1e95eeed5b2c652194efa36ecfba07788a36
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Thu Sep 21 15:33:42 2023 -0400
Regeneration
---
tooling/redhat-camel-spring-boot-bom/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 87239d9cfb2..f11c251c5ab 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -152,7 +152,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>3.1.3</version>
+ <version>3.1.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
(camel-spring-boot) 06/40: Upgrade to spring-boot 3.1.4 (#953)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 610e2a200f4e0d2a42608979b66ca2afb46b25a4
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Thu Sep 21 10:46:18 2023 -0400
Upgrade to spring-boot 3.1.4 (#953)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f2e35db5631..76841209f40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<compiler.fork>false</compiler.fork>
<!-- Spring-Boot target version -->
- <spring-boot-version>3.1.3</spring-boot-version>
+ <spring-boot-version>3.1.4</spring-boot-version>
<!-- Camel target version -->
<camel-version>4.0.0.redhat-00010</camel-version>
(camel-spring-boot) 25/40: [infinispan] Client property configurable in tests (#995)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit a4218590f230278963af4bf97d32a9b451251f0b
Author: Marco Carletti <mc...@redhat.com>
AuthorDate: Fri Nov 3 10:43:04 2023 +0100
[infinispan] Client property configurable in tests (#995)
---
.../remote/InfinispanRemoteConfigurationIT.java | 4 +-
.../remote/InfinispanRemoteTestSupport.java | 4 +-
.../InfinispanRemoteClusteredTestSupport.java | 52 ++++++++++------------
3 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
index f65c92fdc12..15c811b3312 100644
--- a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
+++ b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.infinispan.remote;
+import static org.apache.camel.component.infinispan.remote.InfinispanRemoteTestSupport.CLIENT_INTELLIGENCE_BASIC;
+
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.apache.camel.test.infra.infinispan.services.InfinispanService;
import org.apache.camel.test.infra.infinispan.services.InfinispanServiceFactory;
@@ -59,7 +61,7 @@ public class InfinispanRemoteConfigurationIT {
configuration.setSecurityServerName("infinispan");
configuration.setSaslMechanism("DIGEST-MD5");
configuration.setSecurityRealm("default");
- if (SystemUtils.IS_OS_MAC) {
+ if (CLIENT_INTELLIGENCE_BASIC) {
configuration.addConfigurationProperty(
"infinispan.client.hotrod.client_intelligence", "BASIC");
}
diff --git a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
index 4d0bbec4f29..17cce5a55e6 100644
--- a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
+++ b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
@@ -49,6 +49,8 @@ public class InfinispanRemoteTestSupport {
public static InfinispanService service = InfinispanServiceFactory.createService();
protected static RemoteCacheManager cacheContainer;
+ public static final boolean CLIENT_INTELLIGENCE_BASIC = SystemUtils.IS_OS_MAC || Boolean.parseBoolean(System.getProperty("infinispan.client_intelligence.basic", "false"));
+
@Autowired
ProducerTemplate template;
@@ -133,7 +135,7 @@ public class InfinispanRemoteTestSupport {
.saslMechanism("DIGEST-MD5")
.realm("default");
- if (SystemUtils.IS_OS_MAC) {
+ if (CLIENT_INTELLIGENCE_BASIC) {
Properties properties = new Properties();
properties.put("infinispan.client.hotrod.client_intelligence", "BASIC");
clientBuilder.withProperties(properties);
diff --git a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
index 6b3da5d6c5e..54c65d3abfa 100644
--- a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
+++ b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.infinispan.remote.cluster;
+import static org.apache.camel.component.infinispan.remote.InfinispanRemoteTestSupport.CLIENT_INTELLIGENCE_BASIC;
+
import java.util.Properties;
import org.apache.camel.test.infra.infinispan.services.InfinispanService;
@@ -24,43 +26,35 @@ import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.Configuration;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.infinispan.configuration.cache.CacheMode;
-import org.testcontainers.shaded.org.apache.commons.lang3.SystemUtils;
public final class InfinispanRemoteClusteredTestSupport {
+
private InfinispanRemoteClusteredTestSupport() {
}
public static Configuration createConfiguration(InfinispanService service) {
- if (SystemUtils.IS_OS_MAC) {
- Properties properties = new Properties();
+
+ final ConfigurationBuilder configBuilder = new ConfigurationBuilder();
+
+ if (CLIENT_INTELLIGENCE_BASIC) {
+ final Properties properties = new Properties();
properties.put("infinispan.client.hotrod.client_intelligence", "BASIC");
- return new ConfigurationBuilder()
- .withProperties(properties)
- .addServer()
- .host(service.host())
- .port(service.port())
- .security()
- .authentication()
- .username(service.username())
- .password(service.password())
- .serverName("infinispan")
- .saslMechanism("DIGEST-MD5")
- .realm("default")
- .build();
- } else {
- return new ConfigurationBuilder()
- .addServer()
- .host(service.host())
- .port(service.port())
- .security()
- .authentication()
- .username(service.username())
- .password(service.password())
- .serverName("infinispan")
- .saslMechanism("DIGEST-MD5")
- .realm("default")
- .build();
+ configBuilder.withProperties(properties);
}
+
+ configBuilder
+ .addServer()
+ .host(service.host())
+ .port(service.port())
+ .security()
+ .authentication()
+ .username(service.username())
+ .password(service.password())
+ .serverName("infinispan")
+ .saslMechanism("DIGEST-MD5")
+ .realm("default");
+
+ return configBuilder.build();
}
public static void createCache(RemoteCacheManager cacheContainer, String cacheName) {
(camel-spring-boot) 07/40: CAMEL-19869: camel-infinispan - Disable failing ITs (#944)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 9ac3cb0e88ba5efcfb0425eb96a99899e30fc046
Author: Nicolas Filotto <es...@users.noreply.github.com>
AuthorDate: Thu Sep 14 14:19:53 2023 +0200
CAMEL-19869: camel-infinispan - Disable failing ITs (#944)
## Motivation
The integration tests `InfinispanRemoteAggregationRepositoryIT` and `InfinispanRemoteAggregationRepositoryOperationsIT` are failing on the CI.
## Modifications:
* Disable the integration tests as long as they are not fixed
---
.../infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java | 2 ++
.../remote/InfinispanRemoteAggregationRepositoryOperationsIT.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java
index ed2ebd038e6..ab6e99084d9 100644
--- a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java
+++ b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java
@@ -21,6 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,7 @@ import org.springframework.test.annotation.DirtiesContext;
InfinispanRemoteAggregationRepositoryIT.class
}
)
+@Disabled("https://issues.apache.org/jira/browse/CAMEL-19869")
public class InfinispanRemoteAggregationRepositoryIT extends InfinispanRemoteTestSupport {
public static final int COMPLETION_SIZE = 4;
public static final String CORRELATOR_HEADER = "CORRELATOR_HEADER";
diff --git a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java
index a9b26fb716a..eb6fbc3bf71 100644
--- a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java
+++ b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java
@@ -26,6 +26,7 @@ import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -46,6 +47,7 @@ import org.springframework.test.annotation.DirtiesContext;
InfinispanRemoteAggregationRepositoryOperationsIT.class
}
)
+@Disabled("https://issues.apache.org/jira/browse/CAMEL-19869")
public class InfinispanRemoteAggregationRepositoryOperationsIT extends InfinispanRemoteTestSupport {
private static InfinispanRemoteAggregationRepository aggregationRepository;
(camel-spring-boot) 36/40: CSB-3042: [camel-mail] java.lang.ClassNotFoundException: org.eclipse.angus.mail.imap.IMAPStore
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 181f5e6a8355cfea5e263a0f839c41e46306ff6c
Author: Luigi De Masi <ld...@redhat.com>
AuthorDate: Tue Dec 5 15:27:36 2023 +0100
CSB-3042: [camel-mail] java.lang.ClassNotFoundException: org.eclipse.angus.mail.imap.IMAPStore
---
pom.xml | 1 +
.../src/main/resources/pom.xml | 7 +++++++
tooling/redhat-camel-spring-boot-bom/pom.xml | 7 +++++++
3 files changed, 15 insertions(+)
diff --git a/pom.xml b/pom.xml
index 3c18aab22b9..ce977d5c8c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,7 @@
<!-- versions -->
<aether-version>1.0.2.v20150114</aether-version>
+ <angus-mail-version>2.0.2</angus-mail-version>
<artemis-version>2.28.0</artemis-version>
<arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version>
<arquillian-version>1.7.0.Alpha10</arquillian-version>
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 0ba4d67aa4f..28c4b7a7b4c 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -179,6 +179,13 @@
<version>${elasticsearch-java-client-sniffer-version}</version>
</dependency>
+ <!-- Overrides angus-mail dependency since SB is using an older version (CSB-3042) -->
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-mail</artifactId>
+ <version>${angus-mail-version}</version>
+ </dependency>
+
<!-- Artemis Overrides -->
<dependency>
<groupId>org.apache.activemq</groupId>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 5dedbdf19c1..33329740943 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -179,6 +179,13 @@
<version>8.9.0</version>
</dependency>
+ <!-- Overrides angus-mail dependency since SB is using an older version (CSB-3042) -->
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-mail</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+
<!-- Artemis Overrides -->
<dependency>
<groupId>org.apache.activemq</groupId>
(camel-spring-boot) 32/40: fix: Adapt JAXBRuntimeHints to the behavior change in Spring 6.0.13 (#984) (#291)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 478f4f373fc1680a81a1d0ff802976e56387c7cc
Author: John Poth <po...@gmail.com>
AuthorDate: Mon Nov 27 14:29:12 2023 +0100
fix: Adapt JAXBRuntimeHints to the behavior change in Spring 6.0.13 (#984) (#291)
## Motivation
Since Spring 6.0.13 and the fix for https://github.com/spring-projects/spring-framework/issues/31224, the member category `INVOKE_DECLARED_METHODS` no longer includes public methods so the code needs to be adapted to this behavior change.
## Modifications:
* Register also the member category `INVOKE_PUBLIC_METHODS` when `INVOKE_DECLARED_METHODS` is registered
(cherry picked from commit ba22da88eed6feccfef10e91b46f57a23f8924e9)
Co-authored-by: Nicolas Filotto <es...@users.noreply.github.com>
---
.../apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java | 11 +++++++----
.../test/java/org/apache/camel/xml/jaxb/springboot/Book.java | 1 -
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/components-starter/camel-xml-jaxb-starter/src/main/java/org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java b/components-starter/camel-xml-jaxb-starter/src/main/java/org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java
index d8002c20ecf..26012c1e1fe 100644
--- a/components-starter/camel-xml-jaxb-starter/src/main/java/org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java
+++ b/components-starter/camel-xml-jaxb-starter/src/main/java/org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java
@@ -196,9 +196,11 @@ final class JAXBRuntimeHints implements RuntimeHintsRegistrar {
}
applyIfMatch(c, XmlJavaTypeAdapter.class, XmlJavaTypeAdapter::value,
type -> hints.reflection().registerType(type, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
- MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.DECLARED_FIELDS));
+ MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.INVOKE_PUBLIC_METHODS,
+ MemberCategory.DECLARED_FIELDS));
hints.reflection().registerType(c, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
- MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.DECLARED_FIELDS);
+ MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.INVOKE_PUBLIC_METHODS,
+ MemberCategory.DECLARED_FIELDS);
}
boolean classDetected = false;
for (String className : getClassesFromIndexes(classLoader)) {
@@ -217,7 +219,7 @@ final class JAXBRuntimeHints implements RuntimeHintsRegistrar {
MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS);
for (Class<?> c : JAXB_ANNOTATIONS) {
hints.reflection().registerType(c, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
- MemberCategory.INVOKE_DECLARED_METHODS);
+ MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.INVOKE_PUBLIC_METHODS);
}
hints.proxies().registerJdkProxy(TypeReference.of(XmlSeeAlso.class), TypeReference.of("org.glassfish.jaxb.core.v2.model.annotation.Locatable"));
for (String className : NATIVE_PROXY_DEFINITIONS) {
@@ -225,7 +227,8 @@ final class JAXBRuntimeHints implements RuntimeHintsRegistrar {
}
for (String className : JAXB_RUNTIME_CLASSES) {
hints.reflection().registerTypeIfPresent(classLoader, className,
- MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
+ MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
+ MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.INVOKE_PUBLIC_METHODS);
}
// Register the JAXB resource bundles
hints.reflection().registerTypeIfPresent(classLoader, "jakarta.xml.bind.Messages");
diff --git a/components-starter/camel-xml-jaxb-starter/src/test/java/org/apache/camel/xml/jaxb/springboot/Book.java b/components-starter/camel-xml-jaxb-starter/src/test/java/org/apache/camel/xml/jaxb/springboot/Book.java
index 72829dcdef5..280e5b1fef2 100644
--- a/components-starter/camel-xml-jaxb-starter/src/test/java/org/apache/camel/xml/jaxb/springboot/Book.java
+++ b/components-starter/camel-xml-jaxb-starter/src/test/java/org/apache/camel/xml/jaxb/springboot/Book.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.xml.jaxb.springboot;
-import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlTransient;
(camel-spring-boot) 28/40: Set features to DocumentBuilderFactory to protect from XXE; fix for SAST (#989)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 1d525e1dd0ad2e6358071ad8ce9476fa6eb9ba5a
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Thu Oct 26 03:42:11 2023 -0400
Set features to DocumentBuilderFactory to protect from XXE; fix for SAST (#989)
---
.../org/apache/camel/itest/springboot/util/DependencyResolver.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
index 2b0cbe6e80a..5b9566d22ec 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
@@ -151,6 +151,9 @@ public final class DependencyResolver {
}
private static String xpath(File pom, String expression) throws Exception {
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl",true);
+ factory.setFeature("http://xml.org/sax/features/external-general-entities",false);
+ factory.setFeature("http://xml.org/sax/features/external-parameter-entities",false);
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.parse(pom);
XPath xpath = xPathfactory.newXPath();
(camel-spring-boot) 03/40: Disable artifacts tests (#267)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 2590207ba8bcfa0ea37117acb57698467b86b956
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Thu Sep 21 05:53:53 2023 -0400
Disable artifacts tests (#267)
* Disable artifacts tests
* Set activeByDefault
---
Jenkinsfile.redhat | 2 +-
archetypes/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile.redhat b/Jenkinsfile.redhat
index 8544fb514f2..51d09da97b3 100644
--- a/Jenkinsfile.redhat
+++ b/Jenkinsfile.redhat
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-def MAVEN_PARAMS = '-B -e -ntp -s $MAVEN_SETTINGS -Darchetype.test.settingsFile=$MAVEN_SETTINGS -Djava.net.preferIPv4Stack=true'
+def MAVEN_PARAMS = '-B -e -ntp -s $MAVEN_SETTINGS -Parchetypes-skip-tests -Djava.net.preferIPv4Stack=true'
pipeline {
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 4c01fa45ba9..2020d978d3a 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -41,7 +41,7 @@
<profile>
<id>archetypes-skip-tests</id>
<activation>
- <property><name>skipTests</name></property>
+ <activeByDefault>true</activeByDefault>
</activation>
<properties>
<archetype.test.skip>true</archetype.test.skip>
(camel-spring-boot) 09/40: CAMEL-19851: camel-http - Allow to configure timeouts natively (#942)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 84e08db31b298acc66d29fe57dc896772825a9ad
Author: Nicolas Filotto <es...@users.noreply.github.com>
AuthorDate: Thu Sep 14 21:49:46 2023 +0200
CAMEL-19851: camel-http - Allow to configure timeouts natively (#942)
## Motivation
The timeout can only be configured like any other complex type, indeed, we need to define a dedicated bean in our Spring context and refer to that bean in the configuration of our component which could be simplified by supporting natively timeouts.
## Modifications:
* Add new converters to support natively a timeout in milliseconds expressed as long, integer, or string
---
.../springboot/HttpComponentTimeoutConverter.java | 60 ++++++++++
...rk.boot.autoconfigure.AutoConfiguration.imports | 1 +
.../HttpComponentTimeoutConverterTest.java | 125 +++++++++++++++++++++
3 files changed, 186 insertions(+)
diff --git a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverter.java b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverter.java
new file mode 100644
index 00000000000..06b9100d584
--- /dev/null
+++ b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverter.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.http.springboot;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.apache.hc.core5.util.Timeout;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.stereotype.Component;
+
+
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class HttpComponentTimeoutConverter extends HttpComponentConverter {
+
+ @Override
+ public Set<ConvertiblePair> getConvertibleTypes() {
+ Set<ConvertiblePair> answer = new LinkedHashSet<>();
+ answer.add(new ConvertiblePair(Integer.class, org.apache.hc.core5.util.Timeout.class));
+ answer.add(new ConvertiblePair(Long.class, org.apache.hc.core5.util.Timeout.class));
+ answer.add(new ConvertiblePair(String.class, org.apache.hc.core5.util.Timeout.class));
+ return answer;
+ }
+
+ @Override
+ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
+ if (source == null) {
+ return null;
+ }
+ if (source instanceof Integer value) {
+ return Timeout.ofMilliseconds(value.longValue());
+ } else if (source instanceof Long value) {
+ return Timeout.ofMilliseconds(value);
+ } else if (source instanceof String value) {
+ if (value.startsWith("#")) {
+ return super.convert(source, sourceType, targetType);
+ }
+ return Timeout.ofMilliseconds(Long.parseLong(value));
+ }
+ return null;
+ }
+}
diff --git a/components-starter/camel-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 29877893b1d..e92fc17e3f3 100644
--- a/components-starter/camel-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/components-starter/camel-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -17,3 +17,4 @@
org.apache.camel.component.http.springboot.HttpComponentConverter
org.apache.camel.component.http.springboot.HttpComponentAutoConfiguration
+org.apache.camel.component.http.springboot.HttpComponentTimeoutConverter
diff --git a/components-starter/camel-http-starter/src/test/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverterTest.java b/components-starter/camel-http-starter/src/test/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverterTest.java
new file mode 100644
index 00000000000..d89aa6a99a8
--- /dev/null
+++ b/components-starter/camel-http-starter/src/test/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverterTest.java
@@ -0,0 +1,125 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.http.springboot;
+
+import java.nio.charset.StandardCharsets;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.http.HttpComponent;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
+import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+@DirtiesContext
+@CamelSpringBootTest
+@SpringBootTest(
+ classes = {
+ HttpComponentTimeoutConverter.class,
+ CamelAutoConfiguration.class,
+ HttpComponentAutoConfiguration.class,
+ HttpComponentTimeoutConverterTest.TestConfiguration.class
+ },
+ properties = {"camel.component.http.so-timeout = 30000"}
+)
+class HttpComponentTimeoutConverterTest {
+
+ @Autowired
+ ProducerTemplate template;
+ @Autowired
+ private CamelContext context;
+
+ private static CamelContext currentContext;
+ private static HttpServer localServer;
+
+ private static String baseUrl;
+
+ @BeforeAll
+ public static void setUp() throws Exception {
+ localServer = ServerBootstrap.bootstrap()
+ .register("/checkSoTimeout", (request, response, ctx) -> {
+ response.setCode(HttpStatus.SC_OK);
+ assertNotNull(currentContext);
+ response.setEntity(new StringEntity(String.valueOf(currentContext.getComponent("http", HttpComponent.class).getSoTimeout().toSeconds()), StandardCharsets.US_ASCII));
+ })
+ .create();
+ localServer.start();
+
+ baseUrl = "http://localhost:" + localServer.getLocalPort();
+ }
+
+ @AfterAll
+ public static void tearDown() {
+ if (localServer != null) {
+ localServer.stop();
+ }
+ }
+
+ @BeforeEach
+ public void init() {
+ currentContext = context;
+ }
+
+ @Test
+ void checkSoTimeout() {
+ Exchange exchange = template.request("direct:checkSoTimeout", exchange1 -> {});
+ assertNotNull(exchange);
+ assertNull(exchange.getException());
+ Message out = exchange.getMessage();
+ assertNotNull(out);
+ assertEquals("30", out.getBody(String.class));
+ }
+
+
+ // *************************************
+ // Config
+ // *************************************
+
+ @Configuration
+ public static class TestConfiguration {
+
+ @Bean
+ public RouteBuilder routeBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ from("direct:checkSoTimeout").to(baseUrl + "/checkSoTimeout");
+ }
+ };
+ }
+ }
+}
(camel-spring-boot) 40/40: Add dependencyManagement entries for artifacts being overwritten in redhat BOM (#312)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit f334dab28c12c0b2637115bb7e1139316a213c5e
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Tue Jan 9 11:46:13 2024 -0500
Add dependencyManagement entries for artifacts being overwritten in redhat BOM (#312)
---
pom.xml | 35 ++++++++++++++++++++++++++
tooling/camel-spring-boot-dependencies/pom.xml | 10 ++++++++
2 files changed, 45 insertions(+)
diff --git a/pom.xml b/pom.xml
index ac8d1735ba8..2aed1249dcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,41 @@
<artifactId>openshift-maven-plugin</artifactId>
<version>${openshift-maven-plugin-version}</version>
</dependency>
+ <!-- org.apache.tomcat:catalina dependencyManagement entry
+ is necessary for PME align to the correct tomcat-version -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${tomcat-version}</version>
+ </dependency>
+ <!-- io.projectreactor.netty:reactor-netty-http dependencyManagement entry
+ is necessary for PME align to the correct reactor-netty-version -->
+ <dependency>
+ <groupId>io.projectreactor.netty</groupId>
+ <artifactId>reactor-netty-http</artifactId>
+ <version>${reactor-netty-version}</version>
+ </dependency>
+ <!-- org.json:json dependencyManagement entry
+ is necessary for PME align to the correct org-json-json-version -->
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${org-json-json-version}</version>
+ </dependency>
+
+ <!-- org.apache.activemq:artemis-version dependencyManagement entry
+ is necessary for PME align to the correct artemis-version -->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-commons</artifactId>
+ <version>${artemis-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 32e30d69fe0..5d79d0f6416 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4054,6 +4054,11 @@
<artifactId>maven-plugin-annotations</artifactId>
<version>3.6.4</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>10.1.16</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
@@ -4089,6 +4094,11 @@
<artifactId>camel-sap-starter</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20231013</version>
+ </dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
(camel-spring-boot) 10/40: [CAMEL-19854]re-enable KafkaConsumerHealthCheckIT as it's OK now
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit aef47c69e5fd02111753550a8dfc95c63373d2eb
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Sep 19 10:10:04 2023 -0400
[CAMEL-19854]re-enable KafkaConsumerHealthCheckIT as it's OK now
(cherry picked from commit 8e516b9e612d3669ff69d3aaab14510599cd18f6)
---
.../camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
index 254e2c574db..23fc81cc5ff 100644
--- a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
+++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
@@ -41,7 +41,6 @@ import org.apache.kafka.common.header.internals.RecordHeader;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -69,7 +68,6 @@ import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
KafkaConsumerHealthCheckIT.TestConfiguration.class,
}
)
-@Disabled("https://issues.apache.org/jira/browse/CAMEL-19854")
public class KafkaConsumerHealthCheckIT extends BaseEmbeddedKafkaTestSupport {
public static final String TOPIC = "test-health";
(camel-spring-boot) 31/40: Add snyk file to ignore tests in SAST analysis
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit c36fe3d1d0925e768e8c51618318943c0a8ffc6e
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Fri Oct 27 10:05:26 2023 -0400
Add snyk file to ignore tests in SAST analysis
---
.gitignore | 1 +
.snyk | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/.gitignore b/.gitignore
index 5d69a553e4d..513921af691 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ target
*.ipr
*.iws
.idea
+.dccache
.DS_Store
.classpath
.ekstazi
diff --git a/.snyk b/.snyk
new file mode 100644
index 00000000000..cc61c4dc110
--- /dev/null
+++ b/.snyk
@@ -0,0 +1,4 @@
+exclude:
+ global:
+ - "*IT.java"
+ - "*Test.java"
(camel-spring-boot) 16/40: Fix typo
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 62f4c1df83f17f7cd7da68c4a6015949f1dbda1a
Author: Marco Carletti <mc...@redhat.com>
AuthorDate: Mon Oct 2 16:43:47 2023 +0200
Fix typo
---
tooling/redhat-camel-spring-boot-bom/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 641d35d7c18..9da59641396 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -101,6 +101,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.21</version>
+ </dependency>
<!-- Overrides snappy-java -->
<dependency>
<groupId>org.xerial.snappy</groupId>
(camel-spring-boot) 05/40: Remove camel-jq-starter from list of productized starters; has a -pre… (#266)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 2490746804f9fdfdbafa54f462854b628a2273fe
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Thu Sep 21 13:35:33 2023 -0400
Remove camel-jq-starter from list of productized starters; has a -pre… (#266)
* Remove camel-jq-starter from list of productized starters; has a -preview dependency
* Use infinispan 14.0.11.Final
---
.mvn/excludes.txt | 1 +
.../springboot/catalog/components/aws2-cw.json | 2 +-
.../springboot/catalog/components/aws2-ddb.json | 2 +-
.../catalog/components/aws2-ddbstream.json | 2 +-
.../catalog/components/aws2-kinesis-firehose.json | 2 +-
.../catalog/components/aws2-kinesis.json | 2 +-
.../springboot/catalog/components/aws2-lambda.json | 2 +-
.../springboot/catalog/components/aws2-s3.json | 2 +-
.../springboot/catalog/components/aws2-sns.json | 6 +-
.../springboot/catalog/components/aws2-sqs.json | 2 +-
.../catalog/components/elasticsearch.json | 65 ++--
.../catalog/components/spring-rabbitmq.json | 19 +-
.../cw/springboot/Cw2ComponentConfiguration.java | 2 +-
.../ddb/springboot/Ddb2ComponentConfiguration.java | 2 +-
.../Ddb2StreamComponentConfiguration.java | 2 +-
.../KinesisFirehose2ComponentConfiguration.java | 2 +-
.../springboot/Kinesis2ComponentConfiguration.java | 3 +-
.../springboot/Lambda2ComponentConfiguration.java | 2 +-
.../springboot/AWS2S3ComponentConfiguration.java | 3 +-
.../src/main/docs/aws2-sns.json | 4 +-
.../sns/springboot/Sns2ComponentConfiguration.java | 14 +-
.../sqs/springboot/Sqs2ComponentConfiguration.java | 2 +-
.../src/main/docs/elasticsearch.json | 7 +
.../ElasticsearchComponentConfiguration.java | 18 +
components-starter/pom.xml | 2 +-
pom.xml | 4 +-
.../required-productized-camel-artifacts.txt | 1 -
tooling/camel-spring-boot-bom/pom.xml | 2 +-
tooling/camel-spring-boot-dependencies/pom.xml | 406 +++++++++++----------
29 files changed, 310 insertions(+), 273 deletions(-)
diff --git a/.mvn/excludes.txt b/.mvn/excludes.txt
index 8baca1ed84a..d63dbc8873f 100644
--- a/.mvn/excludes.txt
+++ b/.mvn/excludes.txt
@@ -119,6 +119,7 @@
:camel-jolt-starter
:camel-jooq-starter
:camel-joor-starter
+:camel-jq-starter
:camel-js-dsl-starter
:camel-jsch-starter
:camel-jsh-dsl-starter
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-cw.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-cw.json
index 892e3b26f49..374c2132eb4 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-cw.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-cw.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "aws2-cw",
"title": "AWS CloudWatch",
- "description": "Sending metrics to AWS CloudWatch using AWS SDK version 2.x.",
+ "description": "Sending metrics to AWS CloudWatch.",
"deprecated": false,
"firstVersion": "3.1.0",
"label": "cloud,monitoring",
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json
index 01e8cb7ad48..4f4cd76bbfc 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "aws2-ddb",
"title": "AWS DynamoDB",
- "description": "Store and retrieve data from AWS DynamoDB service using AWS SDK version 2.x.",
+ "description": "Store and retrieve data from AWS DynamoDB.",
"deprecated": false,
"firstVersion": "3.1.0",
"label": "cloud,database",
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddbstream.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddbstream.json
index 775eac03033..e10b8d8488d 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddbstream.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddbstream.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "aws2-ddbstream",
"title": "AWS DynamoDB Streams",
- "description": "Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x.",
+ "description": "Receive messages from AWS DynamoDB Stream.",
"deprecated": false,
"firstVersion": "3.1.0",
"label": "cloud,messaging",
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
index b5e4175a907..14c0f9d2b4c 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "aws2-kinesis-firehose",
"title": "AWS Kinesis Firehose",
- "description": "Produce data to AWS Kinesis Firehose streams using AWS SDK version 2.x.",
+ "description": "Produce data to AWS Kinesis Firehose streams.",
"deprecated": false,
"firstVersion": "3.2.0",
"label": "cloud,messaging",
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json
index e22c3d55724..5836b8da7ba 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "aws2-kinesis",
"title": "AWS Kinesis",
- "description": "Consume and produce records from and to AWS Kinesis Streams using AWS SDK version 2.x.",
+ "description": "Consume and produce records from and to AWS Kinesis Streams.",
"deprecated": false,
"firstVersion": "3.2.0",
"label": "cloud,messaging",
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-lambda.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-lambda.json
index f5c4d366be4..fb464a5d14f 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-lambda.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-lambda.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "aws2-lambda",
"title": "AWS Lambda",
- "description": "Manage and invoke AWS Lambda functions using AWS SDK version 2.x.",
+ "description": "Manage and invoke AWS Lambda functions.",
"deprecated": false,
"firstVersion": "3.2.0",
"label": "cloud,serverless",
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
index 7b81dc4ad20..68d6baf8c1d 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "aws2-s3",
"title": "AWS S3 Storage Service",
- "description": "Store and retrieve objects from AWS S3 Storage Service using AWS SDK version 2.x.",
+ "description": "Store and retrieve objects from AWS S3 Storage Service.",
"deprecated": false,
"firstVersion": "3.2.0",
"label": "cloud,file",
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sns.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sns.json
index d849394f94a..a081b7a782f 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sns.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sns.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "aws2-sns",
"title": "AWS Simple Notification System (SNS)",
- "description": "Send messages to an AWS Simple Notification Topic using AWS SDK version 2.x.",
+ "description": "Send messages to AWS Simple Notification Topic.",
"deprecated": false,
"firstVersion": "3.1.0",
"label": "cloud,messaging,mobile",
@@ -31,7 +31,7 @@
"messageStructure": { "index": 6, "kind": "property", "displayName": "Message Structure", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The message structure to use such as json" },
"overrideEndpoint": { "index": 7, "kind": "property", "displayName": "Override Endpoint", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Set the need for overidding the endpoint. This option needs to be used in combination wi [...]
"policy": { "index": 8, "kind": "property", "displayName": "Policy", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The policy for this topic. Is loaded by default from classpath, but you [...]
- "queueUrl": { "index": 9, "kind": "property", "displayName": "Queue Url", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The queueUrl to subscribe to" },
+ "queueArn": { "index": 9, "kind": "property", "displayName": "Queue Arn", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The ARN endpoint to subscribe to" },
"region": { "index": 10, "kind": "property", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The region in which SNS client needs to work. When using this parameter, the configuration will expect the lowercase name o [...]
"serverSideEncryptionEnabled": { "index": 11, "kind": "property", "displayName": "Server Side Encryption Enabled", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Define if Server Side Encryption is enabled or not on the topic" },
"subject": { "index": 12, "kind": "property", "displayName": "Subject", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The subject which is used if the message header 'CamelAwsSnsSubject' is not present." },
@@ -66,7 +66,7 @@
"messageStructure": { "index": 6, "kind": "parameter", "displayName": "Message Structure", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The message structure to use such as json" },
"overrideEndpoint": { "index": 7, "kind": "parameter", "displayName": "Override Endpoint", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Set the need for overidding the endpoint. This option needs to be used in combination w [...]
"policy": { "index": 8, "kind": "parameter", "displayName": "Policy", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The policy for this topic. Is loaded by default from classpath, but yo [...]
- "queueUrl": { "index": 9, "kind": "parameter", "displayName": "Queue Url", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The queueUrl to subscribe to" },
+ "queueArn": { "index": 9, "kind": "parameter", "displayName": "Queue Arn", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The ARN endpoint to subscribe to" },
"region": { "index": 10, "kind": "parameter", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The region in which SNS client needs to work. When using this parameter, the configuration will expect the lowercase name [...]
"serverSideEncryptionEnabled": { "index": 11, "kind": "parameter", "displayName": "Server Side Encryption Enabled", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Define if Server Side Encryption is enabled or not on the topic" },
"subject": { "index": 12, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The subject which is used if the message header 'CamelAwsSnsSubject' is not present." },
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
index 8dc9c7e1910..b25ce5b463b 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "aws2-sqs",
"title": "AWS Simple Queue Service (SQS)",
- "description": "Send and receive messages to\/from AWS SQS service using AWS SDK version 2.x.",
+ "description": "Send and receive messages to\/from AWS SQS.",
"deprecated": false,
"firstVersion": "3.1.0",
"label": "cloud,messaging",
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch.json
index 55df2f26f95..c2057ec7d84 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch.json
@@ -23,19 +23,20 @@
},
"componentProperties": {
"connectionTimeout": { "index": 0, "kind": "property", "displayName": "Connection Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "description": "The time in ms to wait before connection will timeout." },
- "hostAddresses": { "index": 1, "kind": "property", "displayName": "Host Addresses", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Comma separated list with ip:port formatted remote transport addresses to use. The ip and port options must be left blank for hostAddresses to be considered instead." },
- "lazyStartProducer": { "index": 2, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
- "maxRetryTimeout": { "index": 3, "kind": "property", "displayName": "Max Retry Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "description": "The time in ms before retry" },
- "socketTimeout": { "index": 4, "kind": "property", "displayName": "Socket Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "description": "The timeout in ms to wait before the socket will timeout." },
- "autowiredEnabled": { "index": 5, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...]
- "client": { "index": 6, "kind": "property", "displayName": "Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.elasticsearch.client.RestClient", "deprecated": false, "autowired": true, "secret": false, "description": "To use an existing configured Elasticsearch client, instead of creating a client per endpoint. This allow to customize the client with specific settings." },
- "enableSniffer": { "index": 7, "kind": "property", "displayName": "Enable Sniffer", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enable automatically discover nodes from a running Elasticsearch cluster. If this option is used in conjunction with Spring Boot then it's managed by the Spring Boot configuration (see: Disable Sniffer in [...]
- "sniffAfterFailureDelay": { "index": 8, "kind": "property", "displayName": "Sniff After Failure Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 60000, "description": "The delay of a sniff execution scheduled after a failure (in milliseconds)" },
- "snifferInterval": { "index": 9, "kind": "property", "displayName": "Sniffer Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 300000, "description": "The interval between consecutive ordinary sniff executions in milliseconds. Will be honoured when sniffOnFailure is disabled or when there are no failures between consecutive sniff executions" },
- "certificatePath": { "index": 10, "kind": "property", "displayName": "Certificate Path", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The path of the self-signed certificate to use to access to Elasticsearch." },
- "enableSSL": { "index": 11, "kind": "property", "displayName": "Enable SSL", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enable SSL" },
- "password": { "index": 12, "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Password for authenticate" },
- "user": { "index": 13, "kind": "property", "displayName": "User", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Basic authenticate user" }
+ "enableDocumentOnlyMode": { "index": 1, "kind": "property", "displayName": "Enable Document Only Mode", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Indicates whether the body of the message contains only documents. By default, it is set to false to be able to do the same requests as what the Document API supports (see https:\/\/www.elasti [...]
+ "hostAddresses": { "index": 2, "kind": "property", "displayName": "Host Addresses", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Comma separated list with ip:port formatted remote transport addresses to use. The ip and port options must be left blank for hostAddresses to be considered instead." },
+ "lazyStartProducer": { "index": 3, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
+ "maxRetryTimeout": { "index": 4, "kind": "property", "displayName": "Max Retry Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "description": "The time in ms before retry" },
+ "socketTimeout": { "index": 5, "kind": "property", "displayName": "Socket Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "description": "The timeout in ms to wait before the socket will timeout." },
+ "autowiredEnabled": { "index": 6, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...]
+ "client": { "index": 7, "kind": "property", "displayName": "Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.elasticsearch.client.RestClient", "deprecated": false, "autowired": true, "secret": false, "description": "To use an existing configured Elasticsearch client, instead of creating a client per endpoint. This allow to customize the client with specific settings." },
+ "enableSniffer": { "index": 8, "kind": "property", "displayName": "Enable Sniffer", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enable automatically discover nodes from a running Elasticsearch cluster. If this option is used in conjunction with Spring Boot then it's managed by the Spring Boot configuration (see: Disable Sniffer in [...]
+ "sniffAfterFailureDelay": { "index": 9, "kind": "property", "displayName": "Sniff After Failure Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 60000, "description": "The delay of a sniff execution scheduled after a failure (in milliseconds)" },
+ "snifferInterval": { "index": 10, "kind": "property", "displayName": "Sniffer Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 300000, "description": "The interval between consecutive ordinary sniff executions in milliseconds. Will be honoured when sniffOnFailure is disabled or when there are no failures between consecutive sniff executions" },
+ "certificatePath": { "index": 11, "kind": "property", "displayName": "Certificate Path", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The path of the self-signed certificate to use to access to Elasticsearch." },
+ "enableSSL": { "index": 12, "kind": "property", "displayName": "Enable SSL", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enable SSL" },
+ "password": { "index": 13, "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Password for authenticate" },
+ "user": { "index": 14, "kind": "property", "displayName": "User", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Basic authenticate user" }
},
"headers": {
"operation": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "org.apache.camel.component.es.ElasticsearchOperation", "enum": [ "Index", "Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete", "DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation to perform", "constantName": "org.apache.camel.component.es.El [...]
@@ -46,28 +47,30 @@
"scrollKeepAliveMs": { "index": 5, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The starting index of the response.", "constantName": "org.apache.camel.component.es.ElasticsearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS" },
"useScroll": { "index": 6, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Set to true to enable scroll usage", "constantName": "org.apache.camel.component.es.ElasticsearchConstants#PARAM_SCROLL" },
"size": { "index": 7, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The size of the response.", "constantName": "org.apache.camel.component.es.ElasticsearchConstants#PARAM_SIZE" },
- "from": { "index": 8, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The starting index of the response.", "constantName": "org.apache.camel.component.es.ElasticsearchConstants#PARAM_FROM" }
+ "from": { "index": 8, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The starting index of the response.", "constantName": "org.apache.camel.component.es.ElasticsearchConstants#PARAM_FROM" },
+ "enableDocumentOnlyMode": { "index": 9, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "false", "description": "Indicates whether the body of the message contains only documents.", "constantName": "org.apache.camel.component.es.ElasticsearchConstants#PARAM_DOCUMENT_MODE" }
},
"properties": {
"clusterName": { "index": 0, "kind": "path", "displayName": "Cluster Name", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Name of the cluster" },
"connectionTimeout": { "index": 1, "kind": "parameter", "displayName": "Connection Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The time in ms to wait before connection will timeout." },
"disconnect": { "index": 2, "kind": "parameter", "displayName": "Disconnect", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Disconnect after it finish calling the producer" },
- "from": { "index": 3, "kind": "parameter", "displayName": "From", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Starting index of the response." },
- "hostAddresses": { "index": 4, "kind": "parameter", "displayName": "Host Addresses", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Comma separated list with ip:port formatted remote transport addresses to use." },
- "indexName": { "index": 5, "kind": "parameter", "displayName": "Index Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The name of the index to act against" },
- "maxRetryTimeout": { "index": 6, "kind": "parameter", "displayName": "Max Retry Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The time in ms before retry" },
- "operation": { "index": 7, "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.es.ElasticsearchOperation", "enum": [ "Index", "Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete", "DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "co [...]
- "scrollKeepAliveMs": { "index": 8, "kind": "parameter", "displayName": "Scroll Keep Alive Ms", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 60000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Time in ms during which elasticsearch will keep search context alive" },
- "size": { "index": 9, "kind": "parameter", "displayName": "Size", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Size of the response." },
- "socketTimeout": { "index": 10, "kind": "parameter", "displayName": "Socket Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The timeout in ms to wait before the socket will timeout." },
- "useScroll": { "index": 11, "kind": "parameter", "displayName": "Use Scroll", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Enable scroll usage" },
- "waitForActiveShards": { "index": 12, "kind": "parameter", "displayName": "Wait For Active Shards", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Index creation waits for the write consistency number of shards to be available" },
- "lazyStartProducer": { "index": 13, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
- "documentClass": { "index": 14, "kind": "parameter", "displayName": "Document Class", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "ObjectNode", "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The class to use when deserializing the documents." },
- "enableSniffer": { "index": 15, "kind": "parameter", "displayName": "Enable Sniffer", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Enable automatically discover nodes from a running Elasticsearch cluster. If this [...]
- "sniffAfterFailureDelay": { "index": 16, "kind": "parameter", "displayName": "Sniff After Failure Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 60000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The delay of a sniff execution scheduled after a failure (in mill [...]
- "snifferInterval": { "index": 17, "kind": "parameter", "displayName": "Sniffer Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 300000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The interval between consecutive ordinary sniff executions in milliseconds. Will [...]
- "certificatePath": { "index": 18, "kind": "parameter", "displayName": "Certificate Path", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The certificate that can be used to acc [...]
- "enableSSL": { "index": 19, "kind": "parameter", "displayName": "Enable SSL", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Enable SSL" }
+ "enableDocumentOnlyMode": { "index": 3, "kind": "parameter", "displayName": "Enable Document Only Mode", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Indicates whether the body of the message contains only documents. By [...]
+ "from": { "index": 4, "kind": "parameter", "displayName": "From", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Starting index of the response." },
+ "hostAddresses": { "index": 5, "kind": "parameter", "displayName": "Host Addresses", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Comma separated list with ip:port formatted remote transport addresses to use." },
+ "indexName": { "index": 6, "kind": "parameter", "displayName": "Index Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The name of the index to act against" },
+ "maxRetryTimeout": { "index": 7, "kind": "parameter", "displayName": "Max Retry Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The time in ms before retry" },
+ "operation": { "index": 8, "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.es.ElasticsearchOperation", "enum": [ "Index", "Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete", "DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "co [...]
+ "scrollKeepAliveMs": { "index": 9, "kind": "parameter", "displayName": "Scroll Keep Alive Ms", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 60000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Time in ms during which elasticsearch will keep search context alive" },
+ "size": { "index": 10, "kind": "parameter", "displayName": "Size", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Size of the response." },
+ "socketTimeout": { "index": 11, "kind": "parameter", "displayName": "Socket Timeout", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The timeout in ms to wait before the socket will timeout." },
+ "useScroll": { "index": 12, "kind": "parameter", "displayName": "Use Scroll", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Enable scroll usage" },
+ "waitForActiveShards": { "index": 13, "kind": "parameter", "displayName": "Wait For Active Shards", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Index creation waits for the write consistency number of shards to be available" },
+ "lazyStartProducer": { "index": 14, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
+ "documentClass": { "index": 15, "kind": "parameter", "displayName": "Document Class", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "ObjectNode", "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The class to use when deserializing the documents." },
+ "enableSniffer": { "index": 16, "kind": "parameter", "displayName": "Enable Sniffer", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Enable automatically discover nodes from a running Elasticsearch cluster. If this [...]
+ "sniffAfterFailureDelay": { "index": 17, "kind": "parameter", "displayName": "Sniff After Failure Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 60000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The delay of a sniff execution scheduled after a failure (in mill [...]
+ "snifferInterval": { "index": 18, "kind": "parameter", "displayName": "Sniffer Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 300000, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The interval between consecutive ordinary sniff executions in milliseconds. Will [...]
+ "certificatePath": { "index": 19, "kind": "parameter", "displayName": "Certificate Path", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The certificate that can be used to acc [...]
+ "enableSSL": { "index": 20, "kind": "parameter", "displayName": "Enable SSL", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.es.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Enable SSL" }
}
}
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json
index 2801e5aa6a1..e91983aabf7 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json
@@ -103,14 +103,15 @@
"messageListenerContainerType": { "index": 25, "kind": "parameter", "displayName": "Message Listener Container Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "DMLC", "SMLC" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DMLC", "description": "The type of the MessageListenerContainer" },
"prefetchCount": { "index": 26, "kind": "parameter", "displayName": "Prefetch Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "Tell the broker how many messages to send in a single request. Often this can be set quite high to improve throughput." },
"retry": { "index": 27, "kind": "parameter", "displayName": "Retry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.retry.interceptor.RetryOperationsInterceptor", "deprecated": false, "autowired": false, "secret": false, "description": "Custom retry configuration to use. If this is configured then the other settings such as maximumRetryAttempts for retry are not in use." },
- "confirm": { "index": 28, "kind": "parameter", "displayName": "Confirm", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "auto", "enabled", "disabled" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "auto", "description": "Controls whether to wait for confirms. The connection factory must be configured for publisher confirms and this method. auto = Camel detects if the connection fac [...]
- "confirmTimeout": { "index": 29, "kind": "parameter", "displayName": "Confirm Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specify the timeout in milliseconds to be used when waiting for a message sent to be confirmed by RabbitMQ when doing send only messaging (InOnly). The default value is 5 seconds. A negative value indi [...]
- "replyTimeout": { "index": 30, "kind": "parameter", "displayName": "Reply Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30000", "description": "Specify the timeout in milliseconds to be used when waiting for a reply message when doing request\/reply (InOut) messaging. The default value is 30 seconds. A negative value indicates an indefinite timeo [...]
- "usePublisherConnection": { "index": 31, "kind": "parameter", "displayName": "Use Publisher Connection", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Use a separate connection for publishers and consumers" },
- "lazyStartProducer": { "index": 32, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
- "args": { "index": 33, "kind": "parameter", "displayName": "Args", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "arg.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Specify arguments for configuring the different RabbitMQ concepts, a different prefix is required for each element: arg.consumer. arg.exchange. arg.queue. arg.bindin [...]
- "messageConverter": { "index": 34, "kind": "parameter", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.amqp.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom MessageConverter so you can be in control how to map to\/from a org.springframework.amqp.core.Message." },
- "messagePropertiesConverter": { "index": 35, "kind": "parameter", "displayName": "Message Properties Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.springrabbit.MessagePropertiesConverter", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom MessagePropertiesConverter so you can be in control how to map to\/from a org.springframework.amqp.core.MessageProperties." },
- "synchronous": { "index": 36, "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used" }
+ "allowNullBody": { "index": 28, "kind": "parameter", "displayName": "Allow Null Body", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow sending messages with no body. If this option is false and the message body is null, then an MessageConversionException is thrown." },
+ "confirm": { "index": 29, "kind": "parameter", "displayName": "Confirm", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "auto", "enabled", "disabled" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "auto", "description": "Controls whether to wait for confirms. The connection factory must be configured for publisher confirms and this method. auto = Camel detects if the connection fac [...]
+ "confirmTimeout": { "index": 30, "kind": "parameter", "displayName": "Confirm Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specify the timeout in milliseconds to be used when waiting for a message sent to be confirmed by RabbitMQ when doing send only messaging (InOnly). The default value is 5 seconds. A negative value indi [...]
+ "replyTimeout": { "index": 31, "kind": "parameter", "displayName": "Reply Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30000", "description": "Specify the timeout in milliseconds to be used when waiting for a reply message when doing request\/reply (InOut) messaging. The default value is 30 seconds. A negative value indicates an indefinite timeo [...]
+ "usePublisherConnection": { "index": 32, "kind": "parameter", "displayName": "Use Publisher Connection", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Use a separate connection for publishers and consumers" },
+ "lazyStartProducer": { "index": 33, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
+ "args": { "index": 34, "kind": "parameter", "displayName": "Args", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "arg.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Specify arguments for configuring the different RabbitMQ concepts, a different prefix is required for each element: arg.consumer. arg.exchange. arg.queue. arg.bindin [...]
+ "messageConverter": { "index": 35, "kind": "parameter", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.amqp.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom MessageConverter so you can be in control how to map to\/from a org.springframework.amqp.core.Message." },
+ "messagePropertiesConverter": { "index": 36, "kind": "parameter", "displayName": "Message Properties Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.springrabbit.MessagePropertiesConverter", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom MessagePropertiesConverter so you can be in control how to map to\/from a org.springframework.amqp.core.MessageProperties." },
+ "synchronous": { "index": 37, "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used" }
}
}
diff --git a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
index 9f85a7242ec..f654166715b 100644
--- a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
+++ b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
@@ -25,7 +25,7 @@ import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
/**
- * Sending metrics to AWS CloudWatch using AWS SDK version 2.x.
+ * Sending metrics to AWS CloudWatch.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
diff --git a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentConfiguration.java b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentConfiguration.java
index 8db739d5521..ed25303eeec 100644
--- a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentConfiguration.java
+++ b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentConfiguration.java
@@ -25,7 +25,7 @@ import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
/**
- * Store and retrieve data from AWS DynamoDB service using AWS SDK version 2.x.
+ * Store and retrieve data from AWS DynamoDB.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
diff --git a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentConfiguration.java b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentConfiguration.java
index cdcf2d4aa74..5ffac5735bb 100644
--- a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentConfiguration.java
+++ b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentConfiguration.java
@@ -25,7 +25,7 @@ import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient;
/**
- * Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x.
+ * Receive messages from AWS DynamoDB Stream.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
diff --git a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConfiguration.java b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConfiguration.java
index 9eafb0de826..6b83167a798 100644
--- a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConfiguration.java
+++ b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConfiguration.java
@@ -25,7 +25,7 @@ import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.firehose.FirehoseClient;
/**
- * Produce data to AWS Kinesis Firehose streams using AWS SDK version 2.x.
+ * Produce data to AWS Kinesis Firehose streams.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
diff --git a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentConfiguration.java b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentConfiguration.java
index 78c7ebc8661..30fb93a4b99 100644
--- a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentConfiguration.java
+++ b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentConfiguration.java
@@ -26,8 +26,7 @@ import software.amazon.awssdk.services.kinesis.KinesisClient;
import software.amazon.awssdk.services.kinesis.model.ShardIteratorType;
/**
- * Consume and produce records from and to AWS Kinesis Streams using AWS SDK
- * version 2.x.
+ * Consume and produce records from and to AWS Kinesis Streams.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
diff --git a/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentConfiguration.java b/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentConfiguration.java
index cd6154e96d1..b416d7b621d 100644
--- a/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentConfiguration.java
+++ b/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentConfiguration.java
@@ -25,7 +25,7 @@ import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.lambda.LambdaClient;
/**
- * Manage and invoke AWS Lambda functions using AWS SDK version 2.x.
+ * Manage and invoke AWS Lambda functions.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
diff --git a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
index 5d53631dd05..8d6a2fe1847 100644
--- a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
+++ b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
@@ -28,8 +28,7 @@ import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.presigner.S3Presigner;
/**
- * Store and retrieve objects from AWS S3 Storage Service using AWS SDK version
- * 2.x.
+ * Store and retrieve objects from AWS S3 Storage Service.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
diff --git a/components-starter/camel-aws2-sns-starter/src/main/docs/aws2-sns.json b/components-starter/camel-aws2-sns-starter/src/main/docs/aws2-sns.json
index 487b9c02d25..fe98fe87191 100644
--- a/components-starter/camel-aws2-sns-starter/src/main/docs/aws2-sns.json
+++ b/components-starter/camel-aws2-sns-starter/src/main/docs/aws2-sns.json
@@ -140,9 +140,9 @@
"sourceType": "org.apache.camel.component.aws2.sns.springboot.Sns2ComponentConfiguration"
},
{
- "name": "camel.component.aws2-sns.queue-url",
+ "name": "camel.component.aws2-sns.queue-arn",
"type": "java.lang.String",
- "description": "The queueUrl to subscribe to",
+ "description": "The ARN endpoint to subscribe to",
"sourceType": "org.apache.camel.component.aws2.sns.springboot.Sns2ComponentConfiguration"
},
{
diff --git a/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentConfiguration.java b/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentConfiguration.java
index a4783d55323..f9ca5033cf2 100644
--- a/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentConfiguration.java
+++ b/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentConfiguration.java
@@ -24,7 +24,7 @@ import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.sns.SnsClient;
/**
- * Send messages to an AWS Simple Notification Topic using AWS SDK version 2.x.
+ * Send messages to AWS Simple Notification Topic.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@@ -93,9 +93,9 @@ public class Sns2ComponentConfiguration
*/
private String policy;
/**
- * The queueUrl to subscribe to
+ * The ARN endpoint to subscribe to
*/
- private String queueUrl;
+ private String queueArn;
/**
* The region in which SNS client needs to work. When using this parameter,
* the configuration will expect the lowercase name of the region (for
@@ -259,12 +259,12 @@ public class Sns2ComponentConfiguration
this.policy = policy;
}
- public String getQueueUrl() {
- return queueUrl;
+ public String getQueueArn() {
+ return queueArn;
}
- public void setQueueUrl(String queueUrl) {
- this.queueUrl = queueUrl;
+ public void setQueueArn(String queueArn) {
+ this.queueArn = queueArn;
}
public String getRegion() {
diff --git a/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConfiguration.java b/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConfiguration.java
index 234d20a944e..cc0727e4a16 100644
--- a/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConfiguration.java
+++ b/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConfiguration.java
@@ -25,7 +25,7 @@ import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.sqs.SqsClient;
/**
- * Send and receive messages to/from AWS SQS service using AWS SDK version 2.x.
+ * Send and receive messages to/from AWS SQS.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
diff --git a/components-starter/camel-elasticsearch-starter/src/main/docs/elasticsearch.json b/components-starter/camel-elasticsearch-starter/src/main/docs/elasticsearch.json
index 06367aaf487..1728eba5739 100644
--- a/components-starter/camel-elasticsearch-starter/src/main/docs/elasticsearch.json
+++ b/components-starter/camel-elasticsearch-starter/src/main/docs/elasticsearch.json
@@ -44,6 +44,13 @@
"type": "java.lang.Boolean",
"sourceType": "org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties"
},
+ {
+ "name": "camel.component.elasticsearch.enable-document-only-mode",
+ "type": "java.lang.Boolean",
+ "description": "Indicates whether the body of the message contains only documents. By default, it is set to false to be able to do the same requests as what the Document API supports (see https:\/\/www.elastic.co\/guide\/en\/elasticsearch\/reference\/current\/docs.html for more details). To ease the migration of routes based on the legacy component camel-elasticsearch-rest, you should consider enabling the mode especially if your routes do update operations.",
+ "sourceType": "org.apache.camel.component.es.springboot.ElasticsearchComponentConfiguration",
+ "defaultValue": false
+ },
{
"name": "camel.component.elasticsearch.enable-s-s-l",
"type": "java.lang.Boolean",
diff --git a/components-starter/camel-elasticsearch-starter/src/main/java/org/apache/camel/component/es/springboot/ElasticsearchComponentConfiguration.java b/components-starter/camel-elasticsearch-starter/src/main/java/org/apache/camel/component/es/springboot/ElasticsearchComponentConfiguration.java
index 7ee18be87e2..7b15a09a4a4 100644
--- a/components-starter/camel-elasticsearch-starter/src/main/java/org/apache/camel/component/es/springboot/ElasticsearchComponentConfiguration.java
+++ b/components-starter/camel-elasticsearch-starter/src/main/java/org/apache/camel/component/es/springboot/ElasticsearchComponentConfiguration.java
@@ -39,6 +39,16 @@ public class ElasticsearchComponentConfiguration
* The time in ms to wait before connection will timeout.
*/
private Integer connectionTimeout = 30000;
+ /**
+ * Indicates whether the body of the message contains only documents. By
+ * default, it is set to false to be able to do the same requests as what
+ * the Document API supports (see
+ * https://www.elastic.co/guide/en/elasticsearch/reference/current/docs.html
+ * for more details). To ease the migration of routes based on the legacy
+ * component camel-elasticsearch-rest, you should consider enabling the mode
+ * especially if your routes do update operations.
+ */
+ private Boolean enableDocumentOnlyMode = false;
/**
* Comma separated list with ip:port formatted remote transport addresses to
* use. The ip and port options must be left blank for hostAddresses to be
@@ -122,6 +132,14 @@ public class ElasticsearchComponentConfiguration
this.connectionTimeout = connectionTimeout;
}
+ public Boolean getEnableDocumentOnlyMode() {
+ return enableDocumentOnlyMode;
+ }
+
+ public void setEnableDocumentOnlyMode(Boolean enableDocumentOnlyMode) {
+ this.enableDocumentOnlyMode = enableDocumentOnlyMode;
+ }
+
public String getHostAddresses() {
return hostAddresses;
}
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 231226b8a78..ecce6ff5776 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -271,7 +271,7 @@
<!-- <module>camel-jooq-starter</module> disabled by camel-spring-boot-prod-maven-plugin:camel-prod-excludes -->
<!-- <module>camel-joor-starter</module> disabled by camel-spring-boot-prod-maven-plugin:camel-prod-excludes -->
<module>camel-jpa-starter</module>
- <module>camel-jq-starter</module>
+ <!-- <module>camel-jq-starter</module> disabled by camel-spring-boot-prod-maven-plugin:camel-prod-excludes -->
<!-- <module>camel-jsch-starter</module> disabled by camel-spring-boot-prod-maven-plugin:camel-prod-excludes -->
<module>camel-jslt-starter</module>
<!-- <module>camel-json-patch-starter</module> disabled by camel-spring-boot-prod-maven-plugin:camel-prod-excludes -->
diff --git a/pom.xml b/pom.xml
index b38867445ae..f2e35db5631 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,13 +112,13 @@
<spring-boot-version>3.1.3</spring-boot-version>
<!-- Camel target version -->
- <camel-version>4.0.0.redhat-00001</camel-version>
+ <camel-version>4.0.0.redhat-00010</camel-version>
<!-- cq plugin version -->
<cq-plugin.version>4.4.2</cq-plugin.version>
<camel-community.version>4.0.0</camel-community.version>
<camel-spring-boot-community.version>4.0.0</camel-spring-boot-community.version>
- <camel-sap.version>4.0.0.redhat-00028</camel-sap.version>
+ <camel-sap.version>4.0.0.redhat-00044</camel-sap.version>
<!-- narayana spring boot version -->
<narayana-spring-boot.version>3.0.0.redhat-00017</narayana-spring-boot.version>
diff --git a/product/src/main/resources/required-productized-camel-artifacts.txt b/product/src/main/resources/required-productized-camel-artifacts.txt
index ca26e43950a..1ad1cd438b7 100644
--- a/product/src/main/resources/required-productized-camel-artifacts.txt
+++ b/product/src/main/resources/required-productized-camel-artifacts.txt
@@ -63,7 +63,6 @@ camel-jdbc-starter
camel-jira-starter
camel-jms-starter
camel-jpa-starter
-camel-jq-starter
camel-jslt-starter
camel-jsonpath-starter
camel-kafka-starter
diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml
index 54a163c5050..3ea97d7038b 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -916,7 +916,7 @@
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jq-starter</artifactId>
- <version>${project.version}</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index f5318e08d0c..1ca233cd608 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -235,17 +235,17 @@
<dependency>
<groupId>org.apache.camel.maven</groupId>
<artifactId>camel-debezium-maven-plugin</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel.maven</groupId>
<artifactId>camel-salesforce-maven-plugin</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel.maven</groupId>
<artifactId>camel-servicenow-maven-plugin</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
@@ -1115,7 +1115,7 @@
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jq-starter</artifactId>
- <version>${project.version}</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
@@ -1935,7 +1935,7 @@
<dependency>
<groupId>org.apache.camel.tests</groupId>
<artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -1945,18 +1945,18 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-allcomponents</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-amqp</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-api</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -1996,12 +1996,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-attachments</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-avro</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2041,12 +2041,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-cw</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-ddb</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2076,7 +2076,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-kinesis</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2086,7 +2086,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-lambda</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2101,7 +2101,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-s3</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2111,12 +2111,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-sns</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-sqs</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2141,7 +2141,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-azure-eventhubs</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2156,12 +2156,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-azure-servicebus</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-azure-storage-blob</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2171,7 +2171,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-azure-storage-queue</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2181,12 +2181,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-base</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-base-engine</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2196,17 +2196,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bean</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bean-validator</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bindy</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2231,7 +2231,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-browse</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2241,22 +2241,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cassandraql</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog-console</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog-lucene</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2286,22 +2286,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cli-connector</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cloud</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cloudevents</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cluster</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2321,12 +2321,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-componentdsl</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-console</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2336,12 +2336,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-controlbus</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2352,37 +2352,37 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-catalog</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-languages</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-model</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-processor</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-reifier</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-xml</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2397,12 +2397,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cron</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-crypto</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2422,52 +2422,52 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-common</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-rest</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-soap</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-spring-common</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-spring-rest</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-spring-soap</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-spring-transport</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-transport</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dataformat</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dataset</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2532,7 +2532,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-direct</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2567,12 +2567,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dsl-modeline</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dsl-support</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2587,7 +2587,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-elasticsearch</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2597,12 +2597,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-endpointdsl</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-endpointdsl-support</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2627,17 +2627,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-fhir</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-fhir-api</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-file</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2667,7 +2667,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-ftp</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2687,7 +2687,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-google-bigquery</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2712,7 +2712,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-google-pubsub</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2762,12 +2762,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-grpc</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-gson</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2797,27 +2797,27 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-health</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-hl7</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http-base</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http-common</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2877,17 +2877,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-infinispan</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-infinispan-common</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-infinispan-embedded</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2912,22 +2912,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jackson</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jackson-avro</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jackson-protobuf</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jacksonxml</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2937,7 +2937,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-java-joor-dsl</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2947,7 +2947,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jaxb</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2977,7 +2977,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jdbc</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2992,7 +2992,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jfr</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3007,12 +3007,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jira</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3037,12 +3037,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jpa</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jq</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3062,7 +3062,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jslt</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3092,7 +3092,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jsonpath</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3102,42 +3102,42 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jta</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-kafka</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-kamelet</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-kamelet-main</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-knative</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-knative-api</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-knative-http</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-kubernetes</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3147,12 +3147,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-language</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-ldap</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3167,7 +3167,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-log</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3192,37 +3192,37 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mail</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mail-microsoft-oauth</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-main</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-management</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-management-api</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mapstruct</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-master</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3232,22 +3232,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-micrometer</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-microprofile-config</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-microprofile-fault-tolerance</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-microprofile-health</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3257,22 +3257,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-minio</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mllp</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mongodb</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3292,22 +3292,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mybatis</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-nats</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-netty</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-netty-http</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3342,17 +3342,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-olingo4</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-olingo4-api</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-openapi-java</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3367,7 +3367,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-opentelemetry</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3377,12 +3377,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-paho</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-paho-mqtt5</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3407,17 +3407,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-platform-http</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-platform-http-main</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-platform-http-vertx</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3452,7 +3452,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-quartz</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3487,7 +3487,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-ref</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3497,7 +3497,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-resilience4j</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3507,12 +3507,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-rest</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-rest-openapi</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3542,12 +3542,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-saga</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-salesforce</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3562,12 +3562,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-saxon</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-scheduler</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3577,7 +3577,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-seda</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3592,7 +3592,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servlet</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3612,7 +3612,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-slack</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3627,17 +3627,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-snmp</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-soap</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-splunk</artifactId>
- <version>4.0.0</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3647,57 +3647,57 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-batch</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-jdbc</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-ldap</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-main</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-rabbitmq</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-redis</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-security</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-ws</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-xml</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-sql</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3732,12 +3732,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-stub</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3757,17 +3757,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-telegram</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3777,7 +3777,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-spring-junit5</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3797,27 +3797,27 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-timer</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tooling-maven</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tooling-model</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tooling-util</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tracing</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3832,12 +3832,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-undertow</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-undertow-spring-security</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3847,22 +3847,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-util</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-validator</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-velocity</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3872,17 +3872,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-vertx-common</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-vertx-http</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-vertx-websocket</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3902,7 +3902,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-webhook</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3927,27 +3927,27 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xj</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-io</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-io-dsl</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-io-util</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-jaxb</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3957,12 +3957,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-jaxp</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-jaxp-util</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3977,37 +3977,37 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xpath</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xslt</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xslt-saxon</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-yaml-dsl</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-yaml-dsl-common</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-yaml-dsl-deserializers</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-yaml-io</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -4022,12 +4022,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-zip-deflater</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-zipfile</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -4047,7 +4047,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>spi-annotations</artifactId>
- <version>4.0.0.redhat-00001</version>
+ <version>4.0.0.redhat-00010</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -4074,16 +4074,26 @@
<artifactId>jackson-xc</artifactId>
<version>${jackson-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jkube</groupId>
+ <artifactId>openshift-maven-plugin</artifactId>
+ <version>1.13.1.redhat-00001</version>
+ </dependency>
<dependency>
<groupId>org.fusesource</groupId>
<artifactId>camel-sap</artifactId>
- <version>4.0.0.redhat-00028</version>
+ <version>4.0.0.redhat-00044</version>
</dependency>
<dependency>
<groupId>org.fusesource</groupId>
<artifactId>camel-sap-starter</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <version>1.1.10.3</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<!-- Force the reactor build order -->
(camel-spring-boot) 14/40: Override avro/commons-compress (#273)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 7b194c485e6e26a4f86cc497a2748bea24aa8290
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Fri Sep 29 14:14:08 2023 -0400
Override avro/commons-compress (#273)
---
.../src/main/resources/pom.xml | 12 ++++++++++++
tooling/redhat-camel-spring-boot-bom/pom.xml | 12 ++++++++++++
2 files changed, 24 insertions(+)
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 4945d735ad2..e1fa685691f 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -90,6 +90,18 @@
<artifactId>undertow-servlet</artifactId>
<version>${undertow-version}</version>
</dependency>
+ <!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter -->
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro-version}</version>
+ </dependency>
+ <!-- Override commons-compress version -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons-compress-version}</version>
+ </dependency>
<!-- Overrides elastic-search dependency since SB is using an older version -->
<dependency>
<groupId>org.elasticsearch.client</groupId>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index f11c251c5ab..8a5ffad44ee 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -90,6 +90,18 @@
<artifactId>undertow-servlet</artifactId>
<version>2.3.7.Final</version>
</dependency>
+ <!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter -->
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>1.11.0</version>
+ </dependency>
+ <!-- Override commons-compress version -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.21</version>
+ </dependency>
<!-- Overrides elastic-search dependency since SB is using an older version -->
<dependency>
<groupId>org.elasticsearch.client</groupId>
(camel-spring-boot) 17/40: Make test compliant with quay mirroring
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 27f63e754faaf168c7dcecb7690a81f90ffd30ac
Author: Marco Carletti <mc...@redhat.com>
AuthorDate: Wed Oct 4 09:57:34 2023 +0200
Make test compliant with quay mirroring
---
.../camel/component/mongodb/integration/MongoDbFindOperationIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
index 89e037d1c31..bcb21ea8f50 100644
--- a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
+++ b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
@@ -92,7 +92,7 @@ public class MongoDbFindOperationIT {
static {
// This one requires Mongo 4.4. This is related to
// "CAMEL-15604 support allowDiskUse for MongoDB find operations"
- service = new MongoDBLocalContainerService("mongo:4.4");
+ service = new MongoDBLocalContainerService("library/mongo:4.4");
service.getContainer()
.waitingFor(Wait.forListeningPort())
(camel-spring-boot) 21/40: CAMEL-19955: Review the usage of Protostream
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 267ca0d51fc6556240961ecc16d1f0d0a5be2b5a
Author: Croway <fe...@gmail.com>
AuthorDate: Thu Oct 12 14:17:06 2023 +0200
CAMEL-19955: Review the usage of Protostream
---
components-starter/camel-infinispan-starter/pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/components-starter/camel-infinispan-starter/pom.xml b/components-starter/camel-infinispan-starter/pom.xml
index 52ecd5bc484..95d4c20d077 100644
--- a/components-starter/camel-infinispan-starter/pom.xml
+++ b/components-starter/camel-infinispan-starter/pom.xml
@@ -93,15 +93,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.infinispan.protostream</groupId>
- <artifactId>sample-domain-definition</artifactId>
- <version>${protostream-version}</version>
+ <groupId>org.infinispan</groupId>
+ <artifactId>proto-sample-domain-definition</artifactId>
+ <version>${infinispan-version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.infinispan.protostream</groupId>
- <artifactId>sample-domain-implementation</artifactId>
- <version>${protostream-version}</version>
+ <groupId>org.infinispan</groupId>
+ <artifactId>proto-sample-domain-implementation</artifactId>
+ <version>${infinispan-version}</version>
<scope>test</scope>
</dependency>
<dependency>
(camel-spring-boot) 27/40: Externalize credentials to properties files for SAST tests (#988)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 82b0eabc538cce91b2619c6f5af6ca79f4dda6ca
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Thu Oct 26 03:41:28 2023 -0400
Externalize credentials to properties files for SAST tests (#988)
---
...ptedPropertiesIvGeneratorAutoDetectionTest.java | 18 +++++---
...ptedPropertiesCustomConfigurationBeansTest.java | 17 ++++++--
...ertiesDisabledCustomConfigurationBeansTest.java | 2 +-
.../EncryptedPropertiesDisabledTest.java | 2 +-
.../jasypt/springboot/EncryptedPropertiesTest.java | 2 +-
...tBase.java => EncryptedPropertiesTestBase.java} | 2 +-
.../src/test/resources/test.properties | 2 +
.../integration/AbstractMongoDbITSupport.java | 15 +++++--
.../MongoDbCredentialsFromUriConnectionIT.java | 18 ++++----
.../meta/integration/MongoDbMetaExtensionIT.java | 26 +++++++-----
.../integration/MongoDbVerifierExtensionIT.java | 48 ++++++++++++++--------
.../src/test/resources/test.properties | 11 +++++
.../NettyComponentConfigurationTest.java | 22 +++++++---
.../nettycomponentconfigurationtest.properties | 1 +
.../salesforce/springboot/RawPayloadTest.java | 19 +++++++--
.../src/test/resources/rawpayload.properties | 1 +
16 files changed, 144 insertions(+), 62 deletions(-)
diff --git a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest.java b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest.java
index 64458ecdc1b..7a20c73717c 100644
--- a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest.java
+++ b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest.java
@@ -27,7 +27,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.PrintStream;
+import java.util.Properties;
import static org.apache.camel.component.jasypt.springboot.JasyptEncryptedPropertiesUtils.isIVNeeded;
import static org.assertj.core.api.Assertions.assertThat;
@@ -41,18 +43,24 @@ public abstract class AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest {
String stringToEncrypt = "A password-cracker walks into a bar. Orders a beer. Then a Beer. Then a BEER. beer. b33r. BeeR. Be3r. bEeR. bE3R. BeEr";
- String password = "s0m3R@nD0mP@ssW0rD";
-
-
+ //String password = "s0m3R@nD0mP@ssW0rD";
protected String provider;
+ public static Properties loadAuthProperties() throws IOException {
+ Properties properties = new Properties();
+ properties.load(AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest.class.getClassLoader().getResourceAsStream("test.properties"));
+ return properties;
+ }
+
@ParameterizedTest
@MethodSource("data")
- public void testEncryptionAndDecryption(String algorithm) {
+ public void testEncryptionAndDecryption(String algorithm) throws IOException {
LOG.info("Testing Algorithm: '{}', requires IV: {}", algorithm, isIVNeeded(algorithm));
+ Properties properties = loadAuthProperties();
+
// Create a ByteArrayOutputStream so that we can get the output
// from the call to print
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -64,7 +72,7 @@ public abstract class AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest {
environmentStringPBEConfig.setIvGenerator(isIVNeeded(algorithm)?new RandomIvGenerator():new NoIvGenerator());
environmentStringPBEConfig.setSaltGenerator(new RandomSaltGenerator());
environmentStringPBEConfig.setProviderName(provider);
- environmentStringPBEConfig.setPassword(password);
+ environmentStringPBEConfig.setPassword(properties.getProperty("password"));
StandardPBEStringEncryptor standardPBEStringEncryptor = new StandardPBEStringEncryptor();
standardPBEStringEncryptor.setConfig(environmentStringPBEConfig);
diff --git a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesCustomConfigurationBeansTest.java b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesCustomConfigurationBeansTest.java
index ccfe835dc28..5250527c6c1 100644
--- a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesCustomConfigurationBeansTest.java
+++ b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesCustomConfigurationBeansTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.jasypt.springboot;
+import java.io.IOException;
+import java.util.Properties;
+
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
@@ -38,9 +41,13 @@ import org.springframework.test.annotation.DirtiesContext;
@SpringBootTest(
classes = {EncryptedPropertiesCustomConfigurationBeansTest.TestConfiguration.class},
properties = {"encrypted.password=ENC(6q7H+bWqPbSZVW1hUzDVgnl7iSnC04zRmKwD31ounBMPM/2CtDS7fwb4u1OGZ2Q4)"})
-public class EncryptedPropertiesCustomConfigurationBeansTest extends EncryptedProperiesTestBase {
-
+public class EncryptedPropertiesCustomConfigurationBeansTest extends EncryptedPropertiesTestBase {
+ public static Properties loadAuthProperties() throws IOException {
+ Properties properties = new Properties();
+ properties.load(EncryptedPropertiesCustomConfigurationBeansTest.class.getClassLoader().getResourceAsStream("test.properties"));
+ return properties;
+ }
@Test
public void testCustomEnvironmentVariablesConfiguration() {
@@ -68,12 +75,14 @@ public class EncryptedPropertiesCustomConfigurationBeansTest extends EncryptedPr
}
@Bean("customEnvironmentStringPBEConfig")
- public EnvironmentStringPBEConfig environmentVariablesConfiguration() {
+ public EnvironmentStringPBEConfig environmentVariablesConfiguration() throws IOException {
+ Properties props = loadAuthProperties();
+
EnvironmentStringPBEConfig environmentStringPBEConfig = new EnvironmentStringPBEConfig();
environmentStringPBEConfig.setAlgorithm("PBEWITHHMACSHA512ANDAES_256");
environmentStringPBEConfig.setIvGenerator(new RandomIvGenerator(getSecureRandomAlgorithm()));
environmentStringPBEConfig.setSaltGenerator(new RandomSaltGenerator(getSecureRandomAlgorithm()));
- environmentStringPBEConfig.setPassword("mainpassword");
+ environmentStringPBEConfig.setPassword(props.getProperty("mainpassword"));
return environmentStringPBEConfig;
}
diff --git a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledCustomConfigurationBeansTest.java b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledCustomConfigurationBeansTest.java
index b4157f14897..eea078e55f9 100644
--- a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledCustomConfigurationBeansTest.java
+++ b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledCustomConfigurationBeansTest.java
@@ -36,7 +36,7 @@ import static org.apache.camel.component.jasypt.springboot.Constants.START_URI_T
properties = {
"camel.component.jasypt.enabled = false",
"encrypted.password=ENC(6q7H+bWqPbSZVW1hUzDVgnl7iSnC04zRmKwD31ounBMPM/2CtDS7fwb4u1OGZ2Q4)"})
-public class EncryptedPropertiesDisabledCustomConfigurationBeansTest extends EncryptedProperiesTestBase {
+public class EncryptedPropertiesDisabledCustomConfigurationBeansTest extends EncryptedPropertiesTestBase {
@Test
public void testCustomEnvironmentVariablesConfiguration() {
diff --git a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledTest.java b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledTest.java
index 1ab7aee5451..af7fe190805 100644
--- a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledTest.java
+++ b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesDisabledTest.java
@@ -34,7 +34,7 @@ import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
@SpringBootTest(
properties = {"camel.component.jasypt.enabled = false"},
classes = {EncryptedPropertiesCustomConfigurationBeansTest.TestConfiguration.class})
-public class EncryptedPropertiesDisabledTest extends EncryptedProperiesTestBase{
+public class EncryptedPropertiesDisabledTest extends EncryptedPropertiesTestBase{
/**
diff --git a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesTest.java b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesTest.java
index e4d696115cf..21231f584e1 100644
--- a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesTest.java
+++ b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesTest.java
@@ -35,7 +35,7 @@ import static org.apache.camel.component.jasypt.springboot.Constants.START_URI_T
@DirtiesContext
@SpringBootApplication
@SpringBootTest(classes = {EncryptedPropertiesTest.TestConfiguration.class})
-public class EncryptedPropertiesTest extends EncryptedProperiesTestBase {
+public class EncryptedPropertiesTest extends EncryptedPropertiesTestBase {
@Test
public void testEncryptionInsideCamelContext() {
diff --git a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedProperiesTestBase.java b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesTestBase.java
similarity index 97%
rename from components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedProperiesTestBase.java
rename to components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesTestBase.java
index e921d29af3e..0d9f19388d7 100644
--- a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedProperiesTestBase.java
+++ b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesTestBase.java
@@ -30,7 +30,7 @@ import static org.apache.camel.component.jasypt.springboot.Constants.START_URI_T
import static org.apache.camel.component.jasypt.springboot.Constants.START_URI_TEST_UNENCRYPTED_PROPS_OUT_CC;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public abstract class EncryptedProperiesTestBase {
+public abstract class EncryptedPropertiesTestBase {
@EndpointInject(MOCK_URI)
diff --git a/components-starter/camel-jasypt-starter/src/test/resources/test.properties b/components-starter/camel-jasypt-starter/src/test/resources/test.properties
new file mode 100644
index 00000000000..8b7f453b095
--- /dev/null
+++ b/components-starter/camel-jasypt-starter/src/test/resources/test.properties
@@ -0,0 +1,2 @@
+password=s0m3R@nD0mP@ssW0rD
+mainpassword=mainpassword
\ No newline at end of file
diff --git a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/AbstractMongoDbITSupport.java b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/AbstractMongoDbITSupport.java
index 46ac9aa4090..d4c3585e0ea 100644
--- a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/AbstractMongoDbITSupport.java
+++ b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/AbstractMongoDbITSupport.java
@@ -46,15 +46,15 @@ import com.mongodb.client.MongoClients;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
+import java.io.IOException;
import java.util.Formatter;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Properties;
public abstract class AbstractMongoDbITSupport {
protected static final String SCHEME = "mongodb";
- protected static final String USER = "test-user";
- protected static final String PASSWORD = "test-pwd";
@RegisterExtension
public static MongoDBService service = MongoDBServiceFactory.createService();
protected static MongoClient mongo;
@@ -101,11 +101,18 @@ public abstract class AbstractMongoDbITSupport {
dynamicCollection.drop();
}
+ public static Properties loadAuthProperties() throws IOException {
+ Properties properties = new Properties();
+ properties.load(AbstractMongoDbITSupport.class.getClassLoader().getResourceAsStream("test.properties"));
+ return properties;
+ }
+
/**
* Useful to simulate the presence of an authenticated user with name {@value #USER} and password {@value #PASSWORD}
*/
- protected void createAuthorizationUser() {
- createAuthorizationUser("admin", USER, PASSWORD);
+ protected void createAuthorizationUser() throws IOException {
+ Properties properties = loadAuthProperties();
+ createAuthorizationUser("admin", properties.getProperty("testusername"), properties.getProperty("testpassword"));
}
protected void createAuthorizationUser(String database, String user, String password) {
diff --git a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbCredentialsFromUriConnectionIT.java b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbCredentialsFromUriConnectionIT.java
index be5f1a86e83..62099d12d8a 100644
--- a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbCredentialsFromUriConnectionIT.java
+++ b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbCredentialsFromUriConnectionIT.java
@@ -17,6 +17,9 @@
package org.apache.camel.component.mongodb.integration;
+import java.io.IOException;
+import java.util.Properties;
+
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mongodb.MongoDbConstants;
@@ -49,9 +52,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
)
public class MongoDbCredentialsFromUriConnectionIT extends MongoDbOperationsIT {
- protected static final String AUTH_SOURCE_USER = "auth-source-user";
- protected static final String AUTH_SOURCE_PASSWORD = "auth-source-password";
-
@Configuration
public class TestConfiguration {
@@ -59,14 +59,15 @@ public class MongoDbCredentialsFromUriConnectionIT extends MongoDbOperationsIT {
public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
- public void configure() {
+ public void configure() throws IOException {
+ Properties properties = loadAuthProperties();
String uriHostnameOnly = String.format("mongodb:mongo?hosts=%s&", service.getConnectionAddress());
//connecting with credentials for created user
- String uriWithCredentials = String.format("%susername=%s&password=%s&", uriHostnameOnly, USER, PASSWORD);
+ String uriWithCredentials = String.format("%susername=%s&password=%s&", uriHostnameOnly, properties.getProperty("testusername"), properties.getProperty("testpassword"));
String uriWithAuthSource = String.format(
"%susername=%s&password=%s&authSource=%s&",
- uriHostnameOnly, AUTH_SOURCE_USER, AUTH_SOURCE_PASSWORD, dbName);
+ uriHostnameOnly, properties.getProperty("authsourceusername"), properties.getProperty("authsourceuserpassword"), dbName);
from("direct:count").to(
uriHostnameOnly + "database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true");
@@ -107,9 +108,10 @@ public class MongoDbCredentialsFromUriConnectionIT extends MongoDbOperationsIT {
}
@BeforeEach
- public void before() {
+ public void before() throws IOException {
+ Properties properties = loadAuthProperties();
createAuthorizationUser();
- createAuthorizationUser(dbName, AUTH_SOURCE_USER, AUTH_SOURCE_PASSWORD);
+ createAuthorizationUser(dbName, properties.getProperty("authsourceusername"), properties.getProperty("authsourcepassword"));
}
@Test
diff --git a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/meta/integration/MongoDbMetaExtensionIT.java b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/meta/integration/MongoDbMetaExtensionIT.java
index d21e4665a9b..8db5016e616 100644
--- a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/meta/integration/MongoDbMetaExtensionIT.java
+++ b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/meta/integration/MongoDbMetaExtensionIT.java
@@ -16,9 +16,11 @@
*/
package org.apache.camel.component.mongodb.meta.integration;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
+import java.util.Properties;
import com.fasterxml.jackson.databind.JsonNode;
import com.mongodb.client.model.CreateCollectionOptions;
@@ -54,7 +56,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
public class MongoDbMetaExtensionIT extends AbstractMongoDbITSupport {
// We simulate the presence of an authenticated user
@BeforeEach
- public void createAuthorizationUser() {
+ public void createAuthorizationUser() throws IOException {
super.createAuthorizationUser();
}
@@ -63,7 +65,8 @@ public class MongoDbMetaExtensionIT extends AbstractMongoDbITSupport {
}
@Test
- public void testValidMetaData() {
+ public void testValidMetaData() throws IOException {
+ Properties properties = loadAuthProperties();
// When
final String database = "test";
final String collection = "validatedCollection";
@@ -99,8 +102,8 @@ public class MongoDbMetaExtensionIT extends AbstractMongoDbITSupport {
parameters.put("database", database);
parameters.put("collection", collection);
parameters.put("host", service.getConnectionAddress());
- parameters.put("user", USER);
- parameters.put("password", PASSWORD);
+ parameters.put("user", properties.getProperty("testusername"));
+ parameters.put("password", properties.getProperty("testpassword"));
MetaDataExtension.MetaData result = component.getExtension(MetaDataExtension.class).get().meta(parameters)
.orElseThrow(UnsupportedOperationException::new);
@@ -116,7 +119,9 @@ public class MongoDbMetaExtensionIT extends AbstractMongoDbITSupport {
}
@Test
- public void testMissingCollection() {
+ public void testMissingCollection() throws IOException {
+ Properties properties = loadAuthProperties();
+
// When
final String database = "test";
final String collection = "missingCollection";
@@ -126,8 +131,8 @@ public class MongoDbMetaExtensionIT extends AbstractMongoDbITSupport {
parameters.put("database", database);
parameters.put("collection", collection);
parameters.put("host", service.getConnectionAddress());
- parameters.put("user", USER);
- parameters.put("password", PASSWORD);
+ parameters.put("user", properties.getProperty("testusername"));
+ parameters.put("password", properties.getProperty("testpassword"));
final Optional<MetaDataExtension.MetaData> meta
= component.getExtension(MetaDataExtension.class).get().meta(parameters);
@@ -150,7 +155,8 @@ public class MongoDbMetaExtensionIT extends AbstractMongoDbITSupport {
}
@Test
- public void testNotValidatedCollection() {
+ public void testNotValidatedCollection() throws IOException {
+ Properties properties = loadAuthProperties();
// When
final String database = "test";
final String collection = "notValidatedCollection";
@@ -161,8 +167,8 @@ public class MongoDbMetaExtensionIT extends AbstractMongoDbITSupport {
parameters.put("database", database);
parameters.put("collection", collection);
parameters.put("host", service.getConnectionAddress());
- parameters.put("user", USER);
- parameters.put("password", PASSWORD);
+ parameters.put("user", properties.getProperty("testusername"));
+ parameters.put("password", properties.getProperty("testpassword"));
final Optional<MetaDataExtension.MetaData> meta
= component.getExtension(MetaDataExtension.class).get().meta(parameters);
diff --git a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/verifier/integration/MongoDbVerifierExtensionIT.java b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/verifier/integration/MongoDbVerifierExtensionIT.java
index 2e543dc6018..bb9d525f869 100644
--- a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/verifier/integration/MongoDbVerifierExtensionIT.java
+++ b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/verifier/integration/MongoDbVerifierExtensionIT.java
@@ -16,8 +16,10 @@
*/
package org.apache.camel.component.mongodb.verifier.integration;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import java.util.Properties;
import org.apache.camel.Component;
import org.apache.camel.component.extension.ComponentVerifierExtension;
@@ -47,7 +49,7 @@ import org.springframework.test.annotation.DirtiesContext;
public class MongoDbVerifierExtensionIT extends AbstractMongoDbITSupport {
// We simulate the presence of an authenticated user
@BeforeEach
- public void createAuthorizationUser() {
+ public void createAuthorizationUser() throws IOException {
super.createAuthorizationUser();
}
@@ -60,12 +62,13 @@ public class MongoDbVerifierExtensionIT extends AbstractMongoDbITSupport {
}
@Test
- public void verifyConnectionOK() {
+ public void verifyConnectionOK() throws IOException {
+ Properties properties = loadAuthProperties();
//When
Map<String, Object> parameters = new HashMap<>();
parameters.put("host", service.getConnectionAddress());
- parameters.put("user", USER);
- parameters.put("password", PASSWORD);
+ parameters.put("user", properties.getProperty("testusername"));
+ parameters.put("password", properties.getProperty("testpassword"));
//Given
ComponentVerifierExtension.Result result
= getExtension().verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
@@ -74,12 +77,13 @@ public class MongoDbVerifierExtensionIT extends AbstractMongoDbITSupport {
}
@Test
- public void verifyConnectionKO() {
+ public void verifyConnectionKO() throws IOException {
+ Properties properties = loadAuthProperties();
//When
Map<String, Object> parameters = new HashMap<>();
parameters.put("host", "notReachable.host");
- parameters.put("user", USER);
- parameters.put("password", PASSWORD);
+ parameters.put("user", properties.getProperty("testusername"));
+ parameters.put("password", properties.getProperty("testpassword"));
//Given
ComponentVerifierExtension.Result result
= getExtension().verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
@@ -89,11 +93,13 @@ public class MongoDbVerifierExtensionIT extends AbstractMongoDbITSupport {
}
@Test
- public void verifyConnectionMissingParams() {
+ public void verifyConnectionMissingParams() throws IOException {
+ Properties properties = loadAuthProperties();
+
//When
Map<String, Object> parameters = new HashMap<>();
parameters.put("host", service.getConnectionAddress());
- parameters.put("user", USER);
+ parameters.put("user", properties.getProperty("testusername"));
//Given
ComponentVerifierExtension.Result result
= getExtension().verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
@@ -103,12 +109,14 @@ public class MongoDbVerifierExtensionIT extends AbstractMongoDbITSupport {
}
@Test
- public void verifyConnectionNotAuthenticated() {
+ public void verifyConnectionNotAuthenticated() throws IOException {
+ Properties properties = loadAuthProperties();
+
//When
Map<String, Object> parameters = new HashMap<>();
parameters.put("host", service.getConnectionAddress());
- parameters.put("user", USER);
- parameters.put("password", "wrongPassword");
+ parameters.put("user", properties.getProperty("wrongusername"));
+ parameters.put("password", properties.getProperty("wrongpassword"));
//Given
ComponentVerifierExtension.Result result
= getExtension().verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
@@ -118,12 +126,14 @@ public class MongoDbVerifierExtensionIT extends AbstractMongoDbITSupport {
}
@Test
- public void verifyConnectionAdminDBKO() {
+ public void verifyConnectionAdminDBKO() throws IOException {
+ Properties properties = loadAuthProperties();
+
//When
Map<String, Object> parameters = new HashMap<>();
parameters.put("host", service.getConnectionAddress());
- parameters.put("user", USER);
- parameters.put("password", PASSWORD);
+ parameters.put("user", properties.getProperty("testusername"));
+ parameters.put("password", properties.getProperty("testpassword"));
parameters.put("adminDB", "someAdminDB");
//Given
ComponentVerifierExtension.Result result
@@ -134,12 +144,14 @@ public class MongoDbVerifierExtensionIT extends AbstractMongoDbITSupport {
}
@Test
- public void verifyConnectionPortKO() {
+ public void verifyConnectionPortKO() throws IOException {
+ Properties properties = loadAuthProperties();
+
//When
Map<String, Object> parameters = new HashMap<>();
parameters.put("host", "localhost:12343");
- parameters.put("user", USER);
- parameters.put("password", PASSWORD);
+ parameters.put("user", properties.getProperty("testusername"));
+ parameters.put("password", properties.getProperty("testpassword"));
//Given
ComponentVerifierExtension.Result result
= getExtension().verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
diff --git a/components-starter/camel-mongodb-starter/src/test/resources/test.properties b/components-starter/camel-mongodb-starter/src/test/resources/test.properties
new file mode 100644
index 00000000000..c8b7390f690
--- /dev/null
+++ b/components-starter/camel-mongodb-starter/src/test/resources/test.properties
@@ -0,0 +1,11 @@
+testusername=test-user
+testpassword=test-pwd
+
+wrongusername=test-user
+wrongpassword=wrongPassword
+
+adminusername=test-user
+adminpassword=test-pwd
+
+authsourceusername=auth-source-user
+authsourcepassword=auth-source-password
\ No newline at end of file
diff --git a/components-starter/camel-netty-starter/src/test/java/org/apache/camel/component/netty/springboot/NettyComponentConfigurationTest.java b/components-starter/camel-netty-starter/src/test/java/org/apache/camel/component/netty/springboot/NettyComponentConfigurationTest.java
index 8a9c9a139cd..a56b71b5352 100644
--- a/components-starter/camel-netty-starter/src/test/java/org/apache/camel/component/netty/springboot/NettyComponentConfigurationTest.java
+++ b/components-starter/camel-netty-starter/src/test/java/org/apache/camel/component/netty/springboot/NettyComponentConfigurationTest.java
@@ -18,6 +18,9 @@ package org.apache.camel.component.netty.springboot;
import static org.junit.jupiter.api.Assertions.*;
+import java.io.IOException;
+import java.util.Properties;
+
import javax.net.ssl.SSLSession;
import org.apache.camel.CamelContext;
@@ -66,9 +69,16 @@ class NettyComponentConfigurationTest {
@EndpointInject("mock:result")
private MockEndpoint mockResult;
+
+ private static Properties loadAuthProperties() throws IOException {
+ Properties properties = new Properties();
+ properties.load(NettyComponentConfigurationTest.class.getClassLoader().getResourceAsStream("nettycomponentconfigurationtest.properties"));
+ return properties;
+ }
@Test
- void testAutoConfiguration() {
+ void testAutoConfiguration() throws IOException {
+ Properties properties = loadAuthProperties();
NettyComponent component = context.getComponent("netty", NettyComponent.class);
assertNotNull(component);
assertNotNull(component.getConfiguration());
@@ -77,7 +87,7 @@ class NettyComponentConfigurationTest {
assertNotNull(scp);
assertEquals(TLSv13, scp.getSecureSocketProtocol());
KeyManagersParameters kmp = scp.getKeyManagers();
- assertEquals("changeit", kmp.getKeyPassword());
+ assertEquals(properties.getProperty("password"), kmp.getKeyPassword());
}
@Test
@@ -96,16 +106,16 @@ class NettyComponentConfigurationTest {
public static class TestConfiguration {
@Bean(name = "sslContextParameters")
- public SSLContextParameters getSSLContextParameters() {
+ public SSLContextParameters getSSLContextParameters() throws IOException {
+ Properties authProperties = loadAuthProperties();
SSLContextParameters scp = new SSLContextParameters();
scp.setSecureSocketProtocol(TLSv13);
KeyStoreParameters ksp = new KeyStoreParameters();
ksp.setResource(this.getClass().getClassLoader().getResource("keystore.jks").toString());
- ksp.setPassword("changeit");
-
+ ksp.setPassword(authProperties.getProperty("password"));
KeyManagersParameters kmp = new KeyManagersParameters();
kmp.setKeyStore(ksp);
- kmp.setKeyPassword("changeit");
+ kmp.setKeyPassword(authProperties.getProperty("password"));
TrustManagersParameters tmp = new TrustManagersParameters();
tmp.setKeyStore(ksp);
scp.setKeyManagers(kmp);
diff --git a/components-starter/camel-netty-starter/src/test/resources/nettycomponentconfigurationtest.properties b/components-starter/camel-netty-starter/src/test/resources/nettycomponentconfigurationtest.properties
new file mode 100644
index 00000000000..e2db9f632dc
--- /dev/null
+++ b/components-starter/camel-netty-starter/src/test/resources/nettycomponentconfigurationtest.properties
@@ -0,0 +1 @@
+password=changeit
diff --git a/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/RawPayloadTest.java b/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/RawPayloadTest.java
index f19fa69d8af..8b3a1b08a86 100644
--- a/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/RawPayloadTest.java
+++ b/components-starter/camel-salesforce-starter/src/test/java/org/apache/camel/component/salesforce/springboot/RawPayloadTest.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -77,7 +78,6 @@ public class RawPayloadTest extends AbstractSalesforceTestBase {
public static String endpointUri;
- private static final String OAUTH2_TOKEN_PATH = "/services/oauth2/token";
private static final String XML_RESPONSE = "<response/>";
private static final String JSON_RESPONSE = "{ \"response\" : \"mock\" }";
@@ -89,6 +89,12 @@ public class RawPayloadTest extends AbstractSalesforceTestBase {
private static String requestBody;
private static Map<String, Object> headers;
+ private static Properties loadProperties() throws IOException {
+ Properties properties = new Properties();
+ properties.load(RawPayloadTest.class.getClassLoader().getResourceAsStream("rawpayload.properties"));
+ return properties;
+ }
+
@Override
@Bean("salesforce")
protected SalesforceComponent createComponent() throws Exception {
@@ -127,8 +133,15 @@ public class RawPayloadTest extends AbstractSalesforceTestBase {
server.setDispatcher(new Dispatcher() {
@Override
- public MockResponse dispatch(RecordedRequest recordedRequest) {
- if (recordedRequest.getPath().equals(OAUTH2_TOKEN_PATH)) {
+ public MockResponse dispatch(RecordedRequest recordedRequest) {
+
+ Properties props;
+ try {
+ props = loadProperties();
+ } catch (IOException ioe) {
+ throw new IllegalStateException(ioe);
+ }
+ if (recordedRequest.getPath().equals(props.getProperty("tokenpath"))) {
return new MockResponse().setResponseCode(200)
.setBody(String.format("""
{
diff --git a/components-starter/camel-salesforce-starter/src/test/resources/rawpayload.properties b/components-starter/camel-salesforce-starter/src/test/resources/rawpayload.properties
new file mode 100644
index 00000000000..ee90a155dcc
--- /dev/null
+++ b/components-starter/camel-salesforce-starter/src/test/resources/rawpayload.properties
@@ -0,0 +1 @@
+tokenpath=/services/oauth2/token
(camel-spring-boot) 34/40: Upgrade tomcat to 10.1.16 (#306)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 141a5fa8ddf4bc8083c948720663120bef9e13b1
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Tue Dec 5 10:04:13 2023 -0500
Upgrade tomcat to 10.1.16 (#306)
* Upgrade to spring-boot 3.1.6
* Upgrade tomcat to 10.1.16
---
pom.xml | 4 ++--
tooling/redhat-camel-spring-boot-bom/pom.xml | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1afe19abab8..3c18aab22b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<compiler.fork>false</compiler.fork>
<!-- Spring-Boot target version -->
- <spring-boot-version>3.1.5</spring-boot-version>
+ <spring-boot-version>3.1.6</spring-boot-version>
<!-- Camel target version -->
<camel-version>4.0.0.redhat-00025</camel-version>
@@ -140,7 +140,7 @@
<springdoc-version>2.2.0</springdoc-version>
<surefire.version>${maven-surefire-plugin-version}</surefire.version>
<swagger-parser-v3-version>2.1.10</swagger-parser-v3-version>
- <tomcat-version>10.1.15</tomcat-version>
+ <tomcat-version>10.1.16</tomcat-version>
<cyclonedx-maven-plugin-version>2.7.9</cyclonedx-maven-plugin-version>
<!-- Added for productized build - plexus versions used by patch maven plugin -->
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 839af98c608..5dedbdf19c1 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -117,37 +117,37 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-annotations-api</artifactId>
- <version>10.1.15</version>
+ <version>10.1.16</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
- <version>10.1.15</version>
+ <version>10.1.16</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jsp-api</artifactId>
- <version>10.1.15</version>
+ <version>10.1.16</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>10.1.15</version>
+ <version>10.1.16</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
- <version>10.1.15</version>
+ <version>10.1.16</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
- <version>10.1.15</version>
+ <version>10.1.16</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
- <version>10.1.15</version>
+ <version>10.1.16</version>
</dependency>
<!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter -->
<dependency>
@@ -229,7 +229,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>3.1.5</version>
+ <version>3.1.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
(camel-spring-boot) 33/40: Add repository/pluginRepository entries to archetype (#304)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit be03f72ee6d9786b55b2bc36cf20335dd8be8945
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Mon Dec 4 10:18:32 2023 -0500
Add repository/pluginRepository entries to archetype (#304)
---
.../src/main/resources/archetype-resources/pom.xml | 28 ++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
index 8f82c5eaf97..6ecd7f5e8a4 100644
--- a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
@@ -95,6 +95,34 @@
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>redhat-ga</id>
+ <url>https://maven.repository.redhat.com/ga/</url>
+ <name>Red Hat GA repository</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>redhat-ga</id>
+ <url>https://maven.repository.redhat.com/ga/</url>
+ <name>Red Hat GA repository</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+
+
<build>
<plugins>
<plugin>
(camel-spring-boot) 12/40: Fix archetype pom
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 0aa5bf5a233ce8ab4075a89a739c5bcad33c2671
Author: Marco Carletti <mc...@redhat.com>
AuthorDate: Mon Sep 25 15:51:08 2023 +0200
Fix archetype pom
---
.../src/main/resources/archetype-resources/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
index a76de9c8dc9..8f82c5eaf97 100644
--- a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
- <maven.compiler.release>17</maven.compiler.target>
+ <maven.compiler.release>17</maven.compiler.release>
<spring.boot-version>${spring-boot-version}</spring.boot-version>
<surefire.plugin.version>3.0.0-M4</surefire.plugin.version>
<jkube.generator.from>registry.access.redhat.com/ubi8/openjdk-17:latest</jkube.generator.from>
(camel-spring-boot) 26/40: Externalize passwords into properties files, set features to DocumentBuilderFactory (#986)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 1ac17b0257bcfd04b00e12d2b507dcf9ea869c79
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Wed Oct 25 05:18:36 2023 -0400
Externalize passwords into properties files, set features to DocumentBuilderFactory (#986)
---
.../remote/springboot/ftp/FtpEmbeddedService.java | 24 ++++++++++++++-----
.../src/test/resources/users.properties | 5 ++++
.../springboot/test/AddCommentProducerTest.java | 8 +++----
.../springboot/test/AddIssueLinkProducerTest.java | 6 ++---
.../jira/springboot/test/AddIssueProducerTest.java | 6 ++---
.../springboot/test/AddWorkLogProducerTest.java | 3 +--
.../springboot/test/AttachFileProducerTest.java | 5 ++--
.../springboot/test/DeleteIssueProducerTest.java | 3 +--
.../springboot/test/FetchCommentsProducerTest.java | 6 ++---
.../springboot/test/FetchIssueProducerTest.java | 3 +--
.../jira/springboot/test/JiraTestConstants.java | 27 +++++++++++++++-------
.../springboot/test/NewCommentsConsumerTest.java | 6 ++---
.../springboot/test/NewIssuesConsumerTest.java | 6 ++---
.../test/TransitionIssueProducerTest.java | 3 +--
.../springboot/test/UpdateIssueProducerTest.java | 6 ++---
.../springboot/test/WatchUpdatesConsumerTest.java | 6 ++---
.../jira/springboot/test/WatcherProducerTest.java | 6 ++---
.../src/test/resources/jiraauth.properties | 3 +++
.../springboot/maven/SpringBootStarterMojo.java | 7 +++++-
19 files changed, 84 insertions(+), 55 deletions(-)
diff --git a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpEmbeddedService.java b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpEmbeddedService.java
index 3c76c9331fe..d4650956556 100644
--- a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpEmbeddedService.java
+++ b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpEmbeddedService.java
@@ -38,10 +38,12 @@ import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import java.util.function.BiConsumer;
@@ -94,6 +96,12 @@ public class FtpEmbeddedService extends AbstractTestService implements FtpServic
}
}
+ private static Properties loadAuthProperties() throws IOException {
+ Properties properties = new Properties();
+ properties.load(FtpEmbeddedService.class.getClassLoader().getResourceAsStream("users.properties"));
+ return properties;
+ }
+
protected FtpServerFactory createFtpServerFactory() {
NativeFileSystemFactory fsf = new NativeFileSystemFactory();
fsf.setCreateHome(true);
@@ -103,13 +111,17 @@ public class FtpEmbeddedService extends AbstractTestService implements FtpServic
pumf.setPasswordEncryptor(new ClearTextPasswordEncryptor());
pumf.setFile(null);
UserManager userMgr = pumf.createUserManager();
- createUser(userMgr, "admin", "admin", rootDir, true);
- createUser(userMgr, "scott", "tiger", rootDir, true);
- createUser(userMgr, "dummy", "foo", rootDir, false);
- createUser(userMgr, "us@r", "t%st", rootDir, true);
+ Properties users;
+ try {
+ users = loadAuthProperties();
+ } catch (IOException ioe) {
+ throw new IllegalStateException(ioe);
+ }
+ for (String username : users.stringPropertyNames()) {
+ createUser(userMgr, username, users.getProperty(username), rootDir, true);
+ }
createUser(userMgr, "anonymous", null, rootDir, false);
- createUser(userMgr, "joe", "p+%w0&r)d", rootDir, true);
- createUser(userMgr, "jane", "%j#7%c6i", rootDir, true);
+ createUser(userMgr, "dummy", "foo", rootDir, false);
ListenerFactory factory = new ListenerFactory();
factory.setPort(port);
diff --git a/components-starter/camel-ftp-starter/src/test/resources/users.properties b/components-starter/camel-ftp-starter/src/test/resources/users.properties
new file mode 100644
index 00000000000..022bcefedbc
--- /dev/null
+++ b/components-starter/camel-ftp-starter/src/test/resources/users.properties
@@ -0,0 +1,5 @@
+admin=admin
+scott=tiger
+us@r=t%st
+joe=p+%w0&r)d
+jane=%j#7%c6i
\ No newline at end of file
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java
index 80b8dd8ddad..5de7a9cd2de 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.jira.springboot.test;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssueWithComments;
import static org.apache.camel.component.jira.springboot.test.Utils.newComment;
import static org.mockito.ArgumentMatchers.any;
@@ -27,6 +26,7 @@ import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -151,16 +151,14 @@ public class AddCommentProducerTest {
@Configuration
public class TestConfiguration {
-
-
@Bean
public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
- public void configure() {
+ public void configure() throws IOException {
comment = "A new test comment " + new Date();
from("direct:start")
- .to("jira://addComment?jiraUrl=" + JIRA_CREDENTIALS)
+ .to("jira://addComment?jiraUrl=" + JiraTestConstants.getJiraCredentials())
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueLinkProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueLinkProducerTest.java
index 4a6d4576454..1ff95a27cd4 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueLinkProducerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueLinkProducerTest.java
@@ -21,7 +21,6 @@ import static org.apache.camel.component.jira.JiraConstants.CHILD_ISSUE_KEY;
import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
import static org.apache.camel.component.jira.JiraConstants.LINK_TYPE;
import static org.apache.camel.component.jira.JiraConstants.PARENT_ISSUE_KEY;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssue;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssueWithLinks;
import static org.apache.camel.component.jira.springboot.test.Utils.newIssueLink;
@@ -32,6 +31,7 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -254,9 +254,9 @@ public class AddIssueLinkProducerTest {
public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
- public void configure() {
+ public void configure() throws IOException {
from("direct:start")
- .to("jira://addIssueLink?jiraUrl=" + JIRA_CREDENTIALS)
+ .to("jira://addIssueLink?jiraUrl=" + JiraTestConstants.getJiraCredentials())
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueProducerTest.java
index b7449d3f214..7ab35b07b1a 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueProducerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueProducerTest.java
@@ -25,7 +25,6 @@ import static org.apache.camel.component.jira.JiraConstants.ISSUE_SUMMARY;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_TYPE_ID;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_TYPE_NAME;
import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.KEY;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssue;
import static org.apache.camel.component.jira.springboot.test.Utils.userAssignee;
@@ -33,6 +32,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
+import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -222,9 +222,9 @@ public class AddIssueProducerTest {
public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
- public void configure() {
+ public void configure() throws IOException {
from("direct:start")
- .to("jira://addIssue?jiraUrl=" + JIRA_CREDENTIALS)
+ .to("jira://addIssue?jiraUrl=" + JiraTestConstants.getJiraCredentials())
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddWorkLogProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddWorkLogProducerTest.java
index 1191736bc83..54d8cae99d0 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddWorkLogProducerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddWorkLogProducerTest.java
@@ -23,7 +23,6 @@ import static org.apache.camel.component.jira.JiraConstants.MINUTES_SPENT;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssueWithComments;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssueWithWorkLogs;
import static org.apache.camel.component.jira.springboot.test.Utils.newWorkLog;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.lenient;
@@ -236,7 +235,7 @@ public class AddWorkLogProducerTest {
@Override
public void configure() throws Exception {
from("direct:start")
- .to("jira://addWorkLog?jiraUrl=" + JIRA_CREDENTIALS)
+ .to("jira://addWorkLog?jiraUrl=" + JiraTestConstants.getJiraCredentials())
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AttachFileProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AttachFileProducerTest.java
index 7b15884fe87..2d0e6682b7b 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AttachFileProducerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AttachFileProducerTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.jira.springboot.test;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.KEY;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssue;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssueWithAttachment;
@@ -178,10 +177,10 @@ public class AttachFileProducerTest {
public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
- public void configure() {
+ public void configure() throws IOException {
from("direct:start")
.setHeader(ISSUE_KEY, () -> KEY + "-1")
- .to("jira://attach?jiraUrl=" + JIRA_CREDENTIALS)
+ .to("jira://attach?jiraUrl=" + JiraTestConstants.getJiraCredentials())
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/DeleteIssueProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/DeleteIssueProducerTest.java
index d4c5a6df376..83a99f9227d 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/DeleteIssueProducerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/DeleteIssueProducerTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.jira.springboot.test;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.KEY;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssue;
import static org.mockito.ArgumentMatchers.any;
@@ -148,7 +147,7 @@ public class DeleteIssueProducerTest {
public void configure() throws IOException {
from("direct:start")
.setHeader(ISSUE_KEY, () -> KEY + "-1")
- .to("jira://deleteIssue?jiraUrl=" + JIRA_CREDENTIALS)
+ .to("jira://deleteIssue?jiraUrl=" + JiraTestConstants.getJiraCredentials())
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchCommentsProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchCommentsProducerTest.java
index 8fa90852527..d5514616ccb 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchCommentsProducerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchCommentsProducerTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.jira.springboot.test;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
@@ -27,6 +26,7 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.io.IOException;
import com.atlassian.jira.rest.client.api.IssueRestClient;
import com.atlassian.jira.rest.client.api.JiraRestClient;
@@ -160,9 +160,9 @@ public class FetchCommentsProducerTest {
public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
- public void configure() {
+ public void configure() throws IOException {
from("direct:start")
- .to("jira://fetchComments?jiraUrl=" + JIRA_CREDENTIALS)
+ .to("jira://fetchComments?jiraUrl=" + JiraTestConstants.getJiraCredentials())
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchIssueProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchIssueProducerTest.java
index 7e717712bc3..8e241c1da77 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchIssueProducerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/FetchIssueProducerTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.jira.springboot.test;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
@@ -159,7 +158,7 @@ public class FetchIssueProducerTest {
@Override
public void configure() throws Exception {
from("direct:start")
- .to("jira://fetchIssue?jiraUrl=" + JIRA_CREDENTIALS)
+ .to("jira://fetchIssue?jiraUrl=" + JiraTestConstants.getJiraCredentials())
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/JiraTestConstants.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/JiraTestConstants.java
index a21e135d381..c554d9f529e 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/JiraTestConstants.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/JiraTestConstants.java
@@ -16,13 +16,24 @@
*/
package org.apache.camel.component.jira.springboot.test;
-public interface JiraTestConstants {
+import java.io.IOException;
+import java.util.Properties;
- String KEY = "TST";
- String TEST_JIRA_URL = "https://somerepo.atlassian.net";
- String PROJECT = "TST";
- String USERNAME = "someguy";
- String PASSWORD = "my_password";
- String JIRA_CREDENTIALS = TEST_JIRA_URL + "&username=" + USERNAME + "&password=" + PASSWORD;
- String WATCHED_COMPONENTS = "Priority,Status,Resolution";
+public class JiraTestConstants {
+
+ static String KEY = "TST";
+ static String TEST_JIRA_URL = "https://somerepo.atlassian.net";
+ static String PROJECT = "TST";
+ static String WATCHED_COMPONENTS = "Priority,Status,Resolution";
+
+ private static Properties loadAuthProperties() throws IOException {
+ Properties properties = new Properties();
+ properties.load(JiraTestConstants.class.getClassLoader().getResourceAsStream("jiraauth.properties"));
+ return properties;
+ }
+
+ public static String getJiraCredentials() throws IOException {
+ Properties props = loadAuthProperties();
+ return TEST_JIRA_URL + "&username=" + props.getProperty("username") + "&password=" + props.getProperty("password");
+ }
}
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewCommentsConsumerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewCommentsConsumerTest.java
index a814c2fdb41..f85c160f384 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewCommentsConsumerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewCommentsConsumerTest.java
@@ -20,7 +20,6 @@ package org.apache.camel.component.jira.springboot.test;
import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssueWithComments;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.PROJECT;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssue;
import static org.mockito.ArgumentMatchers.any;
@@ -29,6 +28,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.when;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -220,8 +220,8 @@ public class NewCommentsConsumerTest {
public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
- public void configure() {
- from("jira://newComments?jiraUrl=" + JIRA_CREDENTIALS + "&jql=project=" + PROJECT + "&delay=1000")
+ public void configure() throws IOException {
+ from("jira://newComments?jiraUrl=" + JiraTestConstants.getJiraCredentials() + "&jql=project=" + PROJECT + "&delay=1000")
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewIssuesConsumerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewIssuesConsumerTest.java
index 5dd6cbd309c..5c74804a149 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewIssuesConsumerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewIssuesConsumerTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.jira.springboot.test;
import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.PROJECT;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssue;
import static org.mockito.ArgumentMatchers.any;
@@ -26,6 +25,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.when;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -189,8 +189,8 @@ public class NewIssuesConsumerTest {
public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
- public void configure() {
- from("jira://newIssues?jiraUrl=" + JIRA_CREDENTIALS + "&jql=project=" + PROJECT + "&delay=5000")
+ public void configure() throws IOException {
+ from("jira://newIssues?jiraUrl=" + JiraTestConstants.getJiraCredentials() + "&jql=project=" + PROJECT + "&delay=5000")
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/TransitionIssueProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/TransitionIssueProducerTest.java
index 71e092ea91b..4b51ec79531 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/TransitionIssueProducerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/TransitionIssueProducerTest.java
@@ -23,7 +23,6 @@ import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FAC
import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.TEST_JIRA_URL;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssue;
import static org.apache.camel.component.jira.springboot.test.Utils.transitionIssueDone;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.KEY;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.lenient;
@@ -158,7 +157,7 @@ public class TransitionIssueProducerTest {
from("direct:start")
.setHeader(ISSUE_KEY, () -> KEY + "-1")
.setHeader(ISSUE_TRANSITION_ID, () -> 31)
- .to("jira://transitionIssue?jiraUrl=" + JIRA_CREDENTIALS)
+ .to("jira://transitionIssue?jiraUrl=" + JiraTestConstants.getJiraCredentials())
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/UpdateIssueProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/UpdateIssueProducerTest.java
index ae736ff7212..0069d21151c 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/UpdateIssueProducerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/UpdateIssueProducerTest.java
@@ -23,7 +23,6 @@ import static org.apache.camel.component.jira.JiraConstants.ISSUE_PRIORITY_NAME;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_SUMMARY;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_TYPE_NAME;
import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssue;
import static org.apache.camel.component.jira.springboot.test.Utils.userAssignee;
@@ -32,6 +31,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -199,9 +199,9 @@ public class UpdateIssueProducerTest {
public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
- public void configure() {
+ public void configure() throws IOException {
from("direct:start")
- .to("jira://updateIssue?jiraUrl=" + JIRA_CREDENTIALS)
+ .to("jira://updateIssue?jiraUrl=" + JiraTestConstants.getJiraCredentials())
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatchUpdatesConsumerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatchUpdatesConsumerTest.java
index cdb6a7045c0..b55b1ab0573 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatchUpdatesConsumerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatchUpdatesConsumerTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.jira.springboot.test;
import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.PROJECT;
import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.WATCHED_COMPONENTS;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssue;
@@ -29,6 +28,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.when;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -203,8 +203,8 @@ public class WatchUpdatesConsumerTest {
public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
- public void configure() {
- from("jira://watchUpdates?jiraUrl=" + JIRA_CREDENTIALS
+ public void configure() throws IOException {
+ from("jira://watchUpdates?jiraUrl=" + JiraTestConstants.getJiraCredentials()
+ "&jql=project=" + PROJECT + "&delay=5000&watchedFields=" + WATCHED_COMPONENTS)
.to(mockResult);
}
diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatcherProducerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatcherProducerTest.java
index 5fe8fc45c78..a599a90cb82 100644
--- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatcherProducerTest.java
+++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatcherProducerTest.java
@@ -21,7 +21,6 @@ import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_WATCHERS_ADD;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_WATCHERS_REMOVE;
import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
-import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.KEY;
import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.TEST_JIRA_URL;
import static org.apache.camel.component.jira.springboot.test.Utils.createIssue;
@@ -30,6 +29,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
+import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
@@ -247,9 +247,9 @@ public class WatcherProducerTest {
public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
- public void configure() {
+ public void configure() throws IOException {
from("direct:start")
- .to("jira://watchers?jiraUrl=" + JIRA_CREDENTIALS)
+ .to("jira://watchers?jiraUrl=" + JiraTestConstants.getJiraCredentials())
.to(mockResult);
}
};
diff --git a/components-starter/camel-jira-starter/src/test/resources/jiraauth.properties b/components-starter/camel-jira-starter/src/test/resources/jiraauth.properties
new file mode 100644
index 00000000000..5222ad7edd6
--- /dev/null
+++ b/components-starter/camel-jira-starter/src/test/resources/jiraauth.properties
@@ -0,0 +1,3 @@
+username=someguy
+password=my_password
+
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java
index 257b6418645..5ab61e3a534 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java
@@ -327,7 +327,12 @@ public class SpringBootStarterMojo extends AbstractSpringBootGenerator {
boolean editablePom = content.contains(GENERATED_SECTION_START_COMMENT);
if (editablePom) {
content = removeGeneratedSections(content, 10);
- DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl",true);
+ documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities",false);
+ documentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities",false);
+
+ DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
Document pom;
try (InputStream contentIn = new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8))) {
(camel-spring-boot) 13/40: Disables failing tests
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 9188e68c57cd9ab7f9b7d0841fff33e3d46b7776
Author: Marco Carletti <mc...@redhat.com>
AuthorDate: Tue Sep 26 15:23:31 2023 +0200
Disables failing tests
---
.../java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java | 2 ++
.../org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java
index 94b3fdc3d81..e67a9793819 100644
--- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java
+++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java
@@ -33,6 +33,7 @@ import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
@@ -62,6 +63,7 @@ import static org.awaitility.Awaitility.await;
Ddb2StreamTest.TestConfiguration.class
}
)
+@Disabled
class Ddb2StreamTest extends BaseDdb2{
private final static String tableName = "TestTable";
diff --git a/components-starter/camel-aws2-kinesis-starter/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java b/components-starter/camel-aws2-kinesis-starter/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java
index b7ed80465ca..55f1784d0a2 100644
--- a/components-starter/camel-aws2-kinesis-starter/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java
+++ b/components-starter/camel-aws2-kinesis-starter/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java
@@ -27,6 +27,7 @@ import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
@@ -45,6 +46,7 @@ import software.amazon.awssdk.services.kinesis.model.CreateStreamRequest;
KinesisComponentTest.TestConfiguration.class
}
)
+@Disabled("API rate limit exceeded")
public class KinesisComponentTest extends BaseKinesis {
@EndpointInject("mock:result")
(camel-spring-boot) 08/40: CAMEL-19854: camel-kafka - Disable the test KafkaConsumerHealthCheckIT (#945)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit ced53451b695e240f76952954fb65bcc6d257717
Author: Nicolas Filotto <es...@users.noreply.github.com>
AuthorDate: Thu Sep 14 17:48:37 2023 +0200
CAMEL-19854: camel-kafka - Disable the test KafkaConsumerHealthCheckIT (#945)
## Motivation
The test KafkaConsumerHealthCheckIT always fails on the CI.
## Modifications:
* Disable the test as long as it is not fixed
---
.../camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
index 23fc81cc5ff..254e2c574db 100644
--- a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
+++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
@@ -41,6 +41,7 @@ import org.apache.kafka.common.header.internals.RecordHeader;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -68,6 +69,7 @@ import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
KafkaConsumerHealthCheckIT.TestConfiguration.class,
}
)
+@Disabled("https://issues.apache.org/jira/browse/CAMEL-19854")
public class KafkaConsumerHealthCheckIT extends BaseEmbeddedKafkaTestSupport {
public static final String TOPIC = "test-health";
(camel-spring-boot) 29/40: Add a check for path traversal for SAST tests (#990)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 3c4771821a3a1a82ff8d31f9b9b46349fb5651a5
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Fri Oct 27 07:55:44 2023 -0400
Add a check for path traversal for SAST tests (#990)
---
.../dataformat/zipfile/springboot/ZipFileDataFormatTest.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
index 1e5ddaa0902..63236668b79 100644
--- a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
+++ b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
@@ -368,7 +368,17 @@ public class ZipFileDataFormatTest {
public void process(Exchange exchange) throws Exception {
ZipFile zfile = new ZipFile(new File("src/test/resources/hello.odt"));
ZipEntry entry = new ZipEntry((String) exchange.getIn().getHeader(Exchange.FILE_NAME));
- File file = new File("hello_out", entry.getName());
+ String outputDirectory = "hello_out";
+ File file = new File(outputDirectory, entry.getName());
+
+ // Check for Path Traversal
+ File destDirectory = new File(outputDirectory);
+ String destCanonicalPath = destDirectory.getCanonicalPath();
+ String outputCanonicalPath = file.getCanonicalPath();
+ if (!outputCanonicalPath.startsWith(destCanonicalPath)) {
+ throw new Exception("Zip path traversal found, expected " + destCanonicalPath + " but found " + outputCanonicalPath);
+ }
+
if (entry.isDirectory()) {
file.mkdirs();
} else {
(camel-spring-boot) 02/40: Added omp dependency for PME alignment.
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit e997a5ea288dc2134da7ee12c735f7e80fda3099
Author: Vaishnavi R <va...@var.remote.csb>
AuthorDate: Wed Sep 20 16:22:21 2023 +0530
Added omp dependency for PME alignment.
---
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pom.xml b/pom.xml
index 72c21958df7..b38867445ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,6 +162,13 @@
<artifactId>camel-sap</artifactId>
<version>${camel-sap.version}</version>
</dependency>
+ <!-- org.eclipse.jkube:openshift-maven-plugin dependencyManagement entry
+ is necessary for PME align to the correct openshift-maven-plugin-version -->
+ <dependency>
+ <groupId>org.eclipse.jkube</groupId>
+ <artifactId>openshift-maven-plugin</artifactId>
+ <version>${openshift-maven-plugin-version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
(camel-spring-boot) 23/40: Override tomcat version coming in from sb to 10.1.14 (#284)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 2faa5c55306a0f659ddcc4c5e1025f7d78c4f92b
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Tue Oct 17 11:17:29 2023 -0400
Override tomcat version coming in from sb to 10.1.14 (#284)
---
.../camel/springboot/catalog/components/kafka.json | 8 +-
.../camel-kafka-starter/src/main/docs/kafka.json | 4 +-
.../springboot/KafkaComponentConfiguration.java | 4 +-
pom.xml | 9 +-
tooling/camel-spring-boot-bom/pom.xml | 6 +-
tooling/camel-spring-boot-dependencies/pom.xml | 408 ++++++++++-----------
.../src/main/resources/pom.xml | 36 ++
tooling/redhat-camel-spring-boot-bom/pom.xml | 56 ++-
8 files changed, 302 insertions(+), 229 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
index 9d52ce4ea29..45db718f30b 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
@@ -37,7 +37,7 @@
"bridgeErrorHandler": { "index": 12, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be proc [...]
"checkCrcs": { "index": 13, "kind": "property", "displayName": "Check Crcs", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Automatically check the CRC32 of the records consumed. This ensures no on-the-wire o [...]
"commitTimeoutMs": { "index": 14, "kind": "property", "displayName": "Commit Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The maximum time, in milliseconds, that the code will wait for a synchron [...]
- "consumerRequestTimeoutMs": { "index": 15, "kind": "property", "displayName": "Consumer Request Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "40000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The configuration controls the maximum amount of ti [...]
+ "consumerRequestTimeoutMs": { "index": 15, "kind": "property", "displayName": "Consumer Request Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The configuration controls the maximum amount of ti [...]
"consumersCount": { "index": 16, "kind": "property", "displayName": "Consumers Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The number of consumers that connect to kafka server. Each consumer is run on a separate thre [...]
"fetchMaxBytes": { "index": 17, "kind": "property", "displayName": "Fetch Max Bytes", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "52428800", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The maximum amount of data the server should return for a fetch request [...]
"fetchMinBytes": { "index": 18, "kind": "property", "displayName": "Fetch Min Bytes", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The minimum amount of data the server should return for a fetch request. If in [...]
@@ -55,7 +55,7 @@
"pollOnError": { "index": 30, "kind": "property", "displayName": "Poll On Error", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.kafka.PollOnError", "enum": [ "DISCARD", "ERROR_HANDLER", "RECONNECT", "RETRY", "STOP" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "ERROR_HANDLER", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "config [...]
"pollTimeoutMs": { "index": 31, "kind": "property", "displayName": "Poll Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The timeout used when polling the KafkaConsumer." },
"seekTo": { "index": 32, "kind": "property", "displayName": "Seek To", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.kafka.SeekPolicy", "enum": [ "BEGINNING", "END" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Set if KafkaConsumer will read from the beginning or the [...]
- "sessionTimeoutMs": { "index": 33, "kind": "property", "displayName": "Session Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "10000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The timeout used to detect failures when using Kafka's group managem [...]
+ "sessionTimeoutMs": { "index": 33, "kind": "property", "displayName": "Session Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "45000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The timeout used to detect failures when using Kafka's group managem [...]
"specificAvroReader": { "index": 34, "kind": "property", "displayName": "Specific Avro Reader", "group": "consumer", "label": "confluent,consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "This enables the use of a specific Avro reader for use with the Co [...]
"topicIsPattern": { "index": 35, "kind": "property", "displayName": "Topic Is Pattern", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Whether the topic is a pattern (regular expression). This can be used to subscribe t [...]
"valueDeserializer": { "index": 36, "kind": "property", "displayName": "Value Deserializer", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "org.apache.kafka.common.serialization.StringDeserializer", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Deserializer class [...]
@@ -165,7 +165,7 @@
"breakOnFirstError": { "index": 11, "kind": "parameter", "displayName": "Break On First Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "This options controls what happens when a consumer is processing an exchange [...]
"checkCrcs": { "index": 12, "kind": "parameter", "displayName": "Check Crcs", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Automatically check the CRC32 of the records consumed. This ensures no on-the-wire [...]
"commitTimeoutMs": { "index": 13, "kind": "parameter", "displayName": "Commit Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The maximum time, in milliseconds, that the code will wait for a synchro [...]
- "consumerRequestTimeoutMs": { "index": 14, "kind": "parameter", "displayName": "Consumer Request Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "40000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The configuration controls the maximum amount of t [...]
+ "consumerRequestTimeoutMs": { "index": 14, "kind": "parameter", "displayName": "Consumer Request Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The configuration controls the maximum amount of t [...]
"consumersCount": { "index": 15, "kind": "parameter", "displayName": "Consumers Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The number of consumers that connect to kafka server. Each consumer is run on a separate thr [...]
"fetchMaxBytes": { "index": 16, "kind": "parameter", "displayName": "Fetch Max Bytes", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "52428800", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The maximum amount of data the server should return for a fetch reques [...]
"fetchMinBytes": { "index": 17, "kind": "parameter", "displayName": "Fetch Min Bytes", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The minimum amount of data the server should return for a fetch request. If i [...]
@@ -183,7 +183,7 @@
"pollOnError": { "index": 29, "kind": "parameter", "displayName": "Poll On Error", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.kafka.PollOnError", "enum": [ "DISCARD", "ERROR_HANDLER", "RECONNECT", "RETRY", "STOP" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "ERROR_HANDLER", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "confi [...]
"pollTimeoutMs": { "index": 30, "kind": "parameter", "displayName": "Poll Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The timeout used when polling the KafkaConsumer." },
"seekTo": { "index": 31, "kind": "parameter", "displayName": "Seek To", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.kafka.SeekPolicy", "enum": [ "BEGINNING", "END" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Set if KafkaConsumer will read from the beginning or the [...]
- "sessionTimeoutMs": { "index": 32, "kind": "parameter", "displayName": "Session Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "10000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The timeout used to detect failures when using Kafka's group manage [...]
+ "sessionTimeoutMs": { "index": 32, "kind": "parameter", "displayName": "Session Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "45000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The timeout used to detect failures when using Kafka's group manage [...]
"specificAvroReader": { "index": 33, "kind": "parameter", "displayName": "Specific Avro Reader", "group": "consumer", "label": "confluent,consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "This enables the use of a specific Avro reader for use with the C [...]
"topicIsPattern": { "index": 34, "kind": "parameter", "displayName": "Topic Is Pattern", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Whether the topic is a pattern (regular expression). This can be used to subscribe [...]
"valueDeserializer": { "index": 35, "kind": "parameter", "displayName": "Value Deserializer", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "org.apache.kafka.common.serialization.StringDeserializer", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Deserializer clas [...]
diff --git a/components-starter/camel-kafka-starter/src/main/docs/kafka.json b/components-starter/camel-kafka-starter/src/main/docs/kafka.json
index 594fe7887ce..bd855acebb7 100644
--- a/components-starter/camel-kafka-starter/src/main/docs/kafka.json
+++ b/components-starter/camel-kafka-starter/src/main/docs/kafka.json
@@ -133,7 +133,7 @@
"type": "java.lang.Integer",
"description": "The configuration controls the maximum amount of time the client will wait for the response of a request. If the response is not received before the timeout elapses the client will resend the request if necessary or fail the request if retries are exhausted.",
"sourceType": "org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration",
- "defaultValue": 40000
+ "defaultValue": 30000
},
{
"name": "camel.component.kafka.consumers-count",
@@ -588,7 +588,7 @@
"type": "java.lang.Integer",
"description": "The timeout used to detect failures when using Kafka's group management facilities.",
"sourceType": "org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration",
- "defaultValue": 10000
+ "defaultValue": 45000
},
{
"name": "camel.component.kafka.shutdown-timeout",
diff --git a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
index b98b0c80ee2..21e0c873a50 100644
--- a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
+++ b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
@@ -155,7 +155,7 @@ public class KafkaComponentConfiguration
* before the timeout elapses the client will resend the request if
* necessary or fail the request if retries are exhausted.
*/
- private Integer consumerRequestTimeoutMs = 40000;
+ private Integer consumerRequestTimeoutMs = 30000;
/**
* The number of consumers that connect to kafka server. Each consumer is
* run on a separate thread, that retrieves and process the incoming data.
@@ -286,7 +286,7 @@ public class KafkaComponentConfiguration
* The timeout used to detect failures when using Kafka's group management
* facilities.
*/
- private Integer sessionTimeoutMs = 10000;
+ private Integer sessionTimeoutMs = 45000;
/**
* This enables the use of a specific Avro reader for use with the Confluent
* Platform schema registry and the
diff --git a/pom.xml b/pom.xml
index 246fecfa397..55b1dee7a01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>4.0.0</version>
+ <version>4.0.0.redhat-00025</version>
</parent>
<groupId>org.apache.camel.springboot</groupId>
@@ -112,16 +112,16 @@
<spring-boot-version>3.1.4</spring-boot-version>
<!-- Camel target version -->
- <camel-version>4.0.0.redhat-00010</camel-version>
+ <camel-version>4.0.0.redhat-00025</camel-version>
<!-- cq plugin version -->
<cq-plugin.version>4.4.2</cq-plugin.version>
<camel-community.version>4.0.0</camel-community.version>
<camel-spring-boot-community.version>4.0.0</camel-spring-boot-community.version>
- <camel-sap.version>4.0.0.redhat-00044</camel-sap.version>
+ <camel-sap.version>4.0.0.redhat-00059</camel-sap.version>
<!-- narayana spring boot version -->
- <narayana-spring-boot.version>3.0.0.redhat-00017</narayana-spring-boot.version>
+ <narayana-spring-boot.version>3.0.0.redhat-00060</narayana-spring-boot.version>
<!-- versions -->
<aether-version>1.0.2.v20150114</aether-version>
@@ -140,6 +140,7 @@
<springdoc-version>2.2.0</springdoc-version>
<surefire.version>${maven-surefire-plugin-version}</surefire.version>
<swagger-parser-v3-version>2.1.10</swagger-parser-v3-version>
+ <tomcat-version>10.1.14</tomcat-version>
<cyclonedx-maven-plugin-version>2.7.9</cyclonedx-maven-plugin-version>
<!-- Added for productized build - plexus versions used by patch maven plugin -->
diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml
index 3ea97d7038b..c641a60f296 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -36,17 +36,17 @@
<dependency>
<groupId>me.snowdrop</groupId>
<artifactId>narayana-spring-boot-core</artifactId>
- <version>3.0.0.redhat-00017</version>
+ <version>3.0.0.redhat-00060</version>
</dependency>
<dependency>
<groupId>me.snowdrop</groupId>
<artifactId>narayana-spring-boot-recovery-controller</artifactId>
- <version>3.0.0.redhat-00017</version>
+ <version>3.0.0.redhat-00060</version>
</dependency>
<dependency>
<groupId>me.snowdrop</groupId>
<artifactId>narayana-spring-boot-starter</artifactId>
- <version>3.0.0.redhat-00017</version>
+ <version>3.0.0.redhat-00060</version>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 1ca233cd608..32e30d69fe0 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -200,52 +200,52 @@
<dependency>
<groupId>me.snowdrop</groupId>
<artifactId>narayana-spring-boot-core</artifactId>
- <version>3.0.0.redhat-00017</version>
+ <version>3.0.0.redhat-00060</version>
</dependency>
<dependency>
<groupId>me.snowdrop</groupId>
<artifactId>narayana-spring-boot-recovery-controller</artifactId>
- <version>3.0.0.redhat-00017</version>
+ <version>3.0.0.redhat-00060</version>
</dependency>
<dependency>
<groupId>me.snowdrop</groupId>
<artifactId>narayana-spring-boot-starter</artifactId>
- <version>3.0.0.redhat-00017</version>
+ <version>3.0.0.redhat-00060</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.11.0</version>
+ <version>1.11.3</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc</artifactId>
- <version>1.11.0</version>
+ <version>1.11.3</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-mapred</artifactId>
- <version>1.11.0</version>
+ <version>1.11.3</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-protobuf</artifactId>
- <version>1.11.0</version>
+ <version>1.11.3</version>
</dependency>
<dependency>
<groupId>org.apache.camel.maven</groupId>
<artifactId>camel-debezium-maven-plugin</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel.maven</groupId>
<artifactId>camel-salesforce-maven-plugin</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel.maven</groupId>
<artifactId>camel-servicenow-maven-plugin</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
@@ -1935,7 +1935,7 @@
<dependency>
<groupId>org.apache.camel.tests</groupId>
<artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -1945,18 +1945,18 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-allcomponents</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-amqp</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-api</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -1996,12 +1996,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-attachments</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-avro</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2041,12 +2041,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-cw</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-ddb</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2076,7 +2076,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-kinesis</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2086,7 +2086,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-lambda</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2101,7 +2101,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-s3</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2111,12 +2111,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-sns</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-sqs</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2141,7 +2141,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-azure-eventhubs</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2156,12 +2156,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-azure-servicebus</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-azure-storage-blob</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2171,7 +2171,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-azure-storage-queue</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2181,12 +2181,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-base</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-base-engine</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2196,17 +2196,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bean</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bean-validator</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bindy</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2231,7 +2231,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-browse</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2241,22 +2241,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cassandraql</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog-console</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog-lucene</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2286,22 +2286,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cli-connector</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cloud</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cloudevents</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cluster</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2321,12 +2321,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-componentdsl</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-console</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2336,12 +2336,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-controlbus</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2352,37 +2352,37 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-catalog</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-languages</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-model</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-processor</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-reifier</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-xml</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2397,12 +2397,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cron</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-crypto</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2422,52 +2422,52 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-common</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-rest</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-soap</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-spring-common</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-spring-rest</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-spring-soap</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-spring-transport</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-transport</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dataformat</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dataset</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2532,7 +2532,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-direct</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2567,12 +2567,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dsl-modeline</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dsl-support</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2587,7 +2587,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-elasticsearch</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2597,12 +2597,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-endpointdsl</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-endpointdsl-support</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2627,17 +2627,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-fhir</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-fhir-api</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-file</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2667,7 +2667,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-ftp</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2687,7 +2687,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-google-bigquery</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2712,7 +2712,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-google-pubsub</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2762,12 +2762,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-grpc</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-gson</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2797,27 +2797,27 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-health</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-hl7</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http-base</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http-common</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2877,17 +2877,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-infinispan</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-infinispan-common</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-infinispan-embedded</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2912,22 +2912,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jackson</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jackson-avro</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jackson-protobuf</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jacksonxml</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2937,7 +2937,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-java-joor-dsl</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2947,7 +2947,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jaxb</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2977,7 +2977,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jdbc</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -2992,7 +2992,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jfr</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3007,12 +3007,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jira</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3037,7 +3037,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jpa</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3062,7 +3062,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jslt</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3092,7 +3092,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jsonpath</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3102,42 +3102,42 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jta</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-kafka</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-kamelet</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-kamelet-main</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-knative</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-knative-api</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-knative-http</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-kubernetes</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3147,12 +3147,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-language</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-ldap</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3167,7 +3167,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-log</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3192,37 +3192,37 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mail</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mail-microsoft-oauth</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-main</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-management</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-management-api</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mapstruct</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-master</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3232,22 +3232,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-micrometer</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-microprofile-config</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-microprofile-fault-tolerance</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-microprofile-health</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3257,22 +3257,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-minio</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mllp</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mongodb</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3292,22 +3292,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mybatis</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-nats</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-netty</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-netty-http</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3342,17 +3342,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-olingo4</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-olingo4-api</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-openapi-java</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3367,7 +3367,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-opentelemetry</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3377,12 +3377,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-paho</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-paho-mqtt5</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3407,17 +3407,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-platform-http</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-platform-http-main</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-platform-http-vertx</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3452,7 +3452,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-quartz</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3487,7 +3487,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-ref</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3497,7 +3497,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-resilience4j</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3507,12 +3507,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-rest</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-rest-openapi</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3542,12 +3542,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-saga</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-salesforce</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3562,12 +3562,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-saxon</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-scheduler</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3577,7 +3577,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-seda</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3592,7 +3592,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servlet</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3612,7 +3612,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-slack</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3627,17 +3627,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-snmp</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-soap</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-splunk</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3647,57 +3647,57 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-batch</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-jdbc</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-ldap</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-main</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-rabbitmq</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-redis</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-security</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-ws</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-xml</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-sql</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3732,12 +3732,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-stub</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3757,17 +3757,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-telegram</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3777,7 +3777,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-spring-junit5</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3797,27 +3797,27 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-timer</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tooling-maven</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tooling-model</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tooling-util</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tracing</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3832,12 +3832,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-undertow</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-undertow-spring-security</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3847,22 +3847,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-util</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-validator</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-velocity</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3872,17 +3872,17 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-vertx-common</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-vertx-http</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-vertx-websocket</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3902,7 +3902,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-webhook</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3927,27 +3927,27 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xj</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-io</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-io-dsl</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-io-util</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-jaxb</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3957,12 +3957,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-jaxp</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-jaxp-util</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3977,37 +3977,37 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xpath</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xslt</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xslt-saxon</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-yaml-dsl</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-yaml-dsl-common</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-yaml-dsl-deserializers</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-yaml-io</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -4022,12 +4022,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-zip-deflater</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-zipfile</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -4047,7 +4047,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>spi-annotations</artifactId>
- <version>4.0.0.redhat-00010</version>
+ <version>4.0.0.redhat-00025</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -4082,7 +4082,7 @@
<dependency>
<groupId>org.fusesource</groupId>
<artifactId>camel-sap</artifactId>
- <version>4.0.0.redhat-00044</version>
+ <version>4.0.0.redhat-00059</version>
</dependency>
<dependency>
<groupId>org.fusesource</groupId>
@@ -4092,7 +4092,7 @@
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
- <version>1.1.10.3</version>
+ <version>1.1.10.4</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index f755089b317..0ba4d67aa4f 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -113,6 +113,42 @@
<artifactId>guava</artifactId>
<version>${guava-version}</version>
</dependency>
+ <!-- Overrides for tomcat -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-annotations-api</artifactId>
+ <version>${tomcat-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <version>${tomcat-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <version>${tomcat-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>${tomcat-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-jasper</artifactId>
+ <version>${tomcat-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>${tomcat-version}</version>
+ </dependency>
<!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter -->
<dependency>
<groupId>org.apache.avro</groupId>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 32b62fab04a..a0d9e74d5ae 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -73,14 +73,14 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
- <version>4.1.96.Final</version>
+ <version>4.1.100.Final-redhat-00001</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
- <version>11.0.15</version>
+ <version>11.0.17.redhat-00001</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -100,36 +100,72 @@
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
- <version>2.3.7.Final</version>
+ <version>2.3.7.Final-redhat-00001</version>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet</artifactId>
- <version>2.3.7.Final</version>
+ <version>2.3.7.Final-redhat-00001</version>
</dependency>
<!-- Overrides guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>32.1.2-jre</version>
+ <version>32.1.2.jre-redhat-00001</version>
+ </dependency>
+ <!-- Overrides for tomcat -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-annotations-api</artifactId>
+ <version>10.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <version>10.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <version>10.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>10.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>10.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-jasper</artifactId>
+ <version>10.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>10.1.14</version>
</dependency>
<!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter -->
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.11.0</version>
+ <version>1.11.3</version>
</dependency>
<!-- Override commons-compress version -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.21</version>
+ <version>1.24.0</version>
</dependency>
<!-- Overrides snappy-java -->
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
- <version>${snappy-java-version}</version>
+ <version>1.1.10.4</version>
</dependency>
<!-- Overrides elastic-search dependency since SB is using an older version -->
<dependency>
@@ -185,7 +221,7 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-bom</artifactId>
- <version>14.0.11.Final</version>
+ <version>14.0.18.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -209,7 +245,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bom</artifactId>
- <version>4.0.2</version>
+ <version>4.0.2.fuse-redhat-00040</version>
<type>pom</type>
<scope>import</scope>
</dependency>
(camel-spring-boot) 39/40: Override version of org.json:json - need a newer version than the one coming in from spring boot (#311)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit e3a84a1d41c2743f40d1fae38eb539001376101d
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Thu Dec 7 08:38:34 2023 -0500
Override version of org.json:json - need a newer version than the one coming in from spring boot (#311)
---
pom.xml | 1 +
.../src/main/resources/pom.xml | 6 ++++++
tooling/redhat-camel-spring-boot-bom/pom.xml | 6 ++++++
3 files changed, 13 insertions(+)
diff --git a/pom.xml b/pom.xml
index 4afc2586737..ac8d1735ba8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,7 @@
<maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version>
<maven-surefire-plugin-version>3.1.2</maven-surefire-plugin-version>
<mycila-license-version>3.0</mycila-license-version>
+ <org-json-json-version>20231013</org-json-json-version>
<reactor-netty-version>1.1.13</reactor-netty-version>
<springdoc-version>2.2.0</springdoc-version>
<surefire.version>${maven-surefire-plugin-version}</surefire.version>
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 0031736cc58..ed28efa63a6 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -135,6 +135,12 @@
<artifactId>reactor-netty-http</artifactId>
<version>${reactor-netty-version}</version>
</dependency>
+ <!-- Override for org.json:json -->
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${org-json-json-version}</version>
+ </dependency>
<!-- Overrides for tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 56d5fda0ae1..5b71c5b1d72 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -135,6 +135,12 @@
<artifactId>reactor-netty-http</artifactId>
<version>1.1.13</version>
</dependency>
+ <!-- Override for org.json:json -->
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20231013</version>
+ </dependency>
<!-- Overrides for tomcat -->
<dependency>
<groupId>org.apache.tomcat</groupId>
(camel-spring-boot) 04/40: Remove compiler plugin from archetype
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 54857d93274c5825514380ebad49f4824af09c52
Author: Croway <fe...@gmail.com>
AuthorDate: Thu Sep 21 12:19:26 2023 +0200
Remove compiler plugin from archetype
---
.../src/main/resources/archetype-resources/pom.xml | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
index 2c951d8fa01..a76de9c8dc9 100644
--- a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
@@ -30,6 +30,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
+ <maven.compiler.release>17</maven.compiler.target>
<spring.boot-version>${spring-boot-version}</spring.boot-version>
<surefire.plugin.version>3.0.0-M4</surefire.plugin.version>
<jkube.generator.from>registry.access.redhat.com/ubi8/openjdk-17:latest</jkube.generator.from>
@@ -94,14 +97,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin-version}</version>
- <configuration>
- <release>17</release>
- </configuration>
- </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
(camel-spring-boot) 20/40: Add override for the jetty-bom (#280)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit c2df983a1d591a725d0cc1ed5dec3e27eb6b37ae
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Wed Oct 11 16:14:19 2023 -0400
Add override for the jetty-bom (#280)
---
.../src/main/resources/pom.xml | 7 +++++++
tooling/redhat-camel-spring-boot-bom/pom.xml | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index f69bc18469f..f755089b317 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -77,6 +77,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-bom</artifactId>
+ <version>${jetty-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- Insert third party overrides here -->
<dependency>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index f0b0219bbe9..32b62fab04a 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -77,6 +77,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-bom</artifactId>
+ <version>11.0.15</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- Insert third party overrides here -->
<dependency>
(camel-spring-boot) 22/40: Change avro version to match camel's avro (1.11.3) (#283)
Posted by fm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 4ed54d12f70975d82aa0455f8810a00c5fc9773d
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Fri Oct 13 06:24:29 2023 -0400
Change avro version to match camel's avro (1.11.3) (#283)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 76841209f40..246fecfa397 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
<artemis-version>2.28.0</artemis-version>
<arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version>
<arquillian-version>1.7.0.Alpha10</arquillian-version>
- <avro-version>1.11.0</avro-version>
+ <avro-version>1.11.3</avro-version>
<groovy-version>4.0.13</groovy-version>
<graal-sdk-version>22.3.2</graal-sdk-version>
<jakarta-jaxb-version>4.0.0</jakarta-jaxb-version>