From 1bd2be5085ba2fb81b75378b804206ba4438b17b Mon Sep 17 00:00:00 2001 From: James Netherton Date: Sat, 2 Nov 2024 12:15:34 +0000 Subject: [PATCH] Add changelog for 3.15.1 --- CHANGELOG.md | 32 +++++++++++++++++ .../jackson/avro/it/JacksonAvroResource.java | 35 +++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cda75cab25d..e20064ab7a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,37 @@ # Changelog +## 3.15.1 + +* [3.15.x] Backports by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6505 +* [3.15.x] Backports by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6540 +* [3.15.x] Upgrade Quarkus to 3.15.1 by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6551 +* [3.15.x] Workaround + fixed generator/resolver of bean catalog in maven-plugin by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/6557 +* [3.15.x] Backports by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6568 +* [3.15.x] Upgrade to Quarkus CXF 3.15.2 by @ppalaga in https://github.com/apache/camel-quarkus/pull/6587 +* [3.15.x] Backports by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6592 +* [3.15.x] Remove incorrect assumptions about kamelets-catalog dependency scope from the extension documentation by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6595 +* [3.15.x] Mark .wasm files as binary in .gitattributes by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6597 +* [3.15.x] Backports by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6603 +* [3.15.x] Fix and extend aws secret manager vault integration tests for real instance by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6617 +* [3.15.x] Backports by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6622 +* [3.15.x] Upgrade hapi-fhir-core dependencies to 6.3.23 by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6626 +* [3.15.x] Backports by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6634 +* [3.15.x] Link to new cluster service extensions from extensions where the functionality used to reside by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6638 +* [3.15.x] Increase MockEndpoint assertion wait timeout for JMS resequence test by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6644 +* [3.15.x] Disable SMB and Kudu on FIPS by @llowinge in https://github.com/apache/camel-quarkus/pull/6646 +* [3.15.x] Fix Azure tests by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/6649 +* [3.15.x] Backport splunk by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/6650 +* [3.15.x] backports by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/6656 +* [3.15.x] backports by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/6668 +* [3.15.x] Add a brief explanation of yaml-io usage to the extension documentation by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6675 +* [3.15.x] Removal of crypto bcfips 3.15.x by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/6678 +* [3.15.x] Add a basic test for pipes by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/6692 +* [3.15.x] Upgrade Camel to 4.8.1 by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6700 +* [3.15] Fix #6701 to support OpenAPI spec with yaml format by @zhfeng in https://github.com/apache/camel-quarkus/pull/6712 +* [3.15.x] Simplify splunk-hec test SSL setup by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6713 + +**Full Changelog**: https://github.com/apache/camel-quarkus/compare/3.15.0...3.15.1 + ## 3.16.0 * Next is 3.16.0-SNAPSHOT by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/6490 diff --git a/integration-tests/jackson-avro/src/main/java/org/apache/camel/quarkus/component/jackson/avro/it/JacksonAvroResource.java b/integration-tests/jackson-avro/src/main/java/org/apache/camel/quarkus/component/jackson/avro/it/JacksonAvroResource.java index 3272edc07a4..3e8c768277d 100644 --- a/integration-tests/jackson-avro/src/main/java/org/apache/camel/quarkus/component/jackson/avro/it/JacksonAvroResource.java +++ b/integration-tests/jackson-avro/src/main/java/org/apache/camel/quarkus/component/jackson/avro/it/JacksonAvroResource.java @@ -18,6 +18,9 @@ import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; @@ -105,6 +108,38 @@ public Response avroJacksonUnMarshal(@PathParam("type") String type, byte[] mess @GET @Produces(MediaType.TEXT_PLAIN) public String customMapper(@QueryParam("schemaFrom") String schemaFrom) throws IOException { + String className = "org.apache.avro.NameValidator"; + + Class clazz = null; + try { + clazz = Class.forName(className); + } catch (ClassNotFoundException cnfe) { + } + + if (clazz != null) { + try { + // Find the UTF_VALIDATOR, which validates names and get the Object + Field utfValidator = clazz.getField("UTF_VALIDATOR"); + Object validatorObject = utfValidator.get(null); + + // Need to pick up the constructor typed to NameValidator, then can call for a new instance + // with the UTF_VALIDATOR object + Constructor cons = new Schema.Parser().getClass().getConstructor(clazz); + Schema.Parser sp = (Schema.Parser) cons.newInstance(validatorObject); + System.out.println(sp); + } catch (NoSuchFieldException nsfe) { + throw new IOException(nsfe); + } catch (IllegalAccessException iae) { + throw new IOException(iae); + } catch (NoSuchMethodException nsme) { + throw new IOException(nsme); + } catch (InstantiationException ie) { + throw new IOException(ie); + } catch (InvocationTargetException ite) { + throw new IOException(ite); + } + } + AvroMapper avroMapper = new AvroMapper(); AvroSchema avroSchema;