This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-4.8.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/camel-spring-boot-4.8.x by
this push:
new c2774aaea07 CAMEL-21243 Add dependencyManagement entry for
org.osgi:org.osgi.core for camel-braintree-starter (#1229)
c2774aaea07 is described below
commit c2774aaea07c82aa39bbd9ecae2ba84d2bb69dd4
Author: Tom Cunningham <[email protected]>
AuthorDate: Fri Sep 20 13:55:02 2024 -0400
CAMEL-21243 Add dependencyManagement entry for org.osgi:org.osgi.core for
camel-braintree-starter (#1229)
* Upgrade avro-version to 1.12.0 to match camel (#1225)
* CAMEL-21243 Add dependencyManagement entry for org.osgi:org.osgi.core for
camel-braintree-starter (#1226)
---
components-starter/camel-braintree-starter/pom.xml | 12 ++++++++++++
.../avro/springboot/test/JacksonAvroLookupResolverTest.java | 3 ++-
.../test/JacksonAvroMarshalUnmarshalJsonNodeTest.java | 5 +++--
.../test/JacksonAvroMarshalUnmarshalPojoListTest.java | 3 ++-
.../springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java | 3 ++-
pom.xml | 2 +-
tooling/camel-spring-boot-dependencies/pom.xml | 8 ++++----
7 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/components-starter/camel-braintree-starter/pom.xml
b/components-starter/camel-braintree-starter/pom.xml
index 40fc4471b6b..df5ed5c0386 100644
--- a/components-starter/camel-braintree-starter/pom.xml
+++ b/components-starter/camel-braintree-starter/pom.xml
@@ -28,6 +28,18 @@
<packaging>jar</packaging>
<name>Camel SB Starters :: Braintree</name>
<description>Spring-Boot Starter for Camel Braintree support</description>
+ <properties>
+ <camel-braintree-osgi-version>4.2.0</camel-braintree-osgi-version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${camel-braintree-osgi-version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java
index 5830ba52c1e..428e603d389 100644
---
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java
+++
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java
@@ -18,6 +18,7 @@ package
org.apache.camel.component.jackson.avro.springboot.test;
import com.fasterxml.jackson.dataformat.avro.AvroSchema;
+import org.apache.avro.NameValidator;
import org.apache.avro.Schema;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
@@ -57,7 +58,7 @@ public class JacksonAvroLookupResolverTest {
private SchemaResolver getSchemaResolver() {
String schemaJson = "{\n" + "\"type\": \"record\",\n" + "\"name\":
\"Pojo\",\n" + "\"fields\": [\n"
+ " {\"name\": \"text\", \"type\": \"string\"}\n" + "]}";
- Schema raw = new Schema.Parser().setValidate(true).parse(schemaJson);
+ Schema raw = new
Schema.Parser(NameValidator.STRICT_VALIDATOR).parse(schemaJson);
AvroSchema schema = new AvroSchema(raw);
SchemaResolver resolver = ex -> schema;
diff --git
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java
index 9b519c5e2ca..9fc92b401f1 100644
---
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java
+++
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java
@@ -22,6 +22,7 @@ import java.util.List;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.dataformat.avro.AvroSchema;
+import org.apache.avro.NameValidator;
import org.apache.avro.Schema;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
@@ -70,10 +71,10 @@ public class JacksonAvroMarshalUnmarshalJsonNodeTest {
+ " \"type\":\"record\",\n" + " \"fields\":[\n"
+ " {\"name\":\"text\", \"type\":\"string\"}\n" + "
]\n" + " }\n" + "}";
- Schema raw = new Schema.Parser().setValidate(true).parse(schemaJson);
+ Schema raw = new
Schema.Parser(NameValidator.STRICT_VALIDATOR).parse(schemaJson);
AvroSchema schema = new AvroSchema(raw);
- Schema rawList = new
Schema.Parser().setValidate(true).parse(listSchemaJson);
+ Schema rawList = new
Schema.Parser(NameValidator.STRICT_VALIDATOR).parse(listSchemaJson);
AvroSchema schemaList = new AvroSchema(rawList);
SchemaResolver resolver = ex -> {
diff --git
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java
index 8deb0efe5a6..b9e1c2dcd03 100644
---
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java
+++
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java
@@ -21,6 +21,7 @@ import java.util.List;
import com.fasterxml.jackson.dataformat.avro.AvroSchema;
+import org.apache.avro.NameValidator;
import org.apache.avro.Schema;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
@@ -62,7 +63,7 @@ public class JacksonAvroMarshalUnmarshalPojoListTest {
String schemaJson = "{\n" + " \"type\": \"array\", \n" + "
\"items\":{\n" + " \"name\":\"Pojo\",\n"
+ " \"type\":\"record\",\n" + " \"fields\":[\n"
+ " {\"name\":\"text\", \"type\":\"string\"}\n" + "
]\n" + " }\n" + "}";
- Schema raw = new Schema.Parser().setValidate(true).parse(schemaJson);
+ Schema raw = new
Schema.Parser(NameValidator.STRICT_VALIDATOR).parse(schemaJson);
AvroSchema schema = new AvroSchema(raw);
SchemaResolver resolver = ex -> schema;
diff --git
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java
index 170fc62c92e..d1570817158 100644
---
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java
+++
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java
@@ -18,6 +18,7 @@ package
org.apache.camel.component.jackson.avro.springboot.test;
import com.fasterxml.jackson.dataformat.avro.AvroSchema;
+import org.apache.avro.NameValidator;
import org.apache.avro.Schema;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
@@ -57,7 +58,7 @@ public class JacksonAvroMarshalUnmarshalPojoTest {
private SchemaResolver getSchemaResolver() {
String schemaJson = "{\n" + "\"type\": \"record\",\n" + "\"name\":
\"Pojo\",\n" + "\"fields\": [\n"
+ " {\"name\": \"text\", \"type\": \"string\"}\n" + "]}";
- Schema raw = new Schema.Parser().setValidate(true).parse(schemaJson);
+ Schema raw = new
Schema.Parser(NameValidator.STRICT_VALIDATOR).parse(schemaJson);
AvroSchema schema = new AvroSchema(raw);
SchemaResolver resolver = ex -> schema;
diff --git a/pom.xml b/pom.xml
index f891f031f83..b1d636cdaa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
<aether-version>1.0.2.v20150114</aether-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.12.0</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>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 56134c6acff..93c8fd07c8c 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -255,22 +255,22 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.11.0</version>
+ <version>1.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc</artifactId>
- <version>1.11.0</version>
+ <version>1.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-mapred</artifactId>
- <version>1.11.0</version>
+ <version>1.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-protobuf</artifactId>
- <version>1.11.0</version>
+ <version>1.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.camel.maven</groupId>
