You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2022/07/09 07:23:19 UTC
[camel-quarkus] branch quarkus-main updated (27fedf8473 -> b96735db93)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard 27fedf8473 Disable OptaPlanner native profile due to #3899
discard 37d89e13fc Upgrade Quarkus to 2.11.0.CR1
add e952348d93 Updated CHANGELOG.md
add 6a5abae88a Add JQ extension
add 91e644b684 Add test for property placeholders and non-resolvable config profile properties
add fdf5beaa8c Add test for @Singleton scoped beans in dev mode
new ff31630fe2 Upgrade Quarkus to 2.11.0.CR1
new b96735db93 Disable OptaPlanner native profile due to #3899
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (27fedf8473)
\
N -- N -- N refs/heads/quarkus-main (b96735db93)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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:
CHANGELOG.md | 3 +
docs/modules/ROOT/examples/languages/jq.yml | 13 ++
docs/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/reference/extensions/jq.adoc | 71 +++++++++
extensions-core/core/deployment/pom.xml | 10 ++
.../CamelConfigurationPlaceholdersTest.java} | 44 +++---
.../CamelDevModeSingletonBeanTest.java} | 62 ++++----
extensions/{jackson-avro => jq}/deployment/pom.xml | 16 ++-
.../component/jq/deployment/JqProcessor.java} | 21 ++-
.../parent-pom.xml => extensions/jq/pom.xml | 8 +-
extensions/{jackson-avro => jq}/runtime/pom.xml | 22 +--
extensions/jq/runtime/src/main/doc/usage.adoc | 28 ++++
.../quarkus/component/jq/CamelJqRecorder.java} | 23 ++-
.../main/resources/META-INF/quarkus-extension.yaml | 6 +-
extensions/pom.xml | 1 +
.../jq}/pom.xml | 15 +-
.../camel/quarkus/component/jq/it/Book.java} | 49 ++++---
.../camel/quarkus/component/jq/it/JqResource.java | 158 +++++++++++++++++++++
.../camel/quarkus/component/jq/it/JqRoutes.java | 58 ++++++++
.../jq/src/main}/resources/application.properties | 4 +-
.../apache/camel/quarkus/component/jq/it/JqIT.java | 4 +-
.../camel/quarkus/component/jq/it/JqTest.java | 89 ++++++++++++
integration-tests/pom.xml | 1 +
pom.xml | 1 +
poms/bom/pom.xml | 25 ++++
poms/bom/src/main/generated/flattened-full-pom.xml | 25 ++++
.../src/main/generated/flattened-reduced-pom.xml | 25 ++++
.../generated/flattened-reduced-verbose-pom.xml | 25 ++++
tooling/scripts/test-categories.yaml | 1 +
29 files changed, 680 insertions(+), 129 deletions(-)
create mode 100644 docs/modules/ROOT/examples/languages/jq.yml
create mode 100644 docs/modules/ROOT/pages/reference/extensions/jq.adoc
copy extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/{deployment/main/CamelMainInjectTest.java => runtime/CamelConfigurationPlaceholdersTest.java} (70%)
copy extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/{deployment/main/CamelMainInjectTest.java => runtime/CamelDevModeSingletonBeanTest.java} (57%)
copy extensions/{jackson-avro => jq}/deployment/pom.xml (78%)
copy extensions/{headersmap/deployment/src/main/java/org/apache/camel/quarkus/component/headersmap/deployment/HeadersmapProcessor.java => jq/deployment/src/main/java/org/apache/camel/quarkus/component/jq/deployment/JqProcessor.java} (64%)
copy tooling/create-extension-templates/parent-pom.xml => extensions/jq/pom.xml (86%)
copy extensions/{jackson-avro => jq}/runtime/pom.xml (80%)
create mode 100644 extensions/jq/runtime/src/main/doc/usage.adoc
copy extensions/{qute/runtime/src/main/java/org/apache/camel/quarkus/component/qute/CamelQuteRecorder.java => jq/runtime/src/main/java/org/apache/camel/quarkus/component/jq/CamelJqRecorder.java} (64%)
copy extensions/{atom => jq}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (90%)
copy {integration-test-groups/foundation/component-name-resolver => integration-tests/jq}/pom.xml (89%)
copy integration-tests/{dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/model/TestPojo.java => jq/src/main/java/org/apache/camel/quarkus/component/jq/it/Book.java} (58%)
create mode 100644 integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqResource.java
create mode 100644 integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java
copy {extensions/kafka/deployment/src/test => integration-tests/jq/src/main}/resources/application.properties (87%)
copy integration-test-groups/foundation/eip/src/test/java/org/apache/camel/quarkus/eip/it/EipIT.java => integration-tests/jq/src/test/java/org/apache/camel/quarkus/component/jq/it/JqIT.java (91%)
create mode 100644 integration-tests/jq/src/test/java/org/apache/camel/quarkus/component/jq/it/JqTest.java
[camel-quarkus] 01/02: Upgrade Quarkus to 2.11.0.CR1
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ff31630fe25d92a8a2f5855af81e37e1c48fe59f
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Jun 10 11:54:49 2022 +0100
Upgrade Quarkus to 2.11.0.CR1
---
docs/antora.yml | 4 ++--
.../camel/quarkus/component/fop/deployment/FopProcessor.java | 2 ++
pom.xml | 8 ++++----
poms/bom/pom.xml | 4 ++++
poms/bom/src/main/generated/flattened-full-pom.xml | 6 +++++-
poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++++-
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++++-
7 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 74a90dcd1b..1b7014923b 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -28,10 +28,10 @@ asciidoc:
requires: "'util=camel-website-util,quarkus=xref:js/quarkus.js'"
min-maven-version: 3.8.2 # replace ${min-maven-version}
- target-maven-version: 3.8.4 # replace ${target-maven-version}
+ target-maven-version: 3.8.6 # replace ${target-maven-version}
camel-version: 3.18.0 # replace ${camel.version}
camel-docs-version: 3.18.x # replace ${camel.docs.components.version}
- quarkus-version: 2.10.1.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 22.1.0 # replace ${graalvm.version}
graalvm-docs-version: 22.1
# attributes used in xrefs to other Antora components
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 4360a26daf..8c19009c43 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
@@ -35,6 +35,7 @@ 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.apache.xmlgraphics.java2d.color.ICCColorSpaceWithIntent;
import org.jboss.jandex.DotName;
import org.jboss.jandex.IndexView;
@@ -98,5 +99,6 @@ class FopProcessor {
runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem(ImageImplRegistry.class.getName()));
runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem(ColorUtil.class.getName()));
+ runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem(ICCColorSpaceWithIntent.class.getName()));
}
}
diff --git a/pom.xml b/pom.xml
index 3685ae1c95..d8177056ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
<quarkiverse-minio.version>2.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>1.0.4</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>2.10.1.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-hazelcast-client.version>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>0.34.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -87,7 +87,7 @@
<github-api.version>1.111</github-api.version><!-- Used in a Groovy script bellow -->
<google-auth-library-credentials.version>1.7.0</google-auth-library-credentials.version><!-- TODO: Revert back to using Camel's version when gRPC versions are in sync -->
<graalvm.version>22.1.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
- <grpc.version>1.46.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <grpc.version>1.47.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
<hbase.version>${hbase-version}</hbase.version>
@@ -124,7 +124,7 @@
<projectreactor-netty.version>${reactor-netty-version}</projectreactor-netty.version>
<retrofit.version>2.5.0</retrofit.version>
<saaj.impl.version>1.5.3</saaj.impl.version>
- <smallrye.reactive.messaging.camel.version>3.17.0</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.18.0</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>
<threetenbp.version>1.6.0</threetenbp.version>
@@ -203,7 +203,7 @@
<!-- maven-enforcer-plugin -->
<min-maven-version>3.8.2</min-maven-version>
- <target-maven-version>3.8.4</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
+ <target-maven-version>3.8.6</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
<supported-maven-versions>[${min-maven-version},)</supported-maven-versions>
<!-- maven-release-plugin -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 496c2e58e3..0cc31aff8b 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1473,6 +1473,10 @@
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.liquibase</groupId>
+ <artifactId>liquibase-core</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index eed860c7a3..c5a18661d8 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -1419,6 +1419,10 @@
<groupId>org.jboss.logmanager</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jboss-logmanager</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
+ <exclusion>
+ <groupId>org.liquibase</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>liquibase-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
<exclusion>
<groupId>org.slf4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jcl-over-slf4j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -9760,7 +9764,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.17.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.18.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index fdfcd3c24a..f1bb6683c8 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -1419,6 +1419,10 @@
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.liquibase</groupId>
+ <artifactId>liquibase-core</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
@@ -9760,7 +9764,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-camel</artifactId>
- <version>3.17.0</version>
+ <version>3.18.0</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index e3f8e63aad..24e97bf584 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -1419,6 +1419,10 @@
<groupId>org.jboss.logmanager</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jboss-logmanager</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
+ <exclusion>
+ <groupId>org.liquibase</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>liquibase-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
<exclusion>
<groupId>org.slf4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jcl-over-slf4j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -9760,7 +9764,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.17.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.18.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
[camel-quarkus] 02/02: Disable OptaPlanner native profile due to #3899
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b96735db93501b4e768eeea4c3d340946bb1c686
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jul 5 07:56:40 2022 +0100
Disable OptaPlanner native profile due to #3899
---
integration-tests/optaplanner/pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/integration-tests/optaplanner/pom.xml b/integration-tests/optaplanner/pom.xml
index db6c6dcc78..791f8b4fdb 100644
--- a/integration-tests/optaplanner/pom.xml
+++ b/integration-tests/optaplanner/pom.xml
@@ -71,6 +71,7 @@
</dependencies>
<profiles>
+ <!-- TODO: https://github.com/apache/camel-quarkus/issues/3899
<profile>
<id>native</id>
<activation>
@@ -98,6 +99,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>