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 <[email protected]> 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>
