This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit af6e6e002e84f94d9fb7d81e6fcd607fcff39278
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Wed Sep 22 17:27:38 2021 +0100
Upgrade Quarkus to 2.4.0.CR1
---
docs/antora.yml | 2 +-
.../deployment/CamelContextCustomizerTest.java | 2 +-
.../mail/deployment/SupportMailProcessor.java | 23 ++++++++++++++++++++++
.../component/fop/deployment/FopProcessor.java | 18 ++++++++++++++---
.../deployment/OptaplannerProcessor.java | 9 +++++++++
extensions/pdf/deployment/pom.xml | 4 ++++
.../component/pdf/deployment/PdfProcessor.java | 1 +
extensions/pdf/runtime/pom.xml | 4 ++++
pom.xml | 4 ++--
9 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index ebff9fe..426beae 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -25,4 +25,4 @@ asciidoc:
cq-camel-components: 3.12.x@components # replace
${camel.docs.components.xref}
min-maven-version: 3.6.2 # replace ${min-maven-version}
target-maven-version: 3.8.1 # replace ${target-maven-version}
- quarkus-version: 2.3.0.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
diff --git
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
index 0c67934..d059d74 100644
---
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
+++
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
@@ -53,7 +53,7 @@ public class CamelContextCustomizerTest {
public void execute(BuildContext context) {
String methodName = "execute";
BytecodeRecorderImpl bri = new
BytecodeRecorderImpl(true, getClass().getSimpleName(), methodName,
- Integer.toString(methodName.hashCode()));
+ Integer.toString(methodName.hashCode()), true);
RuntimeValue<CamelContextCustomizer> value = bri
.newInstance(RestConfigurationCustomizer.class.getName());
context.produce(new
CamelContextCustomizerBuildItem(value));
diff --git
a/extensions-support/mail/deployment/src/main/java/org/apache/camel/quarkus/support/mail/deployment/SupportMailProcessor.java
b/extensions-support/mail/deployment/src/main/java/org/apache/camel/quarkus/support/mail/deployment/SupportMailProcessor.java
index 7606695..4bb59e9 100644
---
a/extensions-support/mail/deployment/src/main/java/org/apache/camel/quarkus/support/mail/deployment/SupportMailProcessor.java
+++
b/extensions-support/mail/deployment/src/main/java/org/apache/camel/quarkus/support/mail/deployment/SupportMailProcessor.java
@@ -33,10 +33,15 @@ import java.util.stream.StreamSupport;
import javax.mail.Provider;
+import com.sun.mail.handlers.handler_base;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import
io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import org.jboss.jandex.DotName;
class SupportMailProcessor {
@@ -89,6 +94,24 @@ class SupportMailProcessor {
"META-INF/mailcap"));
}
+ @BuildStep
+ IndexDependencyBuildItem indexDependencies() {
+ return new IndexDependencyBuildItem("com.sun.mail", "jakarta.mail");
+ }
+
+ @BuildStep
+ void runtimeInitializedClasses(
+ CombinedIndexBuildItem combinedIndex,
+ BuildProducer<RuntimeInitializedClassBuildItem>
runtimeInitializedClass) {
+
+ combinedIndex.getIndex()
+
.getAllKnownSubclasses(DotName.createSimple(handler_base.class.getName()))
+ .stream()
+ .map(classInfo -> classInfo.name().toString())
+ .map(RuntimeInitializedClassBuildItem::new)
+ .forEach(runtimeInitializedClass::produce);
+ }
+
private Stream<URL> resources(String path) {
try {
return
enumerationAsStream(getClass().getClassLoader().getResources(path));
diff --git
a/extensions/fop/deployment/src/main/java/org/apache/camel/quarkus/component/fop/deployment/FopProcessor.java
b/extensions/fop/deployment/src/main/java/org/apache/camel/quarkus/component/fop/deployment/FopProcessor.java
index d7cf3bd..4360a26 100644
---
a/extensions/fop/deployment/src/main/java/org/apache/camel/quarkus/component/fop/deployment/FopProcessor.java
+++
b/extensions/fop/deployment/src/main/java/org/apache/camel/quarkus/component/fop/deployment/FopProcessor.java
@@ -29,10 +29,13 @@ import
io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBui
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import org.apache.fop.fonts.Base14Font;
import org.apache.fop.render.RendererEventProducer;
import org.apache.fop.render.pdf.PDFDocumentHandlerMaker;
import org.apache.fop.render.pdf.extensions.PDFExtensionHandlerFactory;
+import org.apache.fop.util.ColorUtil;
import org.apache.xmlgraphics.image.loader.spi.ImageImplRegistry;
+import org.jboss.jandex.DotName;
import org.jboss.jandex.IndexView;
class FopProcessor {
@@ -83,8 +86,17 @@ class FopProcessor {
}
@BuildStep
- public void
registerRuntimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem>
resource) {
- resource.produce(new
RuntimeInitializedClassBuildItem(ImageImplRegistry.class.getName()));
- }
+ public void registerRuntimeInitializedClasses(
+ CombinedIndexBuildItem combinedIndex,
+ BuildProducer<RuntimeInitializedClassBuildItem>
runtimeInitializedClass) {
+
+ combinedIndex.getIndex()
+
.getAllKnownSubclasses(DotName.createSimple(Base14Font.class.getName()))
+ .stream().map(classInfo -> classInfo.name().toString())
+ .map(RuntimeInitializedClassBuildItem::new)
+ .forEach(runtimeInitializedClass::produce);
+ runtimeInitializedClass.produce(new
RuntimeInitializedClassBuildItem(ImageImplRegistry.class.getName()));
+ runtimeInitializedClass.produce(new
RuntimeInitializedClassBuildItem(ColorUtil.class.getName()));
+ }
}
diff --git
a/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
b/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
index 140c65b..497bfa3 100644
---
a/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
+++
b/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
@@ -16,8 +16,10 @@
*/
package org.apache.camel.quarkus.component.optaplanner.deployment;
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import
io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
class OptaplannerProcessor {
@@ -27,4 +29,11 @@ class OptaplannerProcessor {
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
+
+ @BuildStep
+ void
runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem>
runtimeInitializedClass) {
+ runtimeInitializedClass.produce(new
RuntimeInitializedClassBuildItem("org.drools.core.util.Drools$XSTreamChekcer"));
+ runtimeInitializedClass
+ .produce(new
RuntimeInitializedClassBuildItem("org.drools.compiler.kproject.models.KieModuleMarshaller"));
+ }
}
diff --git a/extensions/pdf/deployment/pom.xml
b/extensions/pdf/deployment/pom.xml
index 5091019..088bfe9 100644
--- a/extensions/pdf/deployment/pom.xml
+++ b/extensions/pdf/deployment/pom.xml
@@ -31,6 +31,10 @@
<dependencies>
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-awt-deployment</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core-deployment</artifactId>
</dependency>
diff --git
a/extensions/pdf/deployment/src/main/java/org/apache/camel/quarkus/component/pdf/deployment/PdfProcessor.java
b/extensions/pdf/deployment/src/main/java/org/apache/camel/quarkus/component/pdf/deployment/PdfProcessor.java
index d6c3e90..6dd81d5 100644
---
a/extensions/pdf/deployment/src/main/java/org/apache/camel/quarkus/component/pdf/deployment/PdfProcessor.java
+++
b/extensions/pdf/deployment/src/main/java/org/apache/camel/quarkus/component/pdf/deployment/PdfProcessor.java
@@ -55,6 +55,7 @@ class PdfProcessor {
"org.apache.pdfbox.pdmodel.font.PDType1Font",
"org.apache.camel.component.pdf.PdfConfiguration",
"org.apache.camel.component.pdf.Standard14Fonts",
+ "org.apache.pdfbox.pdmodel.PDDocument",
};
@BuildStep
diff --git a/extensions/pdf/runtime/pom.xml b/extensions/pdf/runtime/pom.xml
index ceb032b..bc3c662 100644
--- a/extensions/pdf/runtime/pom.xml
+++ b/extensions/pdf/runtime/pom.xml
@@ -48,6 +48,10 @@
<dependencies>
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-awt</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index d2445ae..01d06f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
<optaplanner.version>8.9.1.Final</optaplanner.version><!-- May go back
to Camel's ${optaplanner-version} when they are in sync
https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
<quarkiverse.freemarker.version>0.3.0</quarkiverse.freemarker.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/
-->
<quarkiverse-minio.version>2.0.0</quarkiverse-minio.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
- <quarkus.version>2.3.0.Final</quarkus.version><!--
https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>999-SNAPSHOT</quarkus.version><!--
https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-google-cloud.version>0.10.0</quarkus-google-cloud.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/googlecloudservices/quarkus-google-cloud-services-bom/
-->
<quarkus-hazelcast-client.version>2.0.0</quarkus-hazelcast-client.version><!--
https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>0.28.0</quarkus-qpid-jms.version><!--
https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -116,7 +116,7 @@
<retrofit.version>2.5.0</retrofit.version>
<saaj.impl.version>1.5.3</saaj.impl.version>
<scala-2.12.version>2.12.14</scala-2.12.version><!-- Spark -->
-
<smallrye.reactive.messaging.camel.version>3.9.1</smallrye.reactive.messaging.camel.version><!--
@sync io.quarkus:quarkus-bom:${quarkus.version}
dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
+
<smallrye.reactive.messaging.camel.version>3.10.1</smallrye.reactive.messaging.camel.version><!--
@sync io.quarkus:quarkus-bom:${quarkus.version}
dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<spring.version>${spring5-version}</spring.version>
<snakeyaml.version>${snakeyaml-version}</snakeyaml.version>
<snappy.version>1.1.7.7</snappy.version><!-- Spark -->
