(camel) branch camel-4.8.x updated: Allow propagating -version properties from the top pom to camel-dependencies
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch camel-4.8.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.8.x by this push:
new 0431016c253 Allow propagating -version properties from the top pom to
camel-dependencies
0431016c253 is described below
commit 0431016c253a0ad75c2f8983cfcf21b12153a653
Author: Peter Palaga
AuthorDate: Thu Dec 19 10:47:59 2024 +0100
Allow propagating -version properties from the top pom to
camel-dependencies
---
.../org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
index 42b58630f8b..11699c654ba 100644
---
a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
+++
b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
@@ -194,7 +194,11 @@ public class SyncPropertiesMojo extends AbstractMojo {
final String properties = Stream.concat(
camelParentPomXmlModel.getProperties().entrySet().stream(),
camelPomXmlModel.getProperties().entrySet().stream()
-.filter(property ->
property.getKey().equals("license-maven-plugin-version")))
+.filter(property -> {
+final String key = (String) property.getKey();
+return key.equals("license-maven-plugin-version")
// the only plugin version we want to propagate
+|| (key.endsWith("-version") &&
!key.endsWith("-plugin-version"));
+}))
.filter(property -> includes.test((String) property.getKey())
&& !excludes.test((String) property.getKey()))
.map(property -> "<" + property.getKey() + ">" +
property.getValue() + "")
.sorted()
(camel) branch main updated: Allow propagating -version properties from the top pom to camel-dependencies
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 5fe84bcb426 Allow propagating -version properties from the top pom to
camel-dependencies
5fe84bcb426 is described below
commit 5fe84bcb4269061f057b296a6b53ddda8e6d1f72
Author: Peter Palaga
AuthorDate: Thu Dec 19 10:47:59 2024 +0100
Allow propagating -version properties from the top pom to
camel-dependencies
---
.../org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
index 42b58630f8b..11699c654ba 100644
---
a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
+++
b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
@@ -194,7 +194,11 @@ public class SyncPropertiesMojo extends AbstractMojo {
final String properties = Stream.concat(
camelParentPomXmlModel.getProperties().entrySet().stream(),
camelPomXmlModel.getProperties().entrySet().stream()
-.filter(property ->
property.getKey().equals("license-maven-plugin-version")))
+.filter(property -> {
+final String key = (String) property.getKey();
+return key.equals("license-maven-plugin-version")
// the only plugin version we want to propagate
+|| (key.endsWith("-version") &&
!key.endsWith("-plugin-version"));
+}))
.filter(property -> includes.test((String) property.getKey())
&& !excludes.test((String) property.getKey()))
.map(property -> "<" + property.getKey() + ">" +
property.getValue() + "")
.sorted()
svn commit: r73496 [5/5] - /dev/camel/camel-quarkus/3.17.0/
Added: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.xml.asc == Binary file - no diff available. Propchange: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.xml.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.xml.sha512 == --- dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.xml.sha512 (added) +++ dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.xml.sha512 Wed Dec 4 23:18:07 2024 @@ -0,0 +1 @@ +2527715336c416e0cd55c208cb393c77e4c2018c4a2982c50832f26d1f55309a1faa0af18dc673523938b3407b04b79cfd2c50ae4e8177f0807da0e7344ad408 *apache-camel-quarkus-3.17.0-sbom.xml Added: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-src.zip == Binary file - no diff available. Propchange: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-src.zip -- svn:mime-type = application/zip Added: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-src.zip.asc == Binary file - no diff available. Propchange: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-src.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-src.zip.sha512 == --- dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-src.zip.sha512 (added) +++ dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-src.zip.sha512 Wed Dec 4 23:18:07 2024 @@ -0,0 +1 @@ +69f13f4d83628c48a609bec6860ff5c2356b0c8bcc9abae935922a46b54ec6100aab786ad5194cdc9f50404e49daf2e94cb152c37af4363f76bba341d134b188 *apache-camel-quarkus-3.17.0-src.zip
svn commit: r73496 [3/5] - /dev/camel/camel-quarkus/3.17.0/
Added: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.json.asc == Binary file - no diff available. Propchange: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.json.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.json.sha512 == --- dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.json.sha512 (added) +++ dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.json.sha512 Wed Dec 4 23:18:07 2024 @@ -0,0 +1 @@ +9a43bbd202af4956f85e47bff7eafed99cb2900a1ea9f4ea6cd80f9990692b713a0f0c4f4f7922eedd870b7bb39514743e6e28c50dd09f77c525f864a7f96017 *apache-camel-quarkus-3.17.0-sbom.json
svn commit: r73496 [4/5] - /dev/camel/camel-quarkus/3.17.0/
Added: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.xml == --- dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.xml (added) +++ dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.xml Wed Dec 4 23:18:07 2024 @@ -0,0 +1,138624 @@ + +http://cyclonedx.org/schema/bom/1.6";> + + + +build + + + + + + OWASP Foundation + org.cyclonedx + cyclonedx-maven-plugin + 2.9.1 + CycloneDX Maven plugin + +9c7a565cf28cce58557d0c621c5ea4b1 +be882d5a22050bfa9d19090b1420c188617d0e1c +698e0f37184a5b28c245c4065fd036dfce253b52f82fbb7113d81d36326cc249 +c0f0b11026858166f872a2eb54719492e5cecaa0bc9cd6b30b3ecb4a174eed220f4a1b5829d18d6734128e778d3cb3db7ffed177c92866133129cb29081814a0 +d80964707dfe5caca8c70521d5066f57589304c0a657e6fbc7c0614ea0fc7b3b3dbe7778361eee0f54ba111e9cb0ffcb +80bc3a275d9514bc457461ff52a72add8c7ecbbc01d8912efce57139016c544ee776981851be0a58fa977ab4221f703f +142317d6f245390f4fd2d0c100b16281b8dfc5c0c2cff86943bdcc97039cb699 +af0fb9137c90b65d1a07f72e4d51ae509956cdb8800f35c961b037cdda1fe4a14ce3b496cef71ba85f1621affcfe29cd42704ae4191ff0b090a9602087c8997b + + + + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus + 3.17.0 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus@3.17.0?type=pom + + + http://camel.apache.org + + + https://repository.apache.org/service/local/staging/deploy/maven2 + + + https://github.com/apache/camel-quarkus/issues + + + dev-subscr...@camel.apache.org + + + https://github.com/apache/camel-quarkus + + + + + makeAggregateBom + compile,provided,runtime,system + enabled + + + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-poms + 3.17.0 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-poms@3.17.0?type=pom + + + http://camel.apache.org/camel-quarkus-poms + + + https://repository.apache.org/service/local/staging/deploy/maven2 + + + https://github.com/apache/camel-quarkus/issues + + + dev-subscr...@camel.apache.org + + + https://github.com/apache/camel-quarkus/camel-quarkus-poms + + + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-bom + 3.17.0 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-bom@3.17.0?type=pom + + + http://camel.apache.org/camel-quarkus-poms/camel-quarkus-bom + + + https://repository.apache.org/service/local/staging/deploy/maven2 + + + https://github.com/apache/camel-quarkus/issues + + + dev-subscr...@camel.apache.org + + + https://github.com/apache/camel-quarkus/camel-quarkus-poms/camel-quarkus-bom + + + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-bom-test + 3.17.0 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-bom-test@3.17.0?type=pom + + + http://camel.apache.org/camel-quarkus-poms/camel-quarkus-bom-test + + + https://repository.apache.org/service/local/staging/deploy/maven2 + + + https://github.com/apache/camel-quarkus/issues + + + dev-subscr...@camel.apache.org + + + https://github.com/apache/camel-quarkus/camel-quarkus-poms/camel-quarkus-bom-test + + + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-build-parent + 3.17.0 + Maven plugins configuration + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-build-parent@3.17.0?
svn commit: r73496 [1/5] - /dev/camel/camel-quarkus/3.17.0/
Author: ppalaga Date: Wed Dec 4 23:18:07 2024 New Revision: 73496 Log: Import camel-quarkus release Added: dev/camel/camel-quarkus/3.17.0/ dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.json dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.json.asc (with props) dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.json.sha512 dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.xml dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.xml.asc (with props) dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.xml.sha512 dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-src.zip (with props) dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-src.zip.asc (with props) dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-src.zip.sha512
svn commit: r73496 [2/5] - /dev/camel/camel-quarkus/3.17.0/
Added: dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.json
==
--- dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.json (added)
+++ dev/camel/camel-quarkus/3.17.0/apache-camel-quarkus-3.17.0-sbom.json Wed
Dec 4 23:18:07 2024
@@ -0,0 +1,228507 @@
+{
+ "bomFormat" : "CycloneDX",
+ "specVersion" : "1.6",
+ "serialNumber" : "urn:uuid:b7b53b04-bcb2-3d36-919b-e19dff0ee0ea",
+ "version" : 1,
+ "metadata" : {
+"lifecycles" : [
+ {
+"phase" : "build"
+ }
+],
+"tools" : {
+ "components" : [
+{
+ "type" : "library",
+ "author" : "OWASP Foundation",
+ "group" : "org.cyclonedx",
+ "name" : "cyclonedx-maven-plugin",
+ "version" : "2.9.1",
+ "description" : "CycloneDX Maven plugin",
+ "hashes" : [
+{
+ "alg" : "MD5",
+ "content" : "9c7a565cf28cce58557d0c621c5ea4b1"
+},
+{
+ "alg" : "SHA-1",
+ "content" : "be882d5a22050bfa9d19090b1420c188617d0e1c"
+},
+{
+ "alg" : "SHA-256",
+ "content" :
"698e0f37184a5b28c245c4065fd036dfce253b52f82fbb7113d81d36326cc249"
+},
+{
+ "alg" : "SHA-512",
+ "content" :
"c0f0b11026858166f872a2eb54719492e5cecaa0bc9cd6b30b3ecb4a174eed220f4a1b5829d18d6734128e778d3cb3db7ffed177c92866133129cb29081814a0"
+},
+{
+ "alg" : "SHA-384",
+ "content" :
"d80964707dfe5caca8c70521d5066f57589304c0a657e6fbc7c0614ea0fc7b3b3dbe7778361eee0f54ba111e9cb0ffcb"
+},
+{
+ "alg" : "SHA3-384",
+ "content" :
"80bc3a275d9514bc457461ff52a72add8c7ecbbc01d8912efce57139016c544ee776981851be0a58fa977ab4221f703f"
+},
+{
+ "alg" : "SHA3-256",
+ "content" :
"142317d6f245390f4fd2d0c100b16281b8dfc5c0c2cff86943bdcc97039cb699"
+},
+{
+ "alg" : "SHA3-512",
+ "content" :
"af0fb9137c90b65d1a07f72e4d51ae509956cdb8800f35c961b037cdda1fe4a14ce3b496cef71ba85f1621affcfe29cd42704ae4191ff0b090a9602087c8997b"
+}
+ ]
+}
+ ]
+},
+"component" : {
+ "type" : "library",
+ "bom-ref" :
"pkg:maven/org.apache.camel.quarkus/camel-quarkus@3.17.0?type=pom",
+ "publisher" : "The Apache Software Foundation",
+ "group" : "org.apache.camel.quarkus",
+ "name" : "camel-quarkus",
+ "version" : "3.17.0",
+ "description" : "Apache Camel extensions for Quarkus",
+ "licenses" : [
+{
+ "license" : {
+"id" : "Apache-2.0",
+"url" : "https://www.apache.org/licenses/LICENSE-2.0";
+ }
+}
+ ],
+ "purl" :
"pkg:maven/org.apache.camel.quarkus/camel-quarkus@3.17.0?type=pom",
+ "externalReferences" : [
+{
+ "type" : "website",
+ "url" : "http://camel.apache.org";
+},
+{
+ "type" : "distribution-intake",
+ "url" :
"https://repository.apache.org/service/local/staging/deploy/maven2";
+},
+{
+ "type" : "issue-tracker",
+ "url" : "https://github.com/apache/camel-quarkus/issues";
+},
+{
+ "type" : "mailing-list",
+ "url" : "dev-subscr...@camel.apache.org"
+},
+{
+ "type" : "vcs",
+ "url" : "https://github.com/apache/camel-quarkus";
+}
+ ]
+},
+"properties" : [
+ {
+"name" : "maven.goal",
+"value" : "makeAggregateBom"
+ },
+ {
+"name" : "maven.scopes",
+"value" : "compile,provided,runtime,system"
+ },
+ {
+"name" : "cdx:reproducible",
+"value" : "enabled"
+ }
+]
+ },
+ "components" : [
+{
+ "type" : "library",
+ "bom-ref" :
"pkg:maven/org.apache.camel.quarkus/camel-quarkus-poms@3.17.0?type=pom",
+ "publisher" : "The Apache Software Foundation",
+ "group" : "org.apache.camel.quarkus",
+ "name" : "camel-quarkus-poms",
+ "version" : "3.17.0",
+ "description" : "Apache Camel extensions for Quarkus",
+ "licenses" : [
+{
+ "license" : {
+"id" : "Apache-2.0",
+"url" : "https://www.apache.org/licenses/LICENSE-2.0";
+ }
+}
+ ],
+ "purl" :
"pkg:maven/org.apache.camel.quarkus/camel-quarkus-poms@3.17.0?type=pom",
+ "externalReferences" : [
+{
+ "type" : "website",
+ "url" : "http://camel.apache.org/camel-quarkus-poms";
+},
+{
+ "type" : "distribution-intake",
+ "url" :
"https://repository.apache.org/service/local/staging/deploy/maven2";
+},
+{
+ "type" : "issue-tracker",
+
(camel-quarkus) branch main updated: Upgrade to Quarkus CXF 3.17.2
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 387ee6de3a Upgrade to Quarkus CXF 3.17.2
387ee6de3a is described below
commit 387ee6de3a757622f090962bb73e2b6625e4f85d
Author: Peter Palaga
AuthorDate: Wed Dec 4 18:29:31 2024 +0100
Upgrade to Quarkus CXF 3.17.2
---
.../quarkus/component/http/http/HttpProducers.java | 4 +-
pom.xml| 3 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 568 ++---
.../src/main/generated/flattened-reduced-pom.xml | 58 +--
.../generated/flattened-reduced-verbose-pom.xml| 568 ++---
5 files changed, 600 insertions(+), 601 deletions(-)
diff --git
a/integration-test-groups/http/http/src/main/java/org/apache/camel/quarkus/component/http/http/HttpProducers.java
b/integration-test-groups/http/http/src/main/java/org/apache/camel/quarkus/component/http/http/HttpProducers.java
index 4e0c8be5bd..0433d8134a 100644
---
a/integration-test-groups/http/http/src/main/java/org/apache/camel/quarkus/component/http/http/HttpProducers.java
+++
b/integration-test-groups/http/http/src/main/java/org/apache/camel/quarkus/component/http/http/HttpProducers.java
@@ -45,8 +45,8 @@ public class HttpProducers {
authCache.put(new HttpHost("localhost", port), basicAuth);
HttpClientContext context = HttpClientContext.create();
-context.setAuthCache(authCache);
-context.setCredentialsProvider(provider);
+context.setAttribute(HttpClientContext.AUTH_CACHE, authCache);
+context.setAttribute(HttpClientContext.CREDS_PROVIDER, provider);
return context;
}
diff --git a/pom.xml b/pom.xml
index c7a29675e8..88ff557482 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
9.37.0.Final
2.20.0
3.6.0
-3.17.1
+3.17.2
1.1.0
3.17.0
2.2.0
@@ -108,7 +108,6 @@
${hapi-base-version}
${hapi-fhir-version}
6.4.0
-5.2.3
9.4.0.5
${icu4j-version}
${influx-java-driver-version}
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 1c73b3e113..73c1382ebc 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7413,502 +7413,502 @@
3.13.1
-org.apache.cxf
-cxf-core
-4.0.5
+org.apache.cxf
+cxf-core
+4.0.5
-org.apache.cxf
-cxf-rt-features-logging
-4.0.5
+org.apache.cxf
+cxf-rt-features-logging
+4.0.5
-org.apache.cxf
-cxf-rt-features-metrics
-4.0.5
+org.apache.cxf
+cxf-rt-features-metrics
+4.0.5
-org.apache.cxf
-cxf-rt-frontend-jaxws
-4.0.5
+org.apache.cxf
+cxf-rt-frontend-jaxws
+4.0.5
-org.ow2.asm
-asm
+org.ow2.asm
+asm
-org.apache.cxf
-cxf-rt-transports-http
-4.0.5
+org.apache.cxf
+cxf-rt-transports-http
+4.0.5
-org.apache.cxf
-cxf-rt-transports-http-hc5
-4.0.5
+org.apache.cxf
+cxf-rt-transports-http-hc5
+4.0.5
-org.slf4j
-jcl-over-slf4j
+org.slf4j
+jcl-over-slf4j
-org.apache.cxf
-cxf-rt-ws-mex
-4.0.5
+org.apache.cxf
+cxf-rt-ws-mex
+4.0.5
-org.apache.cxf
-cxf-rt-ws-security
-4.0.5
+org.apache.cxf
+cxf-rt-ws-security
+4.0.5
-org.apache.cxf
-cxf-rt-ws-rm
-4.0.5
+org.apache.cxf
+cxf-rt-ws-rm
+4.0.5
-org.apache.cxf
-cxf-rt-wsdl
-4.0.5
+org.apache.cxf
+cxf-rt-wsdl
+4.0.5
-org.ow2.asm
-asm
+org.ow2.asm
+asm
-org.apache.cxf.services.sts
-cxf-services-sts-core
-4.0.5
+org.apache.cxf.services.sts
+cxf-services-sts-core
+4.0.5
-org.apache.cxf.xjcplugins
-cxf-xjc-boolean
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-boolean
+4.0.0
-org.apache.cxf.xjcplugins
-cxf-xjc-dv
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-dv
+
(camel-quarkus) annotated tag 3.17.0 created (now ab0b887b02)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to annotated tag 3.17.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at ab0b887b02 (tag) tagging d10f18f8173b5d2f2941590ced70ba1dc3d649ca (commit) replaces 1.0.0-CR3 by Peter Palaga on Wed Dec 4 23:25:11 2024 +0100 - Log - [maven-release-plugin] copy for tag 3.17.0 --- No new revisions were added by this update.
(camel-quarkus) branch 3.17.x created (now d10f18f817)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch 3.17.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at d10f18f817 [maven-release-plugin] Prepare release 3.17.0 This branch includes the following new commits: new d10f18f817 [maven-release-plugin] Prepare release 3.17.0 The 1 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.
(camel-quarkus-examples) branch camel-quarkus-main updated: Explicitly use locale with en_US in String.format
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch camel-quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
The following commit(s) were added to refs/heads/camel-quarkus-main by this
push:
new eb3b796 Explicitly use locale with en_US in String.format
eb3b796 is described below
commit eb3b796f5b9c635cbf113f5cf2605e928a701eab
Author: Zheng Feng
AuthorDate: Fri Nov 29 17:53:31 2024 +0800
Explicitly use locale with en_US in String.format
---
.../src/main/java/org/acme/extraction/CustomPojoExtractionService.java | 3 ++-
data-extract-langchain4j/src/main/resources/application.properties | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git
a/data-extract-langchain4j/src/main/java/org/acme/extraction/CustomPojoExtractionService.java
b/data-extract-langchain4j/src/main/java/org/acme/extraction/CustomPojoExtractionService.java
index 7f2ecb4..8a6923e 100644
---
a/data-extract-langchain4j/src/main/java/org/acme/extraction/CustomPojoExtractionService.java
+++
b/data-extract-langchain4j/src/main/java/org/acme/extraction/CustomPojoExtractionService.java
@@ -17,6 +17,7 @@
package org.acme.extraction;
import java.time.LocalDate;
+import java.util.Locale;
import dev.langchain4j.service.UserMessage;
import io.quarkiverse.langchain4j.RegisterAiService;
@@ -45,7 +46,7 @@ public interface CustomPojoExtractionService {
+ "}\n";
public String toString() {
-return String.format(FORMAT, this.customerSatisfied,
this.customerName, this.customerBirthday,
+return String.format(Locale.US, FORMAT, this.customerSatisfied,
this.customerName, this.customerBirthday,
this.customerBirthday, this.customerBirthday,
this.summary);
}
}
diff --git a/data-extract-langchain4j/src/main/resources/application.properties
b/data-extract-langchain4j/src/main/resources/application.properties
index da692fb..4fc0b74 100644
--- a/data-extract-langchain4j/src/main/resources/application.properties
+++ b/data-extract-langchain4j/src/main/resources/application.properties
@@ -34,3 +34,6 @@ quarkus.langchain4j.ollama.chat-model.temperature = 0
# Configure Quarkus LangChain4j to keep a single message in memory, forgetting
about previous data extractions
quarkus.langchain4j.chat-memory.memory-window.max-messages = 1
+
+quarkus.native.user-country=US
+quarkus.native.user-language=en
(camel-quarkus) branch main updated (495e84aed8 -> acfc1dbeb1)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 495e84aed8 Upgrade Quarkus to 3.17.2
add 7f0343436a Use standard AsciiDoc formatting in
integration-tests/messaging/README.adoc
add d43943fdd1 Move integration-tests/messaging to
integration-tests-support/messaging
add acfc1dbeb1 Move integration-test-groups/http/common to
integration-tests-support/http
No new revisions were added by this update.
Summary of changes:
integration-test-groups/http/http/pom.xml | 4 +--
integration-test-groups/http/netty-http/pom.xml| 4 +--
integration-test-groups/http/pom.xml | 1 -
integration-test-groups/http/vertx-http/pom.xml| 4 +--
.../http}/pom.xml | 40 +-
.../http/common/AbstractHttpResource.java | 0
.../component/http/common/CommonProducers.java | 0
.../quarkus/component/http/common/HttpService.java | 0
.../src/main/resources/application.properties | 0
.../component/http/common/AbstractHttpTest.java| 0
.../component/http/common/HttpTestResource.java| 0
.../messaging/README.adoc | 12 +++
.../messaging/common/pom.xml | 23 +++--
.../messaging/it/MessagingCommonResource.java | 0
.../messaging/it/MessagingCommonRoutes.java| 0
.../messaging/it/MessagingPojoConsumer.java| 0
.../quarkus/component/messaging/it/Person.java | 0
.../it/util/resolver/JmsMessageResolver.java | 0
.../util/resolver/JmsMessageResolverProducer.java | 0
.../messaging/it/util/scheme/ComponentScheme.java | 0
.../scheme/MessagingComponentSchemeProducer.java | 0
.../src/main/resources/application.properties | 0
.../messaging/it/AbstractMessagingTest.java| 0
.../messaging/jms/pom.xml | 28 ---
.../quarkus/messaging/jms/DummyXAResource.java | 0
.../camel/quarkus/messaging/jms/JmsProducers.java | 0
.../camel/quarkus/messaging/jms/JmsResource.java | 0
.../camel/quarkus/messaging/jms/JmsRoutes.java | 0
.../jms/util/JmsMessageResolverProducer.java | 0
.../messaging/jms/AbstractJmsMessagingTest.java| 0
.../messaging/pom.xml | 31 ++---
.../messaging/sjms/pom.xml | 28 ---
.../quarkus/messaging/sjms/SjmsProducers.java | 0
.../camel/quarkus/messaging/sjms/SjmsResource.java | 0
.../camel/quarkus/messaging/sjms/SjmsRoutes.java | 0
.../sjms/util/JmsMessageResolverProducer.java | 0
.../messaging/sjms/AbstractSjmsMessagingTest.java | 0
integration-tests-support/pom.xml | 2 ++
integration-tests/activemq/pom.xml | 6 ++--
integration-tests/amqp/pom.xml | 6 ++--
integration-tests/http-grouped/pom.xml | 10 ++
integration-tests/jms-artemis-client/pom.xml | 6 ++--
integration-tests/jms-ibmmq-client/pom.xml | 6 ++--
integration-tests/jms-qpid-amqp-client/pom.xml | 6 ++--
integration-tests/pom.xml | 1 -
integration-tests/sjms-artemis-client/pom.xml | 6 ++--
integration-tests/sjms-qpid-amqp-client/pom.xml| 6 ++--
integration-tests/sjms2-artemis-client/pom.xml | 6 ++--
integration-tests/sjms2-qpid-amqp-client/pom.xml | 6 ++--
poms/bom-test/pom.xml | 16 -
50 files changed, 134 insertions(+), 124 deletions(-)
rename {integration-test-groups/http/common =>
integration-tests-support/http}/pom.xml (76%)
rename {integration-test-groups/http/common =>
integration-tests-support/http}/src/main/java/org/apache/camel/quarkus/component/http/common/AbstractHttpResource.java
(100%)
rename {integration-test-groups/http/common =>
integration-tests-support/http}/src/main/java/org/apache/camel/quarkus/component/http/common/CommonProducers.java
(100%)
rename {integration-test-groups/http/common =>
integration-tests-support/http}/src/main/java/org/apache/camel/quarkus/component/http/common/HttpService.java
(100%)
rename {integration-test-groups/http/common =>
integration-tests-support/http}/src/main/resources/application.properties (100%)
rename {integration-test-groups/http/common =>
integration-tests-support/http}/src/test/java/org/apache/camel/quarkus/component/http/common/AbstractHttpTest.java
(100%)
rename {integration-test-groups/http/common =>
integration-tests-support/http}/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java
(100%)
rename {integration-tests => integration-tests-support}/messaging/README.adoc
(96%)
rename {integration-tests =>
integration-tests-support}/messaging/common/pom.xml (89%)
rename {integration-tests =>
integration-tests-supp
(camel-quarkus) branch main updated (6223d7186d -> e97a134a69)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 6223d7186d Use target directory for Narayana object store location add e97a134a69 Fix #6754 to remove exlusion of findbugs when depends on quarkus-grpc-common No new revisions were added by this update. Summary of changes: extensions/google-bigquery/deployment/pom.xml | 10 - extensions/google-bigquery/pom.xml| 4 ++ extensions/google-bigquery/runtime/pom.xml| 4 -- extensions/google-pubsub/deployment/pom.xml | 10 - extensions/google-pubsub/pom.xml | 4 ++ extensions/google-pubsub/runtime/pom.xml | 4 -- extensions/grpc/deployment/pom.xml| 22 - extensions/grpc/pom.xml | 63 ++ extensions/pinecone/deployment/pom.xml| 6 --- extensions/pinecone/pom.xml | 4 ++ extensions/pinecone/runtime/pom.xml | 6 --- extensions/qdrant/deployment/pom.xml | 10 - extensions/qdrant/pom.xml | 4 ++ extensions/qdrant/runtime/pom.xml | 6 --- extensions/salesforce/pom.xml | 64 +++ extensions/salesforce/runtime/pom.xml | 4 -- integration-tests/google-bigquery/pom.xml | 4 ++ integration-tests/google-pubsub/pom.xml | 4 ++ integration-tests/grpc/pom.xml| 60 ++--- integration-tests/pinecone/pom.xml| 4 ++ integration-tests/qdrant/pom.xml | 4 ++ integration-tests/salesforce/pom.xml | 60 ++--- pom.xml | 36 +-- tooling/enforcer-rules/allow-findbugs.xsl | 8 +++- 24 files changed, 88 insertions(+), 317 deletions(-)
(camel-quarkus) branch main updated (1979399f2c -> 556e32ee9d)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 1979399f2c Upgrade Quarkus CXF to 3.16.0 new ddb242df30 Bump quarkiverse-cxf.version from 3.16.0 to 3.16.1 new 556e32ee9d Auto generated changes for dependabot commit ec913c497f94bb90346d8af77e0227ab39324cd4 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: pom.xml| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 572 ++--- .../src/main/generated/flattened-reduced-pom.xml | 52 +- .../generated/flattened-reduced-verbose-pom.xml| 572 ++--- 4 files changed, 599 insertions(+), 599 deletions(-)
(camel-quarkus) 02/02: Auto generated changes for dependabot commit ec913c497f94bb90346d8af77e0227ab39324cd4
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 556e32ee9d53bd3ff4c4262cf920d677f23cb9bb Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Oct 24 22:14:00 2024 + Auto generated changes for dependabot commit ec913c497f94bb90346d8af77e0227ab39324cd4 --- poms/bom/src/main/generated/flattened-full-pom.xml | 572 ++--- .../src/main/generated/flattened-reduced-pom.xml | 52 +- .../generated/flattened-reduced-verbose-pom.xml| 572 ++--- 3 files changed, 598 insertions(+), 598 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 7f408dfbb4..71a6e3eb53 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7513,508 +7513,508 @@ 3.13.1 -org.apache.cxf -cxf-core -4.0.5 +org.apache.cxf +cxf-core +4.0.5 -org.apache.cxf -cxf-rt-features-logging -4.0.5 +org.apache.cxf +cxf-rt-features-logging +4.0.5 -org.apache.cxf -cxf-rt-features-metrics -4.0.5 +org.apache.cxf +cxf-rt-features-metrics +4.0.5 -org.apache.cxf -cxf-rt-frontend-jaxws -4.0.5 +org.apache.cxf +cxf-rt-frontend-jaxws +4.0.5 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf -cxf-rt-transports-http -4.0.5 +org.apache.cxf +cxf-rt-transports-http +4.0.5 -org.apache.cxf -cxf-rt-transports-http-hc5 -4.0.5 +org.apache.cxf +cxf-rt-transports-http-hc5 +4.0.5 -org.slf4j -jcl-over-slf4j +org.slf4j +jcl-over-slf4j -org.apache.cxf -cxf-rt-ws-mex -4.0.5 +org.apache.cxf +cxf-rt-ws-mex +4.0.5 -org.apache.cxf -cxf-rt-ws-security -4.0.5 +org.apache.cxf +cxf-rt-ws-security +4.0.5 -org.apache.cxf -cxf-rt-ws-rm -4.0.5 +org.apache.cxf +cxf-rt-ws-rm +4.0.5 -org.apache.cxf -cxf-rt-wsdl -4.0.5 +org.apache.cxf +cxf-rt-wsdl +4.0.5 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf.services.sts -cxf-services-sts-core -4.0.5 +org.apache.cxf.services.sts +cxf-services-sts-core +4.0.5 -org.apache.cxf.xjcplugins -cxf-xjc-boolean -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-boolean +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-dv -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-dv +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-javadoc -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-javadoc +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-pl -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-pl +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-ts -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-ts +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-wsdlextension -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-wsdlextension +4.0.0 -org.apache.cxf.xjc-utils -cxf-xjc-runtime -4.0.0 +org.apache.cxf.xjc-utils +cxf-xjc-runtime +4.0.0 -org.apache.santuario -xmlsec -3.0.4 +org.apache.santuario +xmlsec +3.0.4 -io.quarkiverse.cxf -quarkus-cxf -3.16.0 +io.quarkiverse.cxf +quarkus-cxf +3.16.1 -io.quarkiverse.cxf -quarkus-cxf-axiom-api-stub -3.16.0 +io.quarkiverse.cxf +quarkus-cxf-axiom-api-stub +3.16.1 -io.quarkiverse.cxf -quarkus-cxf-deployment -3.16.0 +io.quarkiverse.cxf +quarkus-cxf-deployment +3.16.1 -io.quarkiverse.cxf - quarkus-cxf-integration-tracing-opentelemetry -
(camel-quarkus) 01/02: Bump quarkiverse-cxf.version from 3.16.0 to 3.16.1
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit ddb242df30ffa261a9220bbc5abf4ab62bd64fb2 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Oct 24 22:10:47 2024 + Bump quarkiverse-cxf.version from 3.16.0 to 3.16.1 Bumps `quarkiverse-cxf.version` from 3.16.0 to 3.16.1. Updates `io.quarkiverse.cxf:quarkus-cxf-bom` from 3.16.0 to 3.16.1 - [Release notes](https://github.com/quarkiverse/quarkiverse-cxf/releases) - [Commits](https://github.com/quarkiverse/quarkiverse-cxf/compare/3.16.0...3.16.1) Updates `io.quarkiverse.cxf:quarkus-cxf-bom-test` from 3.16.0 to 3.16.1 - [Release notes](https://github.com/quarkiverse/quarkiverse-cxf/releases) - [Commits](https://github.com/quarkiverse/quarkiverse-cxf/compare/3.16.0...3.16.1) --- updated-dependencies: - dependency-name: io.quarkiverse.cxf:quarkus-cxf-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkiverse.cxf:quarkus-cxf-bom-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4db8d5e76..ce3f5089d6 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 9.37.0.Final 2.18.1 3.5.0 -3.16.0 +3.16.1 1.1.0 3.15.0 2.1.0
(camel-quarkus) 01/02: Upgrade Quarkus to 3.17.0.CR1
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 797766653c459dd4ff4c9e091a3ef517fe2195da Author: James Netherton AuthorDate: Fri Oct 18 07:12:46 2024 +0100 Upgrade Quarkus to 3.17.0.CR1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99570c550c..081974c34f 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.2.4 2.6.0 2.0.4 -3.16.0.CR1 +999-SNAPSHOT 4.0.0 2.7.1
(camel-quarkus) 02/02: UpdateExtensionDocPageMojo is broken, fix #6418
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4a39502c05317fe59471bcd6c77a8b3d905f8115
Author: Peter Palaga
AuthorDate: Mon Oct 21 11:38:59 2024 +0200
UpdateExtensionDocPageMojo is broken, fix #6418
---
.../quarkus/maven/UpdateExtensionDocPageMojo.java | 28 ++
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
index 294576f9cc..525e78a4cf 100644
---
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
+++
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
@@ -46,9 +46,11 @@ import freemarker.template.utility.DeepUnwrap;
import
io.quarkus.annotation.processor.documentation.config.merger.JavadocMerger;
import
io.quarkus.annotation.processor.documentation.config.merger.JavadocRepository;
import io.quarkus.annotation.processor.documentation.config.merger.MergedModel;
+import
io.quarkus.annotation.processor.documentation.config.merger.MergedModel.ConfigRootKey;
import io.quarkus.annotation.processor.documentation.config.merger.ModelMerger;
import
io.quarkus.annotation.processor.documentation.config.model.AbstractConfigItem;
import
io.quarkus.annotation.processor.documentation.config.model.ConfigProperty;
+import
io.quarkus.annotation.processor.documentation.config.model.ConfigProperty.PropertyPath;
import io.quarkus.annotation.processor.documentation.config.model.ConfigRoot;
import io.quarkus.annotation.processor.documentation.config.model.Extension;
import
io.quarkus.annotation.processor.documentation.config.model.JavadocElements.JavadocElement;
@@ -87,10 +89,8 @@ public class UpdateExtensionDocPageMojo extends
AbstractDocGeneratorMojo {
private static final String TOOLTIP_MACRO = "tooltip:%s[%s]";
private static final String MORE_INFO_ABOUT_TYPE_FORMAT =
"link:#%s[icon:question-circle[title=More information about the %s format]]";
-// TODO: Revert the default back to false
-// https://github.com/apache/camel-quarkus/issues/6418
-@Parameter(defaultValue = "true", property =
"camel-quarkus.update-extension-doc-page.skip")
-boolean skip = true;
+@Parameter(defaultValue = "false", property =
"camel-quarkus.update-extension-doc-page.skip")
+boolean skip = false;
@Parameter(defaultValue = "${project}", readonly = true)
MavenProject project;
@@ -487,10 +487,9 @@ public class UpdateExtensionDocPageMojo extends
AbstractDocGeneratorMojo {
final JavadocRepository javadocRepository =
JavadocMerger.mergeJavadocElements(targetDirectories);
final MergedModel mergedModel =
ModelMerger.mergeModel(targetDirectories);
-for (Entry>
extensionConfigRootsEntry : mergedModel
-.getConfigRoots().entrySet()) {
-for (Entry configRootEntry
: extensionConfigRootsEntry.getValue()
-.entrySet()) {
+for (Entry>
extensionConfigRootsEntry : mergedModel.getConfigRoots()
+.entrySet()) {
+for (Entry configRootEntry :
extensionConfigRootsEntry.getValue().entrySet()) {
final ConfigRoot configRoot = configRootEntry.getValue();
for (AbstractConfigItem configItem : configRoot.getItems()) {
if (configItem instanceof ConfigProperty) {
@@ -592,19 +591,18 @@ public class UpdateExtensionDocPageMojo extends
AbstractDocGeneratorMojo {
public static ConfigItem of(ConfigProperty configDocItem,
JavadocRepository javadocRepository, String artifactIdBase) {
final Optional javadoc = javadocRepository
-.getElement(configDocItem.getSourceClass(),
configDocItem.getSourceName());
+.getElement(configDocItem.getSourceType(),
configDocItem.getSourceElementName());
+final PropertyPath itemPath = configDocItem.getPath();
if (javadoc.isEmpty()) {
-throw new IllegalStateException("No JavaDoc for " +
configDocItem.getPath() + " alias "
-+ configDocItem.getSourceClass() + "#" +
configDocItem.getSourceName());
+throw new IllegalStateException("No JavaDoc for " +
itemPath.property() + " alias "
++ configDocItem.getSourceType() + "#" +
configDocItem.getSourceElementName());
}
final String adocSource =
LINK_PATTERN.matcher(javadoc.get().description()).replaceAll("xref:$1.adoc");
final String illustration
(camel-quarkus) branch quarkus-main updated (31d229c999 -> 4a39502c05)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard 31d229c999 Upgrade Quarkus to 3.17.0.CR1
add e2a38e25c6 langchain4j: fix link to camel core parameter binding usage
add fea7adeea3 Fix Camel header documentation
add c22a9e566f Regen SBOM from commit
fea7adeea382afd3e86d8fcf54c9308139f5ab2c (#6665)
new 797766653c Upgrade Quarkus to 3.17.0.CR1
new 4a39502c05 UpdateExtensionDocPageMojo is broken, fix #6418
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 (31d229c999)
\
N -- N -- N refs/heads/quarkus-main (4a39502c05)
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:
camel-quarkus-sbom/camel-quarkus-sbom.json | 19726 +--
camel-quarkus-sbom/camel-quarkus-sbom.xml | 18999 +-
.../ROOT/examples/js/{quarkus.js => camel.js} |29 +-
.../pages/reference/extensions/langchain4j.adoc| 2 +-
.../ROOT/partials/component-endpoint-headers.adoc | 2 +-
.../runtime/src/main/doc/configuration.adoc| 2 +-
.../quarkus/maven/UpdateExtensionDocPageMojo.java |28 +-
7 files changed, 19143 insertions(+), 19645 deletions(-)
copy docs/modules/ROOT/examples/js/{quarkus.js => camel.js} (54%)
(camel) branch main updated: Ban com.sun.xml.bind:jaxb-impl, replace it with jaxb-runtime where needed
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 651957d7083 Ban com.sun.xml.bind:jaxb-impl, replace it with
jaxb-runtime where needed
651957d7083 is described below
commit 651957d7083e8915a14120539d393681d97717ba
Author: Peter Palaga
AuthorDate: Tue Aug 27 16:21:21 2024 +0200
Ban com.sun.xml.bind:jaxb-impl, replace it with jaxb-runtime where needed
---
apache-camel/pom.xml | 1 +
catalog/camel-allcomponents/pom.xml| 4 +++
components/camel-jaxb/pom.xml | 12 ---
components/camel-jmx/pom.xml | 5 ++-
components/camel-parquet-avro/pom.xml | 4 +++
.../camel-salesforce-component/pom.xml | 5 ++-
components/camel-soap/pom.xml | 14
components/camel-swift/pom.xml | 10 ++
core/camel-xml-jaxb/pom.xml| 10 ++
docs/pom.xml | 2 ++
.../ROOT/pages/camel-4x-upgrade-guide-4_8.adoc | 8 +
dsl/camel-componentdsl/pom.xml | 1 +
dsl/camel-endpointdsl/pom.xml | 3 +-
pom.xml| 40 +-
tests/camel-itest/pom.xml | 11 +-
tooling/{ => enforcer-rules}/pom.xml | 24 +++--
.../main/resources/camel-banned-dependencies.xml | 29
tooling/pom.xml| 1 +
18 files changed, 90 insertions(+), 94 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index b2ae6d9cae3..7b97c774362 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -39,6 +39,7 @@
true
gnu
+none
diff --git a/catalog/camel-allcomponents/pom.xml
b/catalog/camel-allcomponents/pom.xml
index 63baf6c9a69..b86ebc70de2 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -32,6 +32,10 @@
Camel :: All Components Sync point
Depends on all components to ensure correct build
ordering
+
+none
+
+
atlassian
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index af10c0f633b..5faf0d507a9 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -47,18 +47,6 @@
camel-xml-jaxp
-
-com.sun.xml.bind
-jaxb-core
-${jaxb-core-version}
-
-
-com.sun.xml.bind
-jaxb-impl
-${jaxb-impl-version}
-true
-
-
org.junit.jupiter
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 92bf4d160fd..167e934247b 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -51,9 +51,8 @@
-com.sun.xml.bind
-jaxb-impl
-${jaxb-impl-version}
+org.glassfish.jaxb
+jaxb-runtime
diff --git a/components/camel-parquet-avro/pom.xml
b/components/camel-parquet-avro/pom.xml
index d75eb7ed1c2..a177efd25b6 100644
--- a/components/camel-parquet-avro/pom.xml
+++ b/components/camel-parquet-avro/pom.xml
@@ -31,6 +31,10 @@
Camel :: Parquet Avro
Camel ParquetAvro DataFormat
+
+none
+
+
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml
b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 8e4036e0543..b8ba829c277 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -116,9 +116,8 @@
-com.sun.xml.bind
-jaxb-impl
-${jaxb-impl-version}
+org.glassfish.jaxb
+jaxb-runtime
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index cbe9e4a301d..a643bb5cceb 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -46,11 +46,6 @@
camel-jaxb
-
-com.sun.xml.bind
-jaxb-impl
-${jaxb-impl-version}
-
jakarta.xml.ws
jakarta.xml.ws-api
@@ -112,15 +107,6 @@
${spring-version}
test
-
-
-
-com.sun.xml.bind
-jaxb-osgi
-${jaxb-osgi-version}
-test
-
-
diff --git a/components/camel-swift/pom.xml b/components/camel-swift/pom.xml
index 340df8536e0..3651676c360 100644
--- a/components/camel-sw
(camel-quarkus) branch main updated: Bump cq-plugin.version from 4.10.1 to 4.10.2
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 7b364ffc31 Bump cq-plugin.version from 4.10.1 to 4.10.2 7b364ffc31 is described below commit 7b364ffc31653e9e7b0bf1496a76b150c9cf5e85 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Aug 23 21:48:16 2024 + Bump cq-plugin.version from 4.10.1 to 4.10.2 Bumps `cq-plugin.version` from 4.10.1 to 4.10.2. Updates `org.l2x6.cq:cq-filtered-external-enforcer-rules` from 4.10.1 to 4.10.2 - [Commits](https://github.com/l2x6/cq-maven-plugin/compare/4.10.1...4.10.2) Updates `org.l2x6.cq:cq-maven-plugin` from 4.10.1 to 4.10.2 - [Commits](https://github.com/l2x6/cq-maven-plugin/compare/4.10.1...4.10.2) --- updated-dependencies: - dependency-name: org.l2x6.cq:cq-filtered-external-enforcer-rules dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.l2x6.cq:cq-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9aa2164617..b049c9b836 100644 --- a/pom.xml +++ b/pom.xml @@ -190,7 +190,7 @@ 0.1.0 -4.10.1 +4.10.2 2.8.1 3.6.0 3.4.1
(camel-quarkus) branch 3.8.x updated: Upgrade to cq-maven-plugin 4.6.11
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/3.8.x by this push: new 26371abb0b Upgrade to cq-maven-plugin 4.6.11 26371abb0b is described below commit 26371abb0bbdc5204b04ddc0b32655bfda6e5953 Author: Peter Palaga AuthorDate: Fri Aug 23 18:22:25 2024 +0200 Upgrade to cq-maven-plugin 4.6.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 847093ae94..ad71f9eef9 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ 0.1.0 -4.6.9 +4.6.11 2.7.11 3.5.0 3.1.1
(camel-quarkus) branch main updated (af456de2bb -> 05bdba7b27)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from af456de2bb Disable extension tests that use kubernetes-client due to #6348 new 889904bc7c Revert "Disable update-extension-doc-page due to #6334" new 05bdba7b27 Adapt update-extension-doc-page mojo to Quarkus 3.14.0.CR1 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: .../ROOT/pages/reference/extensions/core.adoc | 28 ++- .../ROOT/pages/reference/extensions/cxf-soap.adoc | 21 ++ .../ROOT/pages/reference/extensions/debug.adoc | 4 +- .../reference/extensions/file-cluster-service.adoc | 20 +- .../ROOT/pages/reference/extensions/graphql.adoc | 2 +- .../ROOT/pages/reference/extensions/grpc.adoc | 4 +- .../ROOT/pages/reference/extensions/jfr.adoc | 6 +- .../ROOT/pages/reference/extensions/kamelet.adoc | 2 +- .../extensions/kubernetes-cluster-service.adoc | 22 +- .../pages/reference/extensions/micrometer.adoc | 4 +- .../pages/reference/extensions/openapi-java.adoc | 19 ++ .../ROOT/pages/reference/extensions/servlet.adoc | 8 +- .../ROOT/pages/reference/extensions/xslt.adoc | 4 +- extensions-core/core-cloud/runtime/pom.xml | 28 --- extensions-core/core/runtime/pom.xml | 28 --- extensions-core/http-common/pom.xml| 5 + extensions-core/pom.xml| 27 +++ extensions-core/reactive-executor/runtime/pom.xml | 28 --- .../threadpoolfactory-vertx/runtime/pom.xml| 28 --- extensions-core/xml-io-dsl/runtime/pom.xml | 28 --- extensions-core/xml-jaxb/runtime/pom.xml | 28 --- extensions-core/xml-jaxp/runtime/pom.xml | 28 --- extensions-core/yaml-dsl/runtime/pom.xml | 28 --- extensions-core/yaml-io/runtime/pom.xml| 28 --- extensions-jvm/asn1/runtime/pom.xml| 28 --- extensions-jvm/asterisk/runtime/pom.xml| 28 --- extensions-jvm/aws-secrets-manager/runtime/pom.xml | 28 --- extensions-jvm/aws-xray/runtime/pom.xml| 28 --- extensions-jvm/azure-cosmosdb/runtime/pom.xml | 28 --- extensions-jvm/azure-servicebus/runtime/pom.xml| 28 --- .../azure-storage-datalake/runtime/pom.xml | 28 --- extensions-jvm/barcode/runtime/pom.xml | 28 --- extensions-jvm/beanio/runtime/pom.xml | 28 --- extensions-jvm/bonita/runtime/pom.xml | 28 --- extensions-jvm/chatscript/runtime/pom.xml | 28 --- extensions-jvm/chunk/runtime/pom.xml | 28 --- extensions-jvm/cli-connector/runtime/pom.xml | 28 --- extensions-jvm/cm-sms/runtime/pom.xml | 28 --- extensions-jvm/coap/runtime/pom.xml| 28 --- extensions-jvm/cometd/runtime/pom.xml | 28 --- extensions-jvm/console/runtime/pom.xml | 28 --- extensions-jvm/couchbase/runtime/pom.xml | 28 --- extensions-jvm/djl/runtime/pom.xml | 28 --- extensions-jvm/dns/runtime/pom.xml | 28 --- extensions-jvm/drill/runtime/pom.xml | 28 --- extensions-jvm/dsl-modeline/runtime/pom.xml| 28 --- extensions-jvm/ehcache/runtime/pom.xml | 28 --- extensions-jvm/elasticsearch/runtime/pom.xml | 28 --- extensions-jvm/etcd3/runtime/pom.xml | 28 --- extensions-jvm/fastjson/runtime/pom.xml| 28 --- extensions-jvm/flink/runtime/pom.xml | 28 --- extensions-jvm/google-functions/runtime/pom.xml| 28 --- .../google-secret-manager/runtime/pom.xml | 28 --- extensions-jvm/guava-eventbus/runtime/pom.xml | 28 --- extensions-jvm/hashicorp-vault/runtime/pom.xml | 28 --- extensions-jvm/huaweicloud-smn/runtime/pom.xml | 28 --- extensions-jvm/iec60870/runtime/pom.xml| 28 --- extensions-jvm/ignite/runtime/pom.xml | 28 --- extensions-jvm/irc/runtime/pom.xml | 28 --- extensions-jvm/jcr/runtime/pom.xml | 28 --- extensions-jvm/jgroups-raft/runtime/pom.xml| 28 --- extensions-jvm/jgroups/runtime/pom.xml | 28 --- extensions-jvm/jooq/runtime/pom.xml| 28 --- extensions-jvm/json-patch/runtime/pom.xml | 28 --- extensions-jvm/jsonapi/runtime/pom.xml | 28 --- .../langchain4j-embeddings/runtime/pom.xml | 28 --- extensions-jvm/ldif/runtime/pom.xml| 28 --- extensions-jvm/lucene/runtime/pom.xml | 28 --- .../mail-microsoft-oauth/runtime/pom.xml | 28 --- extensions-jvm/milvus/runt
(camel-quarkus) 01/02: Revert "Disable update-extension-doc-page due to #6334"
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 889904bc7ce6268559bc3ae79c2a53e4de551ffb
Author: Peter Palaga
AuthorDate: Wed Aug 14 15:36:58 2024 +0200
Revert "Disable update-extension-doc-page due to #6334"
This reverts commit 7cec076df5e12d09a13f303e6c9bb4ff9bad2e50.
---
.../quarkus/maven/UpdateExtensionDocPageMojo.java | 77 +++---
1 file changed, 40 insertions(+), 37 deletions(-)
diff --git
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
index af474b669b..6e72fe6ba1 100644
---
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
+++
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
@@ -23,6 +23,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.text.Normalizer;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -35,11 +36,18 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import freemarker.template.Configuration;
import freemarker.template.TemplateMethodModelEx;
import freemarker.template.TemplateModel;
import freemarker.template.TemplateModelException;
import freemarker.template.utility.DeepUnwrap;
+import io.quarkus.annotation.processor.Constants;
+import io.quarkus.annotation.processor.generate_doc.ConfigDocItem;
+import io.quarkus.annotation.processor.generate_doc.ConfigDocKey;
+import io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil;
+import io.quarkus.annotation.processor.generate_doc.FsMap;
import org.apache.camel.quarkus.maven.processor.AppendNewLinePostProcessor;
import org.apache.camel.quarkus.maven.processor.AsciiDocFile;
import org.apache.camel.quarkus.maven.processor.DocumentationPostProcessor;
@@ -70,9 +78,8 @@ public class UpdateExtensionDocPageMojo extends
AbstractDocGeneratorMojo {
kind.equals(Kind.other);
};
-@Parameter(defaultValue = "true", property =
"camel-quarkus.update-extension-doc-page.skip")
-// TODO: Restore this back to false.
https://github.com/apache/camel-quarkus/issues/6334
-boolean skip = true;
+@Parameter(defaultValue = "false", property =
"camel-quarkus.update-extension-doc-page.skip")
+boolean skip = false;
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@@ -436,28 +443,25 @@ public class UpdateExtensionDocPageMojo extends
AbstractDocGeneratorMojo {
throw new IllegalStateException("You should run " +
UpdateExtensionDocPageMojo.class.getSimpleName()
+ " after compilation with
io.quarkus.annotation.processor.ExtensionAnnotationProcessor");
}
-// TODO: https://github.com/apache/camel-quarkus/issues/6334
-//final FsMap configRootsModels = new
FsMap(configRootsModelsDir);
-//
-//final ObjectMapper mapper = new ObjectMapper();
-//final List configDocItems = new ArrayList<>();
-//for (String configRootClass : configRootClasses) {
-//final String rawModel =
configRootsModels.get(configRootClass);
-//if (rawModel == null) {
-//throw new IllegalStateException("Could not find " +
configRootClass + " in " + configRootsModelsDir);
-//}
-//try {
-//final List items =
mapper.readValue(rawModel, Constants.LIST_OF_CONFIG_ITEMS_TYPE_REF);
-//configDocItems.addAll(items);
-//} catch (JsonProcessingException e) {
-//throw new RuntimeException("Could not parse " +
rawModel, e);
-//}
-//
-//}
-//DocGeneratorUtil.sort(configDocItems);
-//return
configDocItems.stream().map(ConfigItem::of).collect(Collectors.toList());
-// TODO: https://github.com/apache/camel-quarkus/issues/6334
-return Collections.emptyList();
+final FsMap configRootsModels = new FsMap(configRootsModelsDir);
+
+final ObjectMapper mapper = new ObjectMapper();
+final List configDocItems = new ArrayList<>();
+for (String configRootClass : configRootClasses) {
+final String rawModel = configRootsModels.get(configRootClass);
+
(camel-quarkus) branch main updated: Extracion of crypto-pgp and making crypto work on FIPS
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new ed8156c111 Extracion of crypto-pgp and making crypto work on FIPS
ed8156c111 is described below
commit ed8156c111655deea7f2bb65bfe5a5529633925c
Author: JiriOndrusek
AuthorDate: Fri Jun 28 14:37:06 2024 +0200
Extracion of crypto-pgp and making crypto work on FIPS
---
catalog/pom.xml| 13 +
docs/modules/ROOT/examples/dataformats/pgp.yml | 13 +
docs/modules/ROOT/nav.adoc | 1 +
.../pages/reference/extensions/crypto-pgp.adoc | 55 ++
.../ROOT/pages/reference/extensions/crypto.adoc| 42 ++
.../deployment/BouncyCastleSupportProcessor.java | 62 +++--
.../support/bouncycastle/BouncyCastleRecorder.java | 25 -
.../{crypto => crypto-pgp}/deployment/pom.xml | 14 +++--
.../crypto/pgp/deployment/CryptoPgpProcessor.java} | 20 ++-
extensions/crypto-pgp/pom.xml | 39 +
extensions/{crypto => crypto-pgp}/runtime/pom.xml | 29 --
.../runtime/src/main/doc/limitations.adoc | 4 ++
.../main/resources/META-INF/quarkus-extension.yaml | 32 +++
extensions/crypto/deployment/pom.xml | 4 --
.../crypto/deployment/CryptoProcessor.java | 33 ---
extensions/crypto/runtime/pom.xml | 12
.../crypto/runtime/src/main/doc/limitations.adoc | 2 +
extensions/crypto/runtime/src/main/doc/usage.adoc | 29 ++
extensions/pom.xml | 1 +
integration-tests/{crypto => crypto-pgp}/pom.xml | 29 +-
.../component/crypto/pgp/it/CryptoPgpResource.java | 48
.../component/crypto/pgp/it/CryptoPgpRoutes.java | 34 +++
.../src/main/resources/application.properties | 2 +-
.../src/main/resources/pubring.pgp | Bin
.../src/main/resources/secring.pgp | Bin
.../component/crypto/pgp/it/CryptoPgpIT.java | 24
.../component/crypto/pgp/it/CryptoPgpTest.java | 51 +
integration-tests/crypto/README.adoc | 8 +++
integration-tests/crypto/pom.xml | 56 +--
.../component/crypto/it/CryptoResource.java| 13 -
.../quarkus/component/crypto/it/CryptoRoutes.java | 23 +++-
.../src/main/resources/application.properties | 6 +-
.../quarkus/component/crypto/it/CryptoTest.java| 27 +
integration-tests/pom.xml | 1 +
poms/bom/pom.xml | 28 ++
poms/bom/src/main/generated/flattened-full-pom.xml | 28 ++
.../src/main/generated/flattened-reduced-pom.xml | 28 ++
.../generated/flattened-reduced-verbose-pom.xml| 28 ++
tooling/scripts/test-categories.yaml | 1 +
39 files changed, 682 insertions(+), 183 deletions(-)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index e2e7d98caf..7abd52b061 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -968,6 +968,19 @@
+
+org.apache.camel.quarkus
+camel-quarkus-crypto-pgp
+${project.version}
+pom
+test
+
+
+*
+*
+
+
+
org.apache.camel.quarkus
camel-quarkus-csimple
diff --git a/docs/modules/ROOT/examples/dataformats/pgp.yml
b/docs/modules/ROOT/examples/dataformats/pgp.yml
new file mode 100644
index 00..6252f544f9
--- /dev/null
+++ b/docs/modules/ROOT/examples/dataformats/pgp.yml
@@ -0,0 +1,13 @@
+# Do not edit directly!
+# This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+cqArtifactId: camel-quarkus-crypto-pgp
+cqArtifactIdBase: crypto-pgp
+cqNativeSupported: true
+cqStatus: Stable
+cqDeprecated: false
+cqJvmSince: 3.13.0
+cqNativeSince: 3.13.0
+cqCamelPartName: pgp
+cqCamelPartTitle: PGP
+cqCamelPartDescription: Encrypt and decrypt messages using Java Cryptographic
Extension (JCE) and PGP.
+cqExtensionPageTitle: PGP
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index a4a0aaa6bb..6da7470cc0 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -235,6 +235,7 @@
*** xref:reference/extensions/opentelemetry.adoc[OpenTelemetry]
*** xref:reference/extensions/optaplanner.adoc[OptaPlanner]
*** xref:reference/extensions/pdf.adoc[PDF]
+*** xref:reference/extensions/crypto-pgp.adoc[PGP]
*** xref:reference/extensions/paho.adoc[Paho]
*** xref:reference/extensions/paho-mqtt5.adoc[Paho MQTT5]
*** xref:reference/e
(camel-quarkus) branch 3.8.x updated: Avoid dependency misconvergence when extensions are used together
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.8.x by this push:
new 0f121f09a1 Avoid dependency misconvergence when extensions are used
together
0f121f09a1 is described below
commit 0f121f09a15bd5cdca59101a8eae383794692ac1
Author: Peter Palaga
AuthorDate: Wed Aug 7 11:40:42 2024 +0200
Avoid dependency misconvergence when extensions are used together
---
pom.xml| 5 +++
poms/bom/pom.xml | 40 ++
poms/bom/src/main/generated/flattened-full-pom.xml | 40 ++
.../src/main/generated/flattened-reduced-pom.xml | 30
.../generated/flattened-reduced-verbose-pom.xml| 30
5 files changed, 145 insertions(+)
diff --git a/pom.xml b/pom.xml
index f6f768a1d0..847093ae94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,8 +88,10 @@
3.1.5
${commons-beanutils-version}
1.4
+
${commons-collections-version}
${commons-exec-version}
2.6
+
${commons-validator-version}
${metrics-version}
${eddsa-version}
0.5.0
@@ -145,11 +147,14 @@
4.12.0
3.6.0
0.31.0
+20240303
0.26.0
3.25.0
+1.7
3.4.34
${reactor-netty-version}
2.9.0
+3.1.8
4.18.0
2.2
${snakeyaml-engine-version}
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index d23ed9ac8e..fc12bf9683 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6312,6 +6312,11 @@
+
+com.google.re2j
+re2j
+${re2j.version}
+
com.ibm.icu
icu4j
@@ -6389,6 +6394,21 @@
okio
${okio.version}
+
+com.squareup.okio
+okio-fakefilesystem
+${okio.version}
+
+
+com.squareup.okio
+okio-fakefilesystem-jvm
+${okio.version}
+
+
+com.squareup.okio
+okio-jvm
+${okio.version}
+
com.squareup.retrofit2
converter-jackson
@@ -6415,11 +6435,21 @@
commons-cli
${commons-cli.version}
+
+commons-collections
+commons-collections
+${commons-collections.version}
+
commons-lang
commons-lang
${commons-lang.version}
+
+commons-validator
+commons-validator
+${commons-validator.version}
+
io.dropwizard.metrics
dropwizard-core
@@ -6583,6 +6613,11 @@
quarkus-tika-deployment
${quarkiverse-tika.version}
+
+io.reactivex.rxjava3
+rxjava
+${rxjava3.version}
+
io.smallrye.reactive
smallrye-reactive-messaging-camel
@@ -6879,6 +6914,11 @@
+
+org.json
+json
+${org.json.version}
+
org.jxmpp
jxmpp-core
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index b709f63ff8..cc7e20532c 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6235,6 +6235,11 @@
+
+com.google.re2j
+re2j
+1.7
+
com.ibm.icu
icu4j
@@ -6312,6 +6317,21 @@
okio
3.6.0
+
+com.squareup.okio
+okio-fakefilesystem
+3.6.0
+
+
+com.squareup.okio
+okio-fakefilesystem-jvm
+3.6.0
+
+
+com.squareup.okio
+okio-jvm
+3.6.0
+
com.squareup.retrofit2
converter-jackson
@@ -6338,11 +6358,21 @@
commons-cli
1.4
+
+commons-collections
+commons-collections
+3.2.2
+
commons-lang
commons-lang
2.6
+
+commons-validator
+commons-validator
+1.8.0
+
io.dropwizard.metrics
dropwizard-core
(camel-quarkus) branch main updated: Avoid dependency misconvergence when extensions are used together
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 76728f8ce3 Avoid dependency misconvergence when extensions are used
together
76728f8ce3 is described below
commit 76728f8ce31441252fdc1bb9245476ef28e1cfb7
Author: Peter Palaga
AuthorDate: Wed Aug 7 11:40:42 2024 +0200
Avoid dependency misconvergence when extensions are used together
---
pom.xml| 5
poms/bom/pom.xml | 35 ++
poms/bom/src/main/generated/flattened-full-pom.xml | 35 ++
.../src/main/generated/flattened-reduced-pom.xml | 35 ++
.../generated/flattened-reduced-verbose-pom.xml| 35 ++
5 files changed, 145 insertions(+)
diff --git a/pom.xml b/pom.xml
index 96234a8914..3c498355fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,8 +88,10 @@
3.1.5
${commons-beanutils-version}
1.4
+
${commons-collections-version}
${commons-exec-version}
2.6
+
${commons-validator-version}
${metrics-version}
${eddsa-version}
0.5.0
@@ -146,10 +148,13 @@
4.12.0
3.6.0
0.31.0
+20240303
0.26.0
+1.7
3.4.38
${reactor-netty-version}
2.9.0
+3.1.8
4.23.0
2.2
${snakeyaml-engine-version}
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 89fb064e39..c37d029b41 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6568,6 +6568,11 @@
+
+com.google.re2j
+re2j
+${re2j.version}
+
com.ibm.icu
icu4j
@@ -6645,6 +6650,16 @@
okio
${okio.version}
+
+com.squareup.okio
+okio-fakefilesystem
+${okio.version}
+
+
+com.squareup.okio
+okio-fakefilesystem-jvm
+${okio.version}
+
com.squareup.okio
okio-jvm
@@ -6676,11 +6691,21 @@
commons-cli
${commons-cli.version}
+
+commons-collections
+commons-collections
+${commons-collections.version}
+
commons-lang
commons-lang
${commons-lang.version}
+
+commons-validator
+commons-validator
+${commons-validator.version}
+
dev.langchain4j
langchain4j
@@ -6864,6 +6889,11 @@
quarkus-tika-deployment
${quarkiverse-tika.version}
+
+io.reactivex.rxjava3
+rxjava
+${rxjava3.version}
+
io.smallrye.reactive
smallrye-reactive-messaging-camel
@@ -7213,6 +7243,11 @@
+
+org.json
+json
+${org.json.version}
+
org.jxmpp
jxmpp-core
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 2562e20071..29f5f404f7 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6490,6 +6490,11 @@
+
+com.google.re2j
+re2j
+1.7
+
com.ibm.icu
icu4j
@@ -6567,6 +6572,16 @@
okio
3.6.0
+
+com.squareup.okio
+okio-fakefilesystem
+3.6.0
+
+
+com.squareup.okio
+okio-fakefilesystem-jvm
+3.6.0
+
com.squareup.okio
okio-jvm
@@ -6598,11 +6613,21 @@
commons-cli
1.4
+
+commons-collections
+commons-collections
+3.2.2
+
commons-lang
commons-lang
2.6
+
+commons-validator
+commons-validator
+1.9.0
+
dev.langchain4j
langchain4j
@@ -6786,6 +6811,11 @@
quarkus-tika-deployment
2.0.2
+
+io.reactivex.rxjava3
+rxjava
+3.1.8
+
io.smallrye.reactive
smallrye-reactive-messaging-camel
@@ -7134,6
(camel-quarkus) 01/02: Move all enforcer invocations to the full profile
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7001b6c25dc523f9299826b4b72f7e22d4375e6d
Author: Peter Palaga
AuthorDate: Thu Aug 1 18:37:40 2024 +0200
Move all enforcer invocations to the full profile
---
extensions/grpc/pom.xml | 105 +++
extensions/salesforce/pom.xml| 105 +++
integration-tests/grpc/pom.xml | 99 +++--
integration-tests/salesforce/pom.xml | 104 ++
4 files changed, 228 insertions(+), 185 deletions(-)
diff --git a/extensions/grpc/pom.xml b/extensions/grpc/pom.xml
index 2fd05e6a43..a2017f0bdc 100644
--- a/extensions/grpc/pom.xml
+++ b/extensions/grpc/pom.xml
@@ -36,51 +36,62 @@
runtime
-
-
-
-org.apache.maven.plugins
-maven-enforcer-plugin
-
-
-io.quarkus
-quarkus-enforcer-rules
-${quarkus.version}
-
-
-org.l2x6.cq
-
cq-filtered-external-enforcer-rules
-${cq-plugin.version}
-
-
-
-
-camel-quarkus-enforcer-rules
-
-enforce
-
-
-
-
-
-
classpath:enforcer-rules/quarkus-require-maven-version.xml
-
-
-
classpath:enforcer-rules/quarkus-banned-dependencies.xml
-
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl
-
-
-
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
-
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl
-
-
-
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml
-
-
-
-
-
-
-
-
+
+
+
+full
+
+
+!quickly
+
+
+
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+
+
+io.quarkus
+quarkus-enforcer-rules
+${quarkus.version}
+
+
+org.l2x6.cq
+
cq-filtered-external-enforcer-rules
+${cq-plugin.version}
+
+
+
+
+camel-quarkus-enforcer-rules
+
+enforce
+
+
+
+
+
+
classpath:enforcer-rules/quarkus-require-maven-version.xml
+
+
+
classpath:enforcer-rules/quarkus-banned-dependencies.xml
+
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl
+
+
+
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
+
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl
+
+
+
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned
(camel-quarkus) 02/02: Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 5006a9b886b9d139d2b35da9b2e3ad5f68ee6889 Author: Peter Palaga AuthorDate: Thu Aug 1 23:02:21 2024 +0200 Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava --- extensions/google-bigquery/runtime/pom.xml | 4 extensions/google-pubsub/runtime/pom.xml | 12 extensions/kudu/runtime/pom.xml| 8 extensions/opentelemetry/runtime/pom.xml | 4 extensions/salesforce/runtime/pom.xml | 10 ++ integration-tests/cassandraql/pom.xml | 8 poms/bom-test/pom.xml | 4 7 files changed, 50 insertions(+) diff --git a/extensions/google-bigquery/runtime/pom.xml b/extensions/google-bigquery/runtime/pom.xml index 54bce726f4..565a3cba67 100644 --- a/extensions/google-bigquery/runtime/pom.xml +++ b/extensions/google-bigquery/runtime/pom.xml @@ -44,6 +44,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + diff --git a/extensions/google-pubsub/runtime/pom.xml b/extensions/google-pubsub/runtime/pom.xml index 9e7ede80b7..5b2d1be3fa 100644 --- a/extensions/google-pubsub/runtime/pom.xml +++ b/extensions/google-pubsub/runtime/pom.xml @@ -63,6 +63,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + @@ -97,6 +101,14 @@ com.google.android annotations + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + commons-logging commons-logging diff --git a/extensions/kudu/runtime/pom.xml b/extensions/kudu/runtime/pom.xml index 7ceee99a36..c10b439a94 100644 --- a/extensions/kudu/runtime/pom.xml +++ b/extensions/kudu/runtime/pom.xml @@ -59,6 +59,14 @@ com.google.guava guava + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + org.checkerframework checker-qual diff --git a/extensions/opentelemetry/runtime/pom.xml b/extensions/opentelemetry/runtime/pom.xml index fc481c2359..643d4ac89a 100644 --- a/extensions/opentelemetry/runtime/pom.xml +++ b/extensions/opentelemetry/runtime/pom.xml @@ -44,6 +44,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + diff --git a/extensions/salesforce/runtime/pom.xml b/extensions/salesforce/runtime/pom.xml index c0c08adacc..e2dff9c0ea 100644 --- a/extensions/salesforce/runtime/pom.xml +++ b/extensions/salesforce/runtime/pom.xml @@ -45,6 +45,16 @@ io.quarkus quarkus-grpc-common + + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + + diff --git a/integration-tests/cassandraql/pom.xml b/integration-tests/cassandraql/pom.xml index 9daf004587..b59fa153a9 100644 --- a/integration-tests/cassandraql/pom.xml +++ b/integration-tests/cassandraql/pom.xml @@ -42,6 +42,14 @@ com.github.stephenc.jcip jcip-annotations + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + org.checkerframework checker-qual diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml index 79b8321810..460b95dbfc 100644 --- a/poms/bom-test/pom.xml +++ b/poms/bom-test/pom.xml @@ -397,6 +397,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture
(camel-quarkus) branch 3.8.x updated (14232aa250 -> 5006a9b886)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 14232aa250 Workaround with registering OperatingSystemMXBeanSupport at RuntimeInitializedClass in the native building new 27d1db2349 Move all enforcer invocations to the full profile new 5006a9b886 Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava 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: extensions/google-bigquery/runtime/pom.xml | 4 ++ extensions/google-pubsub/runtime/pom.xml | 12 extensions/grpc/pom.xml| 105 - extensions/kudu/runtime/pom.xml| 8 +++ extensions/opentelemetry/runtime/pom.xml | 4 ++ extensions/salesforce/pom.xml | 105 - extensions/salesforce/runtime/pom.xml | 10 +++ integration-tests/cassandraql/pom.xml | 8 +++ integration-tests/grpc/pom.xml | 99 +++ integration-tests/salesforce/pom.xml | 104 +++- poms/bom-test/pom.xml | 4 ++ 11 files changed, 278 insertions(+), 185 deletions(-)
(camel-quarkus) 01/02: Move all enforcer invocations to the full profile
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 27d1db23497ec9ce821643160a9998bd598f1485
Author: Peter Palaga
AuthorDate: Thu Aug 1 18:37:40 2024 +0200
Move all enforcer invocations to the full profile
---
extensions/grpc/pom.xml | 105 +++
extensions/salesforce/pom.xml| 105 +++
integration-tests/grpc/pom.xml | 99 +++--
integration-tests/salesforce/pom.xml | 104 ++
4 files changed, 228 insertions(+), 185 deletions(-)
diff --git a/extensions/grpc/pom.xml b/extensions/grpc/pom.xml
index 7bf493f237..e433b0c8f0 100644
--- a/extensions/grpc/pom.xml
+++ b/extensions/grpc/pom.xml
@@ -36,51 +36,62 @@
runtime
-
-
-
-org.apache.maven.plugins
-maven-enforcer-plugin
-
-
-io.quarkus
-quarkus-enforcer-rules
-${quarkus.version}
-
-
-org.l2x6.cq
-
cq-filtered-external-enforcer-rules
-${cq-plugin.version}
-
-
-
-
-camel-quarkus-enforcer-rules
-
-enforce
-
-
-
-
-
-
classpath:enforcer-rules/quarkus-require-maven-version.xml
-
-
-
classpath:enforcer-rules/quarkus-banned-dependencies.xml
-
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl
-
-
-
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
-
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl
-
-
-
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml
-
-
-
-
-
-
-
-
+
+
+
+full
+
+
+!quickly
+
+
+
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+
+
+io.quarkus
+quarkus-enforcer-rules
+${quarkus.version}
+
+
+org.l2x6.cq
+
cq-filtered-external-enforcer-rules
+${cq-plugin.version}
+
+
+
+
+camel-quarkus-enforcer-rules
+
+enforce
+
+
+
+
+
+
classpath:enforcer-rules/quarkus-require-maven-version.xml
+
+
+
classpath:enforcer-rules/quarkus-banned-dependencies.xml
+
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl
+
+
+
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
+
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl
+
+
+
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned
(camel-quarkus) 02/02: Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 59ab5e4364a6fad51d88140b7851a2eb2ffe65f0 Author: Peter Palaga AuthorDate: Thu Aug 1 23:02:21 2024 +0200 Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava --- extensions/google-bigquery/runtime/pom.xml | 4 extensions/google-pubsub/runtime/pom.xml | 8 extensions/kudu/runtime/pom.xml| 8 extensions/opentelemetry/runtime/pom.xml | 4 extensions/salesforce/runtime/pom.xml | 10 ++ integration-tests/cassandraql/pom.xml | 8 poms/bom-test/pom.xml | 4 7 files changed, 46 insertions(+) diff --git a/extensions/google-bigquery/runtime/pom.xml b/extensions/google-bigquery/runtime/pom.xml index ac3f64022f..334d995a03 100644 --- a/extensions/google-bigquery/runtime/pom.xml +++ b/extensions/google-bigquery/runtime/pom.xml @@ -44,6 +44,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + diff --git a/extensions/google-pubsub/runtime/pom.xml b/extensions/google-pubsub/runtime/pom.xml index accefcffe2..98e4cf4ddd 100644 --- a/extensions/google-pubsub/runtime/pom.xml +++ b/extensions/google-pubsub/runtime/pom.xml @@ -63,6 +63,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + @@ -101,6 +105,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + commons-logging commons-logging diff --git a/extensions/kudu/runtime/pom.xml b/extensions/kudu/runtime/pom.xml index 178e81e8d6..a32110037b 100644 --- a/extensions/kudu/runtime/pom.xml +++ b/extensions/kudu/runtime/pom.xml @@ -59,6 +59,14 @@ com.google.guava guava + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + org.checkerframework checker-qual diff --git a/extensions/opentelemetry/runtime/pom.xml b/extensions/opentelemetry/runtime/pom.xml index d09ab313a5..e36b74bd7a 100644 --- a/extensions/opentelemetry/runtime/pom.xml +++ b/extensions/opentelemetry/runtime/pom.xml @@ -44,6 +44,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + diff --git a/extensions/salesforce/runtime/pom.xml b/extensions/salesforce/runtime/pom.xml index 27dbfb385b..1d47b07032 100644 --- a/extensions/salesforce/runtime/pom.xml +++ b/extensions/salesforce/runtime/pom.xml @@ -45,6 +45,16 @@ io.quarkus quarkus-grpc-common + + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + + diff --git a/integration-tests/cassandraql/pom.xml b/integration-tests/cassandraql/pom.xml index 3fbb3ef9fc..0baa07fa4f 100644 --- a/integration-tests/cassandraql/pom.xml +++ b/integration-tests/cassandraql/pom.xml @@ -42,6 +42,14 @@ com.github.stephenc.jcip jcip-annotations + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + org.checkerframework checker-qual diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml index 24b14dddc6..7a7a048b19 100644 --- a/poms/bom-test/pom.xml +++ b/poms/bom-test/pom.xml @@ -396,6 +396,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + org.apache.httpcomponents httpmime
(camel-quarkus) branch main updated (eac49276ed -> 59ab5e4364)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from eac49276ed Upgrade CycloneDX Maven plugin to version 2.8.1 (#6318) new 7001b6c25d Move all enforcer invocations to the full profile new 59ab5e4364 Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava 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: extensions/google-bigquery/runtime/pom.xml | 4 ++ extensions/google-pubsub/runtime/pom.xml | 8 +++ extensions/grpc/pom.xml| 105 - extensions/kudu/runtime/pom.xml| 8 +++ extensions/opentelemetry/runtime/pom.xml | 4 ++ extensions/salesforce/pom.xml | 105 - extensions/salesforce/runtime/pom.xml | 10 +++ integration-tests/cassandraql/pom.xml | 8 +++ integration-tests/grpc/pom.xml | 99 +++ integration-tests/salesforce/pom.xml | 104 +++- poms/bom-test/pom.xml | 4 ++ 11 files changed, 274 insertions(+), 185 deletions(-)
(camel-quarkus) branch 240801-enforcer-3.8 created (now 3f79256fd7)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch 240801-enforcer-3.8 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 3f79256fd7 Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava This branch includes the following new commits: new 3f79256fd7 Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava The 1 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.
(camel-quarkus) 01/01: Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 240801-enforcer-3.8 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 3f79256fd73ef616f1036143041707db64e85a41 Author: Peter Palaga AuthorDate: Thu Aug 1 21:18:21 2024 +0200 Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava --- extensions/google-bigquery/runtime/pom.xml | 4 extensions/google-pubsub/runtime/pom.xml | 12 extensions/kudu/runtime/pom.xml| 8 extensions/opentelemetry/runtime/pom.xml | 4 extensions/salesforce/runtime/pom.xml | 10 ++ integration-tests/cassandraql/pom.xml | 8 integration-tests/google-bigquery/pom.xml | 10 ++ integration-tests/google-pubsub/pom.xml| 10 ++ integration-tests/kudu/pom.xml | 10 ++ integration-tests/opentelemetry/pom.xml| 10 ++ integration-tests/salesforce/pom.xml | 10 ++ poms/bom-test/pom.xml | 4 12 files changed, 100 insertions(+) diff --git a/extensions/google-bigquery/runtime/pom.xml b/extensions/google-bigquery/runtime/pom.xml index 54bce726f4..565a3cba67 100644 --- a/extensions/google-bigquery/runtime/pom.xml +++ b/extensions/google-bigquery/runtime/pom.xml @@ -44,6 +44,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + diff --git a/extensions/google-pubsub/runtime/pom.xml b/extensions/google-pubsub/runtime/pom.xml index 9e7ede80b7..5b2d1be3fa 100644 --- a/extensions/google-pubsub/runtime/pom.xml +++ b/extensions/google-pubsub/runtime/pom.xml @@ -63,6 +63,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + @@ -97,6 +101,14 @@ com.google.android annotations + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + commons-logging commons-logging diff --git a/extensions/kudu/runtime/pom.xml b/extensions/kudu/runtime/pom.xml index 7ceee99a36..c10b439a94 100644 --- a/extensions/kudu/runtime/pom.xml +++ b/extensions/kudu/runtime/pom.xml @@ -59,6 +59,14 @@ com.google.guava guava + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + org.checkerframework checker-qual diff --git a/extensions/opentelemetry/runtime/pom.xml b/extensions/opentelemetry/runtime/pom.xml index fc481c2359..643d4ac89a 100644 --- a/extensions/opentelemetry/runtime/pom.xml +++ b/extensions/opentelemetry/runtime/pom.xml @@ -44,6 +44,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + diff --git a/extensions/salesforce/runtime/pom.xml b/extensions/salesforce/runtime/pom.xml index c0c08adacc..e2dff9c0ea 100644 --- a/extensions/salesforce/runtime/pom.xml +++ b/extensions/salesforce/runtime/pom.xml @@ -45,6 +45,16 @@ io.quarkus quarkus-grpc-common + + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + + diff --git a/integration-tests/cassandraql/pom.xml b/integration-tests/cassandraql/pom.xml index 9daf004587..b59fa153a9 100644 --- a/integration-tests/cassandraql/pom.xml +++ b/integration-tests/cassandraql/pom.xml @@ -42,6 +42,14 @@ com.github.stephenc.jcip jcip-annotations + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + org.checkerframework checker-qual diff --git a/integration-tests/google-bigquery/pom.xml b/integration-tests/google-bigquery/pom.xml index
(camel-quarkus) branch 240801-enforcer deleted (was 148804e32b)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch 240801-enforcer in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was 148804e32b Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus) 02/02: Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 240801-enforcer in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 148804e32b7bcc5c7a5779ca92290d25f62cc8c7 Author: Peter Palaga AuthorDate: Thu Aug 1 21:18:21 2024 +0200 Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava --- extensions/google-bigquery/runtime/pom.xml | 4 extensions/google-pubsub/runtime/pom.xml | 8 extensions/kudu/runtime/pom.xml| 8 extensions/opentelemetry/runtime/pom.xml | 4 extensions/salesforce/runtime/pom.xml | 10 ++ integration-tests/cassandraql/pom.xml | 8 integration-tests/google-bigquery/pom.xml | 10 ++ integration-tests/google-pubsub/pom.xml| 10 ++ integration-tests/kudu/pom.xml | 10 ++ integration-tests/opentelemetry/pom.xml| 10 ++ integration-tests/salesforce/pom.xml | 10 ++ poms/bom-test/pom.xml | 4 12 files changed, 96 insertions(+) diff --git a/extensions/google-bigquery/runtime/pom.xml b/extensions/google-bigquery/runtime/pom.xml index ac3f64022f..334d995a03 100644 --- a/extensions/google-bigquery/runtime/pom.xml +++ b/extensions/google-bigquery/runtime/pom.xml @@ -44,6 +44,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + diff --git a/extensions/google-pubsub/runtime/pom.xml b/extensions/google-pubsub/runtime/pom.xml index accefcffe2..98e4cf4ddd 100644 --- a/extensions/google-pubsub/runtime/pom.xml +++ b/extensions/google-pubsub/runtime/pom.xml @@ -63,6 +63,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + @@ -101,6 +105,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + commons-logging commons-logging diff --git a/extensions/kudu/runtime/pom.xml b/extensions/kudu/runtime/pom.xml index 178e81e8d6..a32110037b 100644 --- a/extensions/kudu/runtime/pom.xml +++ b/extensions/kudu/runtime/pom.xml @@ -59,6 +59,14 @@ com.google.guava guava + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + org.checkerframework checker-qual diff --git a/extensions/opentelemetry/runtime/pom.xml b/extensions/opentelemetry/runtime/pom.xml index d09ab313a5..e36b74bd7a 100644 --- a/extensions/opentelemetry/runtime/pom.xml +++ b/extensions/opentelemetry/runtime/pom.xml @@ -44,6 +44,10 @@ com.google.code.findbugs jsr305 + +com.google.guava +listenablefuture + diff --git a/extensions/salesforce/runtime/pom.xml b/extensions/salesforce/runtime/pom.xml index 27dbfb385b..1d47b07032 100644 --- a/extensions/salesforce/runtime/pom.xml +++ b/extensions/salesforce/runtime/pom.xml @@ -45,6 +45,16 @@ io.quarkus quarkus-grpc-common + + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + + diff --git a/integration-tests/cassandraql/pom.xml b/integration-tests/cassandraql/pom.xml index 3fbb3ef9fc..0baa07fa4f 100644 --- a/integration-tests/cassandraql/pom.xml +++ b/integration-tests/cassandraql/pom.xml @@ -42,6 +42,14 @@ com.github.stephenc.jcip jcip-annotations + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + org.checkerframework checker-qual diff --git a/integration-tests/google-bigquery/pom.xml b/integration-tests/google-bigquery/pom.xml index a41de62b51..194425a109 100644 --- a/integration-tests/google-bigquery/pom.xml +++ b/integration-tests/google-bigquery
(camel-quarkus) branch 240801-enforcer created (now 148804e32b)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch 240801-enforcer in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 148804e32b Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava This branch includes the following new commits: new 0fac502a93 Move all enforcer invocations to the full profile new 148804e32b Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava 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.
(camel-quarkus) 01/02: Move all enforcer invocations to the full profile
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 240801-enforcer
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0fac502a930a7e32edd70c0a7667ee5e4bb96303
Author: Peter Palaga
AuthorDate: Thu Aug 1 18:37:40 2024 +0200
Move all enforcer invocations to the full profile
---
extensions/grpc/pom.xml | 105 +++
extensions/salesforce/pom.xml| 105 +++
integration-tests/grpc/pom.xml | 99 +++--
integration-tests/salesforce/pom.xml | 104 ++
4 files changed, 228 insertions(+), 185 deletions(-)
diff --git a/extensions/grpc/pom.xml b/extensions/grpc/pom.xml
index 2fd05e6a43..a2017f0bdc 100644
--- a/extensions/grpc/pom.xml
+++ b/extensions/grpc/pom.xml
@@ -36,51 +36,62 @@
runtime
-
-
-
-org.apache.maven.plugins
-maven-enforcer-plugin
-
-
-io.quarkus
-quarkus-enforcer-rules
-${quarkus.version}
-
-
-org.l2x6.cq
-
cq-filtered-external-enforcer-rules
-${cq-plugin.version}
-
-
-
-
-camel-quarkus-enforcer-rules
-
-enforce
-
-
-
-
-
-
classpath:enforcer-rules/quarkus-require-maven-version.xml
-
-
-
classpath:enforcer-rules/quarkus-banned-dependencies.xml
-
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl
-
-
-
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
-
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl
-
-
-
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml
-
-
-
-
-
-
-
-
+
+
+
+full
+
+
+!quickly
+
+
+
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+
+
+io.quarkus
+quarkus-enforcer-rules
+${quarkus.version}
+
+
+org.l2x6.cq
+
cq-filtered-external-enforcer-rules
+${cq-plugin.version}
+
+
+
+
+camel-quarkus-enforcer-rules
+
+enforce
+
+
+
+
+
+
classpath:enforcer-rules/quarkus-require-maven-version.xml
+
+
+
classpath:enforcer-rules/quarkus-banned-dependencies.xml
+
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl
+
+
+
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
+
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl
+
+
+
${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned
(camel-quarkus) branch 3.8.x updated: Upgrade to maven-enforcer-plugin 3.5.0 and cq-maven-plugin 4.9.0 and fix dependency convergence issues
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.8.x by this push:
new 2cfbd6d1cc Upgrade to maven-enforcer-plugin 3.5.0 and cq-maven-plugin
4.9.0 and fix dependency convergence issues
2cfbd6d1cc is described below
commit 2cfbd6d1cc79276b5e90c51f05f95a8fbdfdd23a
Author: Peter Palaga
AuthorDate: Wed Jun 26 23:12:30 2024 +0200
Upgrade to maven-enforcer-plugin 3.5.0 and cq-maven-plugin 4.9.0 and fix
dependency convergence issues
---
pom.xml| 6 ++--
poms/bom/pom.xml | 36 ++
poms/bom/src/main/generated/flattened-full-pom.xml | 36 ++
.../src/main/generated/flattened-reduced-pom.xml | 36 ++
.../generated/flattened-reduced-verbose-pom.xml| 36 ++
5 files changed, 148 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5152e02b34..5fa471fda6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,7 @@
${json-path-version}
${jedis-client-version}
2.5.0
+1.0.3
3.6.1
${kudu-version}
1.9.22
@@ -163,6 +164,7 @@
${web3j-version}
${web3j-quorum-version}
${zookeeper-version}
+1.5.5-1
0.5.0
@@ -180,7 +182,7 @@
0.1.0
-4.6.8
+4.6.9
2.7.11
3.5.0
3.1.1
@@ -196,7 +198,7 @@
3.11.0
3.5.0
3.1.1
-3.0.0-M3
+3.5.0
3.1.0
3.1.1
3.3.0
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 44c03062ff..3a06301c28 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -2253,6 +2253,10 @@
org.codehaus.mojo
animal-sniffer-annotations
+
+com.sun.xml.bind
+*
+
@@ -2352,6 +2356,12 @@
org.apache.camel
camel-soap
${camel.version}
+
+
+com.sun.xml.bind
+*
+
+
org.apache.camel
@@ -2450,6 +2460,12 @@
org.apache.camel
camel-swift
${camel.version}
+
+
+com.sun.xml.bind
+*
+
+
org.apache.camel
@@ -6224,6 +6240,11 @@
jnr-ffi
${jnr-ffi.version}
+
+com.github.luben
+zstd-jni
+${zstd-jni.version}
+
com.github.mwiede
jsch
@@ -6858,6 +6879,21 @@
+
+org.jxmpp
+jxmpp-core
+${jxmpp.version}
+
+
+org.jxmpp
+jxmpp-jid
+${jxmpp.version}
+
+
+org.jxmpp
+jxmpp-util-cache
+${jxmpp.version}
+
org.kiwiproject
consul-client
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 303fc91406..8d8d63fa0d 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -2191,6 +2191,10 @@
org.codehaus.mojo
animal-sniffer-annotations
+
+com.sun.xml.bind
+*
+
@@ -2290,6 +2294,12 @@
org.apache.camel
camel-soap
4.4.3
+
+
+com.sun.xml.bind
+*
+
+
org.apache.camel
@@ -2388,6 +2398,12 @@
org.apache.camel
camel-swift
4.4.3
+
+
+com.sun.xml.bind
+*
+
+
org.apache.camel
@@ -6147,6 +6163,11 @@
jnr-ffi
2.2.13
+
+com.github.luben
+zstd-jni
+1.5.5-1
+
com.github.mwiede
jsch
@@ -6780,6 +6801,21 @@
+
+org.jxmpp
+jxmpp-core
+1.0.3
+
+
+org.jxmpp
+jxmpp-jid
+1.0.3
+
+
+org.jxmpp
+jxmpp-util-cache
+1.0.3
(camel-quarkus) branch main updated: Upgrade to maven-enforcer-plugin 3.5.0 and cq-maven-plugin 4.9.0 and fix dependency convergence issues
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new dbeeea9e10 Upgrade to maven-enforcer-plugin 3.5.0 and cq-maven-plugin
4.9.0 and fix dependency convergence issues
dbeeea9e10 is described below
commit dbeeea9e1049a20b684ab44fc6e5fec0f1dd2e39
Author: Peter Palaga
AuthorDate: Wed Jun 26 23:12:30 2024 +0200
Upgrade to maven-enforcer-plugin 3.5.0 and cq-maven-plugin 4.9.0 and fix
dependency convergence issues
---
pom.xml | 6 --
poms/bom/pom.xml | 20
poms/bom/src/main/generated/flattened-full-pom.xml | 20
.../bom/src/main/generated/flattened-reduced-pom.xml | 20
.../main/generated/flattened-reduced-verbose-pom.xml | 20
5 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 66255c81f3..eb0635b41e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,7 @@
${json-path-version}
${jedis-client-version}
2.5.0
+1.0.3
3.7.0
${kudu-version}
2.0.0
@@ -165,6 +166,7 @@
${web3j-version}
${web3j-quorum-version}
${zookeeper-version}
+1.5.5-6
0.7.1
@@ -182,7 +184,7 @@
0.1.0
-4.8.0
+4.9.0
2.8.0
3.6.0
3.3.0
@@ -197,7 +199,7 @@
3.2.0
3.11.0
3.1.1
-3.0.0-M3
+3.5.0
3.1.0
3.1.1
3.3.0
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 9cb3038d76..dfbb8ab67c 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6470,6 +6470,11 @@
jnr-ffi
${jnr-ffi.version}
+
+com.github.luben
+zstd-jni
+${zstd-jni.version}
+
com.github.mwiede
jsch
@@ -7152,6 +7157,21 @@
+
+org.jxmpp
+jxmpp-core
+${jxmpp.version}
+
+
+org.jxmpp
+jxmpp-jid
+${jxmpp.version}
+
+
+org.jxmpp
+jxmpp-util-cache
+${jxmpp.version}
+
org.kiwiproject
consul-client
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index cfaa39bb06..f291e86bc4 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6392,6 +6392,11 @@
jnr-ffi
2.2.13
+
+com.github.luben
+zstd-jni
+1.5.5-6
+
com.github.mwiede
jsch
@@ -7073,6 +7078,21 @@
+
+org.jxmpp
+jxmpp-core
+1.0.3
+
+
+org.jxmpp
+jxmpp-jid
+1.0.3
+
+
+org.jxmpp
+jxmpp-util-cache
+1.0.3
+
org.kiwiproject
consul-client
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 8033f4c9be..0741dd41d7 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6392,6 +6392,11 @@
jnr-ffi
2.2.13
+
+com.github.luben
+zstd-jni
+1.5.5-6
+
com.github.mwiede
jsch
@@ -6992,6 +6997,21 @@
kotlin-scripting-jvm-host
2.0.0
+
+org.jxmpp
+jxmpp-core
+1.0.3
+
+
+org.jxmpp
+jxmpp-jid
+1.0.3
+
+
+org.jxmpp
+jxmpp-util-cache
+1.0.3
+
org.kiwiproject
consul-client
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 404888d8e2..a780f46873 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6392,6 +6392,11 @@
jnr-ffi
2.2.13
+
+com.github.luben
+zstd-jni
+1.5.5-6
+
com.github.mwiede
jsch
@@ -6992,6 +6997,21 @@
kotlin-scripting-jvm-host
2.0.0
+
+org.jxmpp
+jxmpp-core
+1.0.3
+
+
+org.jxmpp
+jxmpp-jid
svn commit: r69361 [1/5] - /dev/camel/camel-quarkus/3.11.0/
Author: ppalaga Date: Fri May 24 05:45:43 2024 New Revision: 69361 Log: Import camel-quarkus release Added: dev/camel/camel-quarkus/3.11.0/ dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.asc (with props) dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.sha512 dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.asc (with props) dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.sha512 dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip (with props) dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.asc (with props) dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.sha512
svn commit: r69361 [4/5] - /dev/camel/camel-quarkus/3.11.0/
Added: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml == --- dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml (added) +++ dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml Fri May 24 05:45:43 2024 @@ -0,0 +1,93725 @@ + +http://cyclonedx.org/schema/bom/1.5";> + + + +build + + + + +OWASP Foundation +CycloneDX Maven plugin +2.8.0 + + 76ffec6a7ddd46b2b24517411874eb99 + 5b0d5b41975b53be4799b9621b4af0cfc41d44b6 + 6852aa0f4e42a2db745bab80e384951a6a65b9215d041081d675780999027e81 + 417de20fcdcb11c9713bacbd57290d8e68037fdb4553fd31b8cb08bd760ad52dc65ea88ad4be15844ad3fd5a4d3e440d2f70326f2fe1e63ec78e059c9a883f8d + 5eb755c6492e7a7385fa9a1e1f4517875bcb834b2df437808a37a2d6f5285df428741762305980315a63fcef1406597d + 0fe16a47cf7aab0b22251dafcc39939b68e8f1778093309d8d2060b51a08df445a8b8ed5a9561669faf2e55f907c76d8 + 3e5a1eb5ab7d0797498862794709ff8eaaa071fe4cc9ec77f52db7e2f97ef487 + 59281a3e29e76270d7f44b40b5b9f05e55f1ae3ec716d80add806f360940809e3813998ac7c5758043b8e248aed73b86e37dc506cdb4cde03c16bb617d8e5a3a + + + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus + 3.11.0 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus@3.11.0?type=pom + http://camel.apache.orghttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus + + + makeAggregateBom + compile,provided,runtime,system + enabled + + + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-poms + 3.11.0 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-poms@3.11.0?type=pom + http://camel.apache.org/camel-quarkus-pomshttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus/camel-quarkus-poms + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-bom + 3.11.0 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-bom@3.11.0?type=pom + http://camel.apache.org/camel-quarkus-poms/camel-quarkus-bomhttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus/camel-quarkus-poms/camel-quarkus-bom + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-bom-test + 3.11.0 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-bom-test@3.11.0?type=pom + http://camel.apache.org/camel-quarkus-poms/camel-quarkus-bom-testhttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus/camel-quarkus-poms/camel-quarkus-bom-test + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-build-parent + 3.11.0 + Maven plugins configuration + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-build-parent@3.11.0?type=pom + http://camel.apache.org/camel-quarkus-poms/camel-quarkus-build-parenthttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus/camel-quarkus-poms/camel-quarkus-build-parent + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-build-parent-it + 3.11.0 + Maven plugins configuration for Integration Tests + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-build-parent-it@3.11.0?type=pom + http://camel.apache.org/camel-quarkus-poms/camel-quarkus-build-parent/came
svn commit: r69361 [3/5] - /dev/camel/camel-quarkus/3.11.0/
Added: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.asc == Binary file - no diff available. Propchange: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.sha512 == --- dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.sha512 (added) +++ dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json.sha512 Fri May 24 05:45:43 2024 @@ -0,0 +1 @@ +5be69a35ed2645b1d9f6dda417176953b3f300c6df1fd3334c22f2b1215f431002e01a14b00c36888f76eb5f762b10717c5cee492e3af11d11767973909f21ff *apache-camel-quarkus-3.11.0-sbom.json
svn commit: r69361 [2/5] - /dev/camel/camel-quarkus/3.11.0/
Added: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json
==
--- dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json (added)
+++ dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.json Fri
May 24 05:45:43 2024
@@ -0,0 +1,232646 @@
+{
+ "bomFormat" : "CycloneDX",
+ "specVersion" : "1.5",
+ "serialNumber" : "urn:uuid:7934f5ca-a594-3274-9004-3e2253b730e0",
+ "version" : 1,
+ "metadata" : {
+"lifecycles" : [
+ {
+"phase" : "build"
+ }
+],
+"tools" : [
+ {
+"vendor" : "OWASP Foundation",
+"name" : "CycloneDX Maven plugin",
+"version" : "2.8.0",
+"hashes" : [
+ {
+"alg" : "MD5",
+"content" : "76ffec6a7ddd46b2b24517411874eb99"
+ },
+ {
+"alg" : "SHA-1",
+"content" : "5b0d5b41975b53be4799b9621b4af0cfc41d44b6"
+ },
+ {
+"alg" : "SHA-256",
+"content" :
"6852aa0f4e42a2db745bab80e384951a6a65b9215d041081d675780999027e81"
+ },
+ {
+"alg" : "SHA-512",
+"content" :
"417de20fcdcb11c9713bacbd57290d8e68037fdb4553fd31b8cb08bd760ad52dc65ea88ad4be15844ad3fd5a4d3e440d2f70326f2fe1e63ec78e059c9a883f8d"
+ },
+ {
+"alg" : "SHA-384",
+"content" :
"5eb755c6492e7a7385fa9a1e1f4517875bcb834b2df437808a37a2d6f5285df428741762305980315a63fcef1406597d"
+ },
+ {
+"alg" : "SHA3-384",
+"content" :
"0fe16a47cf7aab0b22251dafcc39939b68e8f1778093309d8d2060b51a08df445a8b8ed5a9561669faf2e55f907c76d8"
+ },
+ {
+"alg" : "SHA3-256",
+"content" :
"3e5a1eb5ab7d0797498862794709ff8eaaa071fe4cc9ec77f52db7e2f97ef487"
+ },
+ {
+"alg" : "SHA3-512",
+"content" :
"59281a3e29e76270d7f44b40b5b9f05e55f1ae3ec716d80add806f360940809e3813998ac7c5758043b8e248aed73b86e37dc506cdb4cde03c16bb617d8e5a3a"
+ }
+]
+ }
+],
+"component" : {
+ "publisher" : "The Apache Software Foundation",
+ "group" : "org.apache.camel.quarkus",
+ "name" : "camel-quarkus",
+ "version" : "3.11.0",
+ "description" : "Apache Camel extensions for Quarkus",
+ "licenses" : [
+{
+ "license" : {
+"id" : "Apache-2.0",
+"url" : "https://www.apache.org/licenses/LICENSE-2.0";
+ }
+}
+ ],
+ "purl" :
"pkg:maven/org.apache.camel.quarkus/camel-quarkus@3.11.0?type=pom",
+ "externalReferences" : [
+{
+ "type" : "website",
+ "url" : "http://camel.apache.org";
+},
+{
+ "type" : "distribution-intake",
+ "url" :
"https://repository.apache.org/service/local/staging/deploy/maven2";
+},
+{
+ "type" : "issue-tracker",
+ "url" : "https://github.com/apache/camel-quarkus/issues";
+},
+{
+ "type" : "mailing-list",
+ "url" : "dev-subscr...@camel.apache.org"
+},
+{
+ "type" : "vcs",
+ "url" : "https://github.com/apache/camel-quarkus";
+}
+ ],
+ "type" : "library",
+ "bom-ref" :
"pkg:maven/org.apache.camel.quarkus/camel-quarkus@3.11.0?type=pom"
+},
+"properties" : [
+ {
+"name" : "maven.goal",
+"value" : "makeAggregateBom"
+ },
+ {
+"name" : "maven.scopes",
+"value" : "compile,provided,runtime,system"
+ },
+ {
+"name" : "cdx:reproducible",
+"value" : "enabled"
+ }
+]
+ },
+ "components" : [
+{
+ "publisher" : "The Apache Software Foundation",
+ "group" : "org.apache.camel.quarkus",
+ "name" : "camel-quarkus-poms",
+ "version" : "3.11.0",
+ "description" : "Apache Camel extensions for Quarkus",
+ "licenses" : [
+{
+ "license" : {
+"id" : "Apache-2.0",
+"url" : "https://www.apache.org/licenses/LICENSE-2.0";
+ }
+}
+ ],
+ "purl" :
"pkg:maven/org.apache.camel.quarkus/camel-quarkus-poms@3.11.0?type=pom",
+ "externalReferences" : [
+{
+ "type" : "website",
+ "url" : "http://camel.apache.org/camel-quarkus-poms";
+},
+{
+ "type" : "distribution-intake",
+ "url" :
"https://repository.apache.org/service/local/staging/deploy/maven2";
+},
+{
+ "type" : "issue-tracker",
+ "url" : "https://github.com/apache/camel-quarkus/issues";
+},
+{
+ "type" : "mailing-list",
+ "url" : "dev-subscr...@camel.apache.org"
+},
+{
+ "type" : "vcs",
+ "url" : "https://github.com/apache/camel-quarkus/camel-quarkus-poms";
+}
+ ],
+ "type" : "library",
+
svn commit: r69361 [5/5] - /dev/camel/camel-quarkus/3.11.0/
Added: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.asc == Binary file - no diff available. Propchange: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.sha512 == --- dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.sha512 (added) +++ dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-sbom.xml.sha512 Fri May 24 05:45:43 2024 @@ -0,0 +1 @@ +ec0c0b5f87d8d3266cb0f5315662c482b5926c9879baa2d44a99026a807925a2cd98e3cf0725ec08141545068e8dd1f40b3d596b3baee474e72a06c83141ef34 *apache-camel-quarkus-3.11.0-sbom.xml Added: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip == Binary file - no diff available. Propchange: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip -- svn:mime-type = application/zip Added: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.asc == Binary file - no diff available. Propchange: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.sha512 == --- dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.sha512 (added) +++ dev/camel/camel-quarkus/3.11.0/apache-camel-quarkus-3.11.0-src.zip.sha512 Fri May 24 05:45:43 2024 @@ -0,0 +1 @@ +c7ef33912b55e79126b62fc4dd101fe806900ff83f37c8d3a187de4eb6726ae4204c571305709ece703834d36642fddabd190b87dc02aa61240e38ead4a86e60 *apache-camel-quarkus-3.11.0-src.zip
(camel-quarkus) annotated tag 3.11.0 created (now 279a9509a6)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to annotated tag 3.11.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 279a9509a6 (tag) tagging 47b79c6297811121bacc503ce5fa6a3989b4ddda (commit) replaces 1.0.0-CR3 by Peter Palaga on Fri May 24 06:07:19 2024 +0200 - Log - [maven-release-plugin] copy for tag 3.11.0 --- No new revisions were added by this update.
(camel-quarkus) branch 3.11.x created (now 47b79c6297)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch 3.11.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 47b79c6297 [maven-release-plugin] Prepare release 3.11.0 This branch includes the following new commits: new 47b79c6297 [maven-release-plugin] Prepare release 3.11.0 The 1 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.
(camel-quarkus) 02/02: Manage org.apache.httpcomponents.core5:httpcore5-h2 to avoid convergence issues with CXF
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 6ce03167992155210b4737d9a1d8d24ab0acf308
Author: Peter Palaga
AuthorDate: Tue Apr 16 16:07:37 2024 +0200
Manage org.apache.httpcomponents.core5:httpcore5-h2 to avoid convergence
issues with CXF
---
poms/bom/pom.xml | 5
poms/bom/src/main/generated/flattened-full-pom.xml | 29 ++
.../src/main/generated/flattened-reduced-pom.xml | 29 ++
.../generated/flattened-reduced-verbose-pom.xml| 29 ++
4 files changed, 92 insertions(+)
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 2afe3140e5..9b97e2febf 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6667,6 +6667,11 @@
httpcore5
${httpclient5.version}
+
+org.apache.httpcomponents.core5
+httpcore5-h2
+${httpclient5.version}
+
org.apache.jackrabbit
oak-jackrabbit-api
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 21c29a39cc..41863099a8 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -808,6 +808,10 @@
camel-drill
4.4.1
+
+com.google.guava
+listenablefuture
+
org.checkerframework
checker-qual
@@ -1004,6 +1008,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1057,6 +1065,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1126,6 +1138,10 @@
com.google.code.findbugs
jsr305
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1164,6 +1180,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
org.checkerframework
checker-qual
@@ -6161,6 +6181,10 @@
com.google.code.findbugs
jsr305
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -6566,6 +6590,11 @@
httpcore5
5.2.1
+
+org.apache.httpcomponents.core5
+httpcore5-h2
+5.2.1
+
org.apache.jackrabbit
oak-jackrabbit-api
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 73d9f78243..3d03ce6e57 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -808,6 +808,10 @@
camel-drill
4.4.1
+
+com.google.guava
+listenablefuture
+
org.checkerframework
checker-qual
@@ -1004,6 +1008,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1057,6 +1065,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1126,6 +1138,10 @@
com.google.code.findbugs
jsr305
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1164,6 +1180,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
org.checkerframework
checker-qual
@@ -6161,6 +6181,10 @@
com.google.code.findbugs
jsr305
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -6491,6 +6515,11 @@
httpcore5
5.2.1
(camel-quarkus) 02/02: Manage org.apache.httpcomponents.core5:httpcore5-h2 to avoid convergence issues with CXF
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 67759776a616eb1219522f735cad821d16b614d3
Author: Peter Palaga
AuthorDate: Tue Apr 16 16:07:37 2024 +0200
Manage org.apache.httpcomponents.core5:httpcore5-h2 to avoid convergence
issues with CXF
---
poms/bom/pom.xml | 5
poms/bom/src/main/generated/flattened-full-pom.xml | 29 ++
.../src/main/generated/flattened-reduced-pom.xml | 29 ++
.../generated/flattened-reduced-verbose-pom.xml| 29 ++
4 files changed, 92 insertions(+)
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index ce8623f5ad..c0cdae9fd3 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6739,6 +6739,11 @@
httpcore5
${httpclient5.version}
+
+org.apache.httpcomponents.core5
+httpcore5-h2
+${httpclient5.version}
+
org.apache.jackrabbit
oak-jackrabbit-api
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 53d443db48..81432b56a1 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -819,6 +819,10 @@
camel-drill
4.5.0
+
+com.google.guava
+listenablefuture
+
org.checkerframework
checker-qual
@@ -1015,6 +1019,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1068,6 +1076,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1137,6 +1149,10 @@
com.google.code.findbugs
jsr305
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1175,6 +1191,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
org.checkerframework
checker-qual
@@ -6252,6 +6272,10 @@
com.google.code.findbugs
jsr305
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -6637,6 +6661,11 @@
httpcore5
5.2.1
+
+org.apache.httpcomponents.core5
+httpcore5-h2
+5.2.1
+
org.apache.jackrabbit
oak-jackrabbit-api
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index e1b89a1e22..8ab50429e9 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -819,6 +819,10 @@
camel-drill
4.5.0
+
+com.google.guava
+listenablefuture
+
org.checkerframework
checker-qual
@@ -1015,6 +1019,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1068,6 +1076,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1137,6 +1149,10 @@
com.google.code.findbugs
jsr305
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1175,6 +1191,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
org.checkerframework
checker-qual
@@ -6252,6 +6272,10 @@
com.google.code.findbugs
jsr305
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -6582,6 +6606,11 @@
httpcore5
5.2.1
(camel-quarkus) branch 3.8.x updated (74b847a350 -> 6ce0316799)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 74b847a350 Jt400: tests are not cleaning after themselves and parallel run fails new da8e9589e9 Ban com.google.guava:listenablefuture because it does not contain any code anyway new 6ce0316799 Manage org.apache.httpcomponents.core5:httpcore5-h2 to avoid convergence issues with CXF 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: poms/bom/pom.xml | 29 ++ poms/bom/src/main/generated/flattened-full-pom.xml | 29 ++ .../src/main/generated/flattened-reduced-pom.xml | 29 ++ .../generated/flattened-reduced-verbose-pom.xml| 29 ++ .../camel-quarkus-banned-dependencies.xml | 1 + 5 files changed, 117 insertions(+)
(camel-quarkus) 01/02: Ban com.google.guava:listenablefuture because it does not contain any code anyway
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit da8e9589e9e420a3a7977ec523e330f8fbc65933
Author: Peter Palaga
AuthorDate: Tue Apr 16 16:05:32 2024 +0200
Ban com.google.guava:listenablefuture because it does not contain any code
anyway
---
poms/bom/pom.xml | 24 ++
.../camel-quarkus-banned-dependencies.xml | 1 +
2 files changed, 25 insertions(+)
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 90ccc532bd..2afe3140e5 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -870,6 +870,10 @@
camel-drill
${camel.version}
+
+com.google.guava
+listenablefuture
+
org.checkerframework
checker-qual
@@ -1066,6 +1070,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1119,6 +1127,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1188,6 +1200,10 @@
com.google.code.findbugs
jsr305
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1226,6 +1242,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
org.checkerframework
checker-qual
@@ -6238,6 +6258,10 @@
com.google.code.findbugs
jsr305
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
diff --git a/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
b/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
index 5a0874211f..25646eb02b 100644
--- a/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
+++ b/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
@@ -25,6 +25,7 @@
com.github.spotbugs:spotbugs-annotations
com.github.stephenc.jcip:jcip-annotations
com.google.code.findbugs:jsr305
+com.google.guava:listenablefuture
com.sun.activation:javax.activation
com.sun.activation:jakarta.activation
com.sun.mail:javax.mail
(camel-quarkus) branch main updated (5b74e44183 -> 67759776a6)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 5b74e44183 Jt400: tests are not cleaning after themselves and parallel run fails new c147881c8e Ban com.google.guava:listenablefuture because it does not contain any code anyway new 67759776a6 Manage org.apache.httpcomponents.core5:httpcore5-h2 to avoid convergence issues with CXF 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: poms/bom/pom.xml | 29 ++ poms/bom/src/main/generated/flattened-full-pom.xml | 29 ++ .../src/main/generated/flattened-reduced-pom.xml | 29 ++ .../generated/flattened-reduced-verbose-pom.xml| 29 ++ .../camel-quarkus-banned-dependencies.xml | 1 + 5 files changed, 117 insertions(+)
(camel-quarkus) 01/02: Ban com.google.guava:listenablefuture because it does not contain any code anyway
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c147881c8e113a4c9f41b2a517d71f8aa9366854
Author: Peter Palaga
AuthorDate: Tue Apr 16 16:05:32 2024 +0200
Ban com.google.guava:listenablefuture because it does not contain any code
anyway
---
poms/bom/pom.xml | 24 ++
.../camel-quarkus-banned-dependencies.xml | 1 +
2 files changed, 25 insertions(+)
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 9bb941bb82..ce8623f5ad 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -881,6 +881,10 @@
camel-drill
${camel.version}
+
+com.google.guava
+listenablefuture
+
org.checkerframework
checker-qual
@@ -1077,6 +1081,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1130,6 +1138,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1199,6 +1211,10 @@
com.google.code.findbugs
jsr305
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
@@ -1237,6 +1253,10 @@
com.google.android
annotations
+
+com.google.guava
+listenablefuture
+
org.checkerframework
checker-qual
@@ -6330,6 +6350,10 @@
com.google.code.findbugs
jsr305
+
+com.google.guava
+listenablefuture
+
commons-logging
commons-logging
diff --git a/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
b/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
index 5a0874211f..25646eb02b 100644
--- a/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
+++ b/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
@@ -25,6 +25,7 @@
com.github.spotbugs:spotbugs-annotations
com.github.stephenc.jcip:jcip-annotations
com.google.code.findbugs:jsr305
+com.google.guava:listenablefuture
com.sun.activation:javax.activation
com.sun.activation:jakarta.activation
com.sun.mail:javax.mail
(camel-quarkus) branch 3.8.x updated: Improve the testability against Quarkus Platform BOMs
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.8.x by this push:
new 760c64c783 Improve the testability against Quarkus Platform BOMs
760c64c783 is described below
commit 760c64c7836e353f0828cbb41ad435484d7f3d2b
Author: Peter Palaga
AuthorDate: Thu Apr 4 14:32:01 2024 +0200
Improve the testability against Quarkus Platform BOMs
---
integration-tests-support/pom.xml | 25 +++--
integration-tests/messaging/common/pom.xml | 145 -
integration-tests/messaging/jms/pom.xml| 94 +++
integration-tests/messaging/sjms/pom.xml | 93 ++
4 files changed, 201 insertions(+), 156 deletions(-)
diff --git a/integration-tests-support/pom.xml
b/integration-tests-support/pom.xml
index e2b853da77..b92b45ee22 100644
--- a/integration-tests-support/pom.xml
+++ b/integration-tests-support/pom.xml
@@ -35,6 +35,17 @@
so that we can keep a flat hierarchy in the integration-tests
directory.
+
+
+io.quarkus
+
quarkus-bom
+${quarkus.version}
+
org.apache.camel.quarkus
+
camel-quarkus-bom
+
3.8.2-SNAPSHOT
+3.8.2-SNAPSHOT
+
+
activemq
aws2
@@ -61,23 +72,23 @@
-io.quarkus
-quarkus-bom
-${quarkus.version}
+${quarkus.platform.group-id}
+${quarkus.platform.artifact-id}
+${quarkus.platform.version}
pom
import
-org.apache.camel.quarkus
-camel-quarkus-bom
-${project.version}
+${camel-quarkus.platform.group-id}
+${camel-quarkus.platform.artifact-id}
+${camel-quarkus.platform.version}
pom
import
org.apache.camel.quarkus
camel-quarkus-bom-test
-${project.version}
+${camel-quarkus.version}
pom
import
diff --git a/integration-tests/messaging/common/pom.xml
b/integration-tests/messaging/common/pom.xml
index c682f013a5..05d8021ff7 100644
--- a/integration-tests/messaging/common/pom.xml
+++ b/integration-tests/messaging/common/pom.xml
@@ -74,73 +74,6 @@
rest-assured
test
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-bean-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-direct-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-jta-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-mock-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-xml-jaxp-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
@@ -159,5 +92,83 @@
+
+
+virtualDependencies
+
+
+!noVirtualDependencies
+
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-bean-deployment
+${project.version}
+pom
+test
+
+
+*
+*
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-direct-deployment
+${project.version}
+pom
+test
(camel-quarkus) branch main updated: Improve the testability against Quarkus Platform BOMs
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new e9843295ea Improve the testability against Quarkus Platform BOMs
e9843295ea is described below
commit e9843295ea9827235f46a3ccdd2818de33248092
Author: Peter Palaga
AuthorDate: Thu Apr 4 14:32:01 2024 +0200
Improve the testability against Quarkus Platform BOMs
---
integration-tests-support/pom.xml | 25 +++--
integration-tests/messaging/common/pom.xml | 145 -
integration-tests/messaging/jms/pom.xml| 94 +++
integration-tests/messaging/sjms/pom.xml | 93 ++
4 files changed, 201 insertions(+), 156 deletions(-)
diff --git a/integration-tests-support/pom.xml
b/integration-tests-support/pom.xml
index eec1f1deed..edb59accd7 100644
--- a/integration-tests-support/pom.xml
+++ b/integration-tests-support/pom.xml
@@ -35,6 +35,17 @@
so that we can keep a flat hierarchy in the integration-tests
directory.
+
+
+io.quarkus
+
quarkus-bom
+${quarkus.version}
+
org.apache.camel.quarkus
+
camel-quarkus-bom
+
3.10.0-SNAPSHOT
+3.10.0-SNAPSHOT
+
+
activemq
aws2
@@ -61,23 +72,23 @@
-io.quarkus
-quarkus-bom
-${quarkus.version}
+${quarkus.platform.group-id}
+${quarkus.platform.artifact-id}
+${quarkus.platform.version}
pom
import
-org.apache.camel.quarkus
-camel-quarkus-bom
-${project.version}
+${camel-quarkus.platform.group-id}
+${camel-quarkus.platform.artifact-id}
+${camel-quarkus.platform.version}
pom
import
org.apache.camel.quarkus
camel-quarkus-bom-test
-${project.version}
+${camel-quarkus.version}
pom
import
diff --git a/integration-tests/messaging/common/pom.xml
b/integration-tests/messaging/common/pom.xml
index e60d26fa45..3fb7f3ce1a 100644
--- a/integration-tests/messaging/common/pom.xml
+++ b/integration-tests/messaging/common/pom.xml
@@ -74,73 +74,6 @@
rest-assured
test
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-bean-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-direct-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-jta-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-mock-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-xml-jaxp-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
@@ -159,5 +92,83 @@
+
+
+virtualDependencies
+
+
+!noVirtualDependencies
+
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-bean-deployment
+${project.version}
+pom
+test
+
+
+*
+*
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-direct-deployment
+${project.version}
+pom
+test
(camel-quarkus) branch pull/5921/head deleted (was 8db09d8d90)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch pull/5921/head in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was 8db09d8d90 Upgrade to cq-maven-plugin 4.7.0 This change permanently discards the following revisions: discard 8db09d8d90 Upgrade to cq-maven-plugin 4.7.0 discard 16c84ac22c Add Qdrant JVM only extension #5860 discard 815a6486fa Upgrade Camel to 4.5.0
(camel-quarkus) 02/03: Add Qdrant JVM only extension #5860
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch pull/5921/head
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 16c84ac22c02009739be950a580af49f6d234b44
Author: aldettinger
AuthorDate: Mon Mar 11 17:19:18 2024 +0100
Add Qdrant JVM only extension #5860
---
docs/modules/ROOT/examples/components/qdrant.yml | 13 ++
docs/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/reference/extensions/qdrant.adoc| 41 +
extensions-jvm/pom.xml | 1 +
extensions-jvm/qdrant/deployment/pom.xml | 2 +-
.../qdrant/deployment/QdrantProcessor.java | 46 +++
extensions-jvm/qdrant/pom.xml | 2 +-
extensions-jvm/qdrant/runtime/pom.xml | 4 +-
.../main/resources/META-INF/quarkus-extension.yaml | 33 ++
integration-tests-jvm/pom.xml | 1 +
integration-tests-jvm/qdrant/pom.xml | 2 +-
.../component/qdrant/it/QdrantResource.java| 50
.../quarkus/component/qdrant/it/QdrantTest.java| 34 ++
poms/bom/pom.xml | 43 --
poms/bom/src/main/generated/flattened-full-pom.xml | 43 --
.../src/main/generated/flattened-reduced-pom.xml | 53 --
.../generated/flattened-reduced-verbose-pom.xml| 53 --
17 files changed, 397 insertions(+), 25 deletions(-)
diff --git a/docs/modules/ROOT/examples/components/qdrant.yml
b/docs/modules/ROOT/examples/components/qdrant.yml
new file mode 100644
index 00..0887a47046
--- /dev/null
+++ b/docs/modules/ROOT/examples/components/qdrant.yml
@@ -0,0 +1,13 @@
+# Do not edit directly!
+# This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+cqArtifactId: camel-quarkus-qdrant
+cqArtifactIdBase: qdrant
+cqNativeSupported: false
+cqStatus: Preview
+cqDeprecated: false
+cqJvmSince: 3.10.0
+cqNativeSince: n/a
+cqCamelPartName: qdrant
+cqCamelPartTitle: Qdrant
+cqCamelPartDescription: Perform operations on the Qdrant Vector Database.
+cqExtensionPageTitle: Qdrant
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index f09f593454..0dabad3803 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -241,6 +241,7 @@
*** xref:reference/extensions/jackson-protobuf.adoc[Protobuf Jackson]
*** xref:reference/extensions/pubnub.adoc[PubNub]
*** xref:reference/extensions/pulsar.adoc[Pulsar]
+*** xref:reference/extensions/qdrant.adoc[Qdrant]
*** xref:reference/extensions/quartz.adoc[Quartz]
*** xref:reference/extensions/quickfix.adoc[QuickFix]
*** xref:reference/extensions/qute.adoc[Qute]
diff --git a/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc
b/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc
new file mode 100644
index 00..549ddc6cfb
--- /dev/null
+++ b/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc
@@ -0,0 +1,41 @@
+// Do not edit directly!
+// This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+[id="extensions-qdrant"]
+= Qdrant
+:linkattrs:
+:cq-artifact-id: camel-quarkus-qdrant
+:cq-native-supported: false
+:cq-status: Preview
+:cq-status-deprecation: Preview
+:cq-description: Perform operations on the Qdrant Vector Database.
+:cq-deprecated: false
+:cq-jvm-since: 3.10.0
+:cq-native-since: n/a
+
+ifeval::[{doc-show-badges} == true]
+[.badges]
+[.badge-key]##JVM since##[.badge-supported]##3.10.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
+endif::[]
+
+Perform operations on the Qdrant Vector Database.
+
+[id="extensions-qdrant-whats-inside"]
+== What's inside
+
+* xref:{cq-camel-components}::qdrant-component.adoc[Qdrant component], URI
syntax: `qdrant:collection`
+
+Please refer to the above link for usage and configuration details.
+
+[id="extensions-qdrant-maven-coordinates"]
+== Maven coordinates
+
+[source,xml]
+
+
+org.apache.camel.quarkus
+camel-quarkus-qdrant
+
+
+ifeval::[{doc-show-user-guide-link} == true]
+Check the xref:user-guide/index.adoc[User guide] for more information about
writing Camel Quarkus applications.
+endif::[]
diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
index 8e16b04c66..94eaf452ae 100644
--- a/extensions-jvm/pom.xml
+++ b/extensions-jvm/pom.xml
@@ -85,6 +85,7 @@
opensearch
printer
pulsar
+qdrant
quickfix
redis
robotframework
diff --git a/extensions-jvm/qdrant/deployment/pom.xml
b/extensions-jvm/qdrant/deployment/pom.xml
index 6f5e78b0f3..a84753ed29 100644
--- a/extensions-jvm/qdrant/deployment/pom.xml
+++ b/extensions-jvm/qdrant/deployment/pom.xml
@@ -24,7 +24,7 @@
org.apache.camel.quarkus
camel-quarkus-qdrant-parent
-3.9.1-SNAPSHOT
+
(camel-quarkus) 03/03: Upgrade to cq-maven-plugin 4.7.0
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch pull/5921/head in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 8db09d8d907c2c88551c8970e84568e9aabb41a3 Author: Peter Palaga AuthorDate: Fri Mar 29 22:02:02 2024 +0100 Upgrade to cq-maven-plugin 4.7.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef87411f4c..17bc1eae89 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ 0.1.0 -4.6.1 +4.7.0 2.8.0 3.5.0 3.2.0
(camel-quarkus) branch pull/5921/head created (now 8db09d8d90)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch pull/5921/head in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 8db09d8d90 Upgrade to cq-maven-plugin 4.7.0 This branch includes the following new commits: new 815a6486fa Upgrade Camel to 4.5.0 new 16c84ac22c Add Qdrant JVM only extension #5860 new 8db09d8d90 Upgrade to cq-maven-plugin 4.7.0 The 3 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.
(camel-quarkus) branch main updated: Manage com.sun.xml.fastinfoset:FastInfoset
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 5d7a131de2 Manage com.sun.xml.fastinfoset:FastInfoset 5d7a131de2 is described below commit 5d7a131de207608195a0c4300f2699e3c2d6000e Author: Zheng Feng AuthorDate: Thu Mar 21 09:18:08 2024 +0800 Manage com.sun.xml.fastinfoset:FastInfoset --- poms/bom/pom.xml | 1 + poms/bom/src/main/generated/flattened-reduced-pom.xml | 15 +++ .../src/main/generated/flattened-reduced-verbose-pom.xml | 15 +++ 3 files changed, 31 insertions(+) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index a3ef0d6d00..0b364b5a04 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -7109,6 +7109,7 @@ com.ibm.mq:com.ibm.mq.jakarta.client com.ibm.icu:icu4j com.squareup.okhttp3:mockwebserver + com.sun.xml.fastinfoset:FastInfoset org.mapstruct:mapstruct-processor diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index ecba76fe48..6b6b9e2e82 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7146,6 +7146,21 @@ woodstox-core 6.6.1 + +com.sun.xml.fastinfoset +FastInfoset +2.1.1 + + +javax.xml +jsr173 + + +javax.xml.bind +jsr173_api + + + com.sun.xml.messaging.saaj saaj-impl 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 298777aa52..25b8e5ce75 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7146,6 +7146,21 @@ woodstox-core 6.6.1 + +com.sun.xml.fastinfoset +FastInfoset +2.1.1 + + +javax.xml +jsr173 + + +javax.xml.bind +jsr173_api + + + com.sun.xml.messaging.saaj saaj-impl
(camel-quarkus) branch main updated: Upgrade to Quarkus CXF 3.9.0
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new d8d82ac276 Upgrade to Quarkus CXF 3.9.0 d8d82ac276 is described below commit d8d82ac276911cd30063860e2d00989b85e146e4 Author: Peter Palaga AuthorDate: Wed Mar 20 18:26:57 2024 +0100 Upgrade to Quarkus CXF 3.9.0 --- pom.xml| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 538 ++--- .../src/main/generated/flattened-reduced-pom.xml | 56 +-- .../generated/flattened-reduced-verbose-pom.xml| 524 ++-- 4 files changed, 560 insertions(+), 560 deletions(-) diff --git a/pom.xml b/pom.xml index 1894e84b22..91c5aed301 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 9.37.0.Final 2.12.1 3.2.1 -3.8.1 +3.9.0 1.0.0 3.8.0 2.0.2 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 1c61b68732..3ee54f5fa2 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6993,471 +6993,471 @@ 3.9.0 -org.apache.cxf -cxf-core -4.0.4 +org.apache.cxf +cxf-core +4.0.4 -org.apache.cxf -cxf-rt-features-logging -4.0.4 +org.apache.cxf +cxf-rt-features-logging +4.0.4 -org.apache.cxf -cxf-rt-features-metrics -4.0.4 +org.apache.cxf +cxf-rt-features-metrics +4.0.4 -org.apache.cxf -cxf-rt-frontend-jaxws -4.0.4 +org.apache.cxf +cxf-rt-frontend-jaxws +4.0.4 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf -cxf-rt-transports-http -4.0.4 +org.apache.cxf +cxf-rt-transports-http +4.0.4 -org.apache.cxf -cxf-rt-transports-http-hc5 -4.0.4 +org.apache.cxf +cxf-rt-transports-http-hc5 +4.0.4 -org.slf4j -jcl-over-slf4j +org.slf4j +jcl-over-slf4j -org.apache.cxf -cxf-rt-ws-mex -4.0.4 +org.apache.cxf +cxf-rt-ws-mex +4.0.4 -org.apache.cxf -cxf-rt-ws-security -4.0.4 +org.apache.cxf +cxf-rt-ws-security +4.0.4 -org.apache.cxf -cxf-rt-ws-rm -4.0.4 +org.apache.cxf +cxf-rt-ws-rm +4.0.4 -org.apache.cxf -cxf-rt-wsdl -4.0.4 +org.apache.cxf +cxf-rt-wsdl +4.0.4 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf.services.sts -cxf-services-sts-core -4.0.4 +org.apache.cxf.services.sts +cxf-services-sts-core +4.0.4 -org.apache.cxf.xjcplugins -cxf-xjc-boolean -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-boolean +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-dv -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-dv +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-javadoc -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-javadoc +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-pl -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-pl +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-ts -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-ts +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-wsdlextension -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-wsdlextension +4.0.0 -org.apache.cxf.xjc-utils -cxf-xjc-runtime -4.0.0 +org.apache.cxf.xjc-utils +cxf-xjc-runtime +4.0.0 -org.apache.santuario -xmlsec -3.0.4 +org.apache.santuario +xmlsec +3.0.4 -io.quarkiverse.cxf -quarkus-cxf -3.8.1 +io.quarkiverse.cxf +quarkus-cxf +3.9.0 -io.quarkiverse.cxf -quarkus-cxf-axiom-api-stub -3.8.1 +io.quarkiverse.cxf
(camel-quarkus) branch 3.8.x updated: Manage software.amazon.awssdk:endpoints-spi
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.8.x by this push:
new 10c6918c4e Manage software.amazon.awssdk:endpoints-spi
10c6918c4e is described below
commit 10c6918c4e24d164ef1ec04997a71dc84b5dddcd
Author: Peter Palaga
AuthorDate: Wed Feb 28 20:04:59 2024 +0100
Manage software.amazon.awssdk:endpoints-spi
---
poms/bom/pom.xml | 5 +
poms/bom/src/main/generated/flattened-full-pom.xml| 5 +
poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 +
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 +
4 files changed, 20 insertions(+)
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 074a36ec16..4139d85e60 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -7038,6 +7038,11 @@
jedis
${jedis-client.version}
+
+software.amazon.awssdk
+endpoints-spi
+${awssdk.version}
+
software.amazon.awssdk
http-auth-aws
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 1d67aff669..3b74b01927 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6961,6 +6961,11 @@
jedis
5.1.0
+
+software.amazon.awssdk
+endpoints-spi
+2.24.9
+
software.amazon.awssdk
http-auth-aws
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 70ddedd488..cad47bb519 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6841,6 +6841,11 @@
jedis
5.1.0
+
+software.amazon.awssdk
+endpoints-spi
+2.24.9
+
software.amazon.awssdk
http-auth-aws
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 b51b3e38a7..b2cd7613d8 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6841,6 +6841,11 @@
jedis
5.1.0
+
+software.amazon.awssdk
+endpoints-spi
+2.24.9
+
software.amazon.awssdk
http-auth-aws
(camel-quarkus) branch main updated: Manage software.amazon.awssdk:endpoints-spi
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 4c4f79b52d Manage software.amazon.awssdk:endpoints-spi
4c4f79b52d is described below
commit 4c4f79b52da030a88b9769345515efd1ed29cec1
Author: Peter Palaga
AuthorDate: Wed Feb 28 20:04:59 2024 +0100
Manage software.amazon.awssdk:endpoints-spi
---
poms/bom/pom.xml | 5 +
poms/bom/src/main/generated/flattened-full-pom.xml| 5 +
poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 +
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 +
4 files changed, 20 insertions(+)
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 7c6be019a4..23a9a75125 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -7038,6 +7038,11 @@
jedis
${jedis-client.version}
+
+software.amazon.awssdk
+endpoints-spi
+${awssdk.version}
+
software.amazon.awssdk
http-auth-aws
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index b5b4f42519..834a19e390 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6961,6 +6961,11 @@
jedis
5.1.0
+
+software.amazon.awssdk
+endpoints-spi
+2.24.9
+
software.amazon.awssdk
http-auth-aws
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 70ea0b32c0..40962381f8 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6841,6 +6841,11 @@
jedis
5.1.0
+
+software.amazon.awssdk
+endpoints-spi
+2.24.9
+
software.amazon.awssdk
http-auth-aws
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 fce258da45..f764381d2d 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6841,6 +6841,11 @@
jedis
5.1.0
+
+software.amazon.awssdk
+endpoints-spi
+2.24.9
+
software.amazon.awssdk
http-auth-aws
(camel-quarkus) branch main updated: Regenerate extension metadata
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new e3c7b7e158 Regenerate extension metadata e3c7b7e158 is described below commit e3c7b7e15846a88aab6a6ec54f5ab432270f1c47 Author: James Netherton AuthorDate: Wed Jan 24 08:36:34 2024 + Regenerate extension metadata --- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../camel-k/runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../joor/runtime/src/main/resources/META-INF/quarkus-extension.yaml | 1 + .../xj/runtime/src/main/resources/META-INF/quarkus-extension.yaml | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions-jvm/spring-redis/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-jvm/spring-redis/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 97504c96c6..7b0417d83d 100644 --- a/extensions-jvm/spring-redis/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions-jvm/spring-redis/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -23,8 +23,8 @@ --- name: "Camel Spring Redis" description: "Send and receive messages from Redis" -icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"; metadata: + icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"; unlisted: true guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/spring-redis.html"; categories: diff --git a/extensions/camel-k/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/camel-k/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 8a86b84422..00edb28623 100644 --- a/extensions/camel-k/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/camel-k/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -23,8 +23,8 @@ --- name: "Camel K" description: "Camel runtime specialization for Camel K" -icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"; metadata: + icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"; unlisted: true categories: - "integration" diff --git a/extensions/joor/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/joor/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 834f02270e..94b0303a77 100644 --- a/extensions/joor/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/joor/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -30,3 +30,4 @@ metadata: - "integration" status: - "stable" + - "deprecated" \ No newline at end of file diff --git a/extensions/xj/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/xj/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 2b8499e81a..32d8aa0e0f 100644 --- a/extensions/xj/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/xj/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,7 +25,6 @@ name: "Camel XJ" description: "Transform JSON and XML message using a XSLT" metadata: icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"; - unlisted: true guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/xj.html"; categories: - "integration"
(camel-quarkus) branch main updated: Upgrade to Quarkus CXF 2.7.0.CR2
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new e7ea089a8a Upgrade to Quarkus CXF 2.7.0.CR2
e7ea089a8a is described below
commit e7ea089a8a1e49ceb559f6ba1d68194082bca937
Author: Peter Palaga
AuthorDate: Fri Jan 19 16:23:58 2024 +0100
Upgrade to Quarkus CXF 2.7.0.CR2
---
.../jackson-dataformat-xml/deployment/pom.xml | 4 +
.../JacksonDataformatXmlSupportProcessor.java | 27 +-
.../jackson-dataformat-xml/runtime/pom.xml | 4 +
pom.xml| 2 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 521 +++--
.../src/main/generated/flattened-reduced-pom.xml | 67 ++-
.../generated/flattened-reduced-verbose-pom.xml| 521 +++--
7 files changed, 599 insertions(+), 547 deletions(-)
diff --git a/extensions-support/jackson-dataformat-xml/deployment/pom.xml
b/extensions-support/jackson-dataformat-xml/deployment/pom.xml
index 1fb7eb13f4..a84462e0af 100644
--- a/extensions-support/jackson-dataformat-xml/deployment/pom.xml
+++ b/extensions-support/jackson-dataformat-xml/deployment/pom.xml
@@ -41,6 +41,10 @@
org.apache.camel.quarkus
camel-quarkus-support-jackson-dataformat-xml
+
+io.quarkiverse.cxf
+quarkus-cxf-woodstox-deployment
+
diff --git
a/extensions-support/jackson-dataformat-xml/deployment/src/main/java/org/apache/camel/quarkus/support/jackson/datafromat/xml/deployment/JacksonDataformatXmlSupportProcessor.java
b/extensions-support/jackson-dataformat-xml/deployment/src/main/java/org/apache/camel/quarkus/support/jackson/datafromat/xml/deployment/JacksonDataformatXmlSupportProcessor.java
index 26b68def72..b44beedc66 100644
---
a/extensions-support/jackson-dataformat-xml/deployment/src/main/java/org/apache/camel/quarkus/support/jackson/datafromat/xml/deployment/JacksonDataformatXmlSupportProcessor.java
+++
b/extensions-support/jackson-dataformat-xml/deployment/src/main/java/org/apache/camel/quarkus/support/jackson/datafromat/xml/deployment/JacksonDataformatXmlSupportProcessor.java
@@ -21,19 +21,12 @@ import java.util.ArrayList;
import java.util.Set;
import java.util.stream.Stream;
-import javax.xml.stream.XMLEventFactory;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import com.ctc.wstx.shaded.msv.org_isorelax.verifier.VerifierFactoryLoader;
-import com.ctc.wstx.shaded.msv.relaxng_datatype.DatatypeLibraryFactory;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.ObjectCodec;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
import io.quarkus.deployment.util.ServiceUtil;
-import org.codehaus.stax2.validation.XMLValidationSchemaFactory;
public class JacksonDataformatXmlSupportProcessor {
@@ -41,22 +34,10 @@ public class JacksonDataformatXmlSupportProcessor {
@BuildStep
void serviceProviders(BuildProducer
serviceProviders) {
-Stream.concat(
-Stream.of(
-JsonFactory.class,
-ObjectCodec.class,
-VerifierFactoryLoader.class,
-DatatypeLibraryFactory.class,
-XMLEventFactory.class,
-XMLInputFactory.class,
-XMLOutputFactory.class)
-.map(Class::getName),
-Stream.of(
-XMLValidationSchemaFactory.INTERNAL_ID_SCHEMA_DTD,
-XMLValidationSchemaFactory.INTERNAL_ID_SCHEMA_RELAXNG,
-XMLValidationSchemaFactory.INTERNAL_ID_SCHEMA_W3C,
-XMLValidationSchemaFactory.INTERNAL_ID_SCHEMA_TREX)
-.map(schemaId ->
XMLValidationSchemaFactory.class.getName() + "." + schemaId))
+Stream.of(
+JsonFactory.class,
+ObjectCodec.class)
+.map(Class::getName)
.forEach(serviceName -> {
try {
final Set names =
ServiceUtil.classNamesNamedIn(Thread.currentThread().getContextClassLoader(),
diff --git a/extensions-support/jackson-dataformat-xml/runtime/pom.xml
b/extensions-support/jackson-dataformat-xml/runtime/pom.xml
index 103e560fbc..426c44a212 100644
--- a/extensions-support/jackson-dataformat-xml/runtime/pom.xml
+++ b/extensions-support/jackson-dataformat-xml/runtime/pom.xml
@@ -41,6 +41,10 @@
com.fasterxml.jackson.dataformat
jackson-dataformat-xml
+
+io.quarkiverse.cxf
+
(camel-quarkus) branch dependabot/github_actions/actions/upload-artifact-4 updated (b712752c11 -> 048fea0bc6)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch dependabot/github_actions/actions/upload-artifact-4 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from b712752c11 Bump actions/upload-artifact from 3 to 4 add 048fea0bc6 Bump actions/download-artifact from 3 to 4 No new revisions were added by this update. Summary of changes: .github/workflows/camel-master-cron.yaml | 14 +++--- .github/workflows/ci-build.yaml| 12 ++-- .github/workflows/quarkus-master-cron.yaml | 14 +++--- 3 files changed, 20 insertions(+), 20 deletions(-)
(camel) branch main updated (6842e6ef25e -> 07f4434c8b1)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 6842e6ef25e (chores) camel-test-infra-consul: update Consul container to the latest version add 07f4434c8b1 Bump org.l2x6.cq:cq-alias-fastinstall-quickly-extension No new revisions were added by this update. Summary of changes: .mvn/extensions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-quarkus) branch main updated (df1aeb7998 -> 981da913f2)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from df1aeb7998 Add --fail-at-end to functional-extension-tests Maven executions add fbf1b01853 Bump quarkiverse-tika.version from 2.0.2 to 2.0.3 add 981da913f2 Auto generated changes for dependabot commit 91e6d1449a4990f8edd90cb8d1619e9fde9ab4c7 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
[camel-quarkus] branch main updated: Document how users can upgrade to new Camel Quarkus releases without a Quarkus Platform release
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 5389e6a47b Document how users can upgrade to new Camel Quarkus
releases without a Quarkus Platform release
5389e6a47b is described below
commit 5389e6a47ba784b05e06233fc6354851f4a15754
Author: James Netherton
AuthorDate: Thu Oct 26 07:57:59 2023 +0100
Document how users can upgrade to new Camel Quarkus releases without a
Quarkus Platform release
Fixes #5449
---
docs/antora.yml| 1 +
.../pages/user-guide/dependency-management.adoc| 58 --
tooling/scripts/update-antora-config.groovy| 2 +
3 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index adfe0b55ae..c0b95a6d40 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,6 +30,7 @@ asciidoc:
# Project versions
camel-version: 4.1.0 # replace ${camel.version}
camel-docs-version: 4.0.x
+camel-quarkus-version: 3.6.0 # replace ${camel-quarkus.version}
quarkus-version: 3.5.0 # replace ${quarkus.version}
graalvm-version: 23.0.1 # replace ${graalvm.version}
graalvm-docs-version: jdk17
diff --git a/docs/modules/ROOT/pages/user-guide/dependency-management.adoc
b/docs/modules/ROOT/pages/user-guide/dependency-management.adoc
index 9070167bef..84f03ae479 100644
--- a/docs/modules/ROOT/pages/user-guide/dependency-management.adoc
+++ b/docs/modules/ROOT/pages/user-guide/dependency-management.adoc
@@ -83,14 +83,64 @@ Note that not all combinations of artifacts managed by the
various BOMs are test
== Combining with other BOMs
-When combining `camel-quarkus-bom` with any other BOM,
+When combining `quarkus-camel-bom` with any other BOM,
think carefully in which order you import them,
because the order of imports defines the precedence.
-I.e. if `my-foo-bom` is imported before `camel-quarkus-bom` then the versions
defined in
+I.e. if `my-foo-bom` is imported before `quarkus-camel-bom` then the versions
defined in
`my-foo-bom` will take the precedence.
-This might or might not be what you want, depending on whether there are any
overlaps between `my-foo-bom` and `camel-quarkus-bom`
-and depending on whether those versions with higher precedence work with the
rest of the artifacts managed in `camel-quarkus-bom`.
+This might or might not be what you want, depending on whether there are any
overlaps between `my-foo-bom` and `quarkus-camel-bom`
+and depending on whether those versions with higher precedence work with the
rest of the artifacts managed in `quarkus-camel-bom`.
+
+== Upgrading to new Camel Quarkus releases
+
+Assuming you are importing `quarkus-bom` and `quarkus-camel-bom` in your
project, upgrading to new releases should be a simple case of incrementing the
`quarkus.platform.version` property.
+
+Sometimes it happens that the latest Camel Quarkus release is not yet availble
via the `quarkus-camel-bom`.
+To work around this, you can replace the
`io.quarkus.platform:quarkus-camel-bom` import with
`org.apache.camel.quarkus:camel-quarkus-bom`.
+
+Note that if you do this, some dependencies in `camel-quarkus-bom` may not be
perfectly aligned with other Quarkus universe members as they would be in
`quarkus-camel-bom`.
+
+[source,xml,subs="attributes+"]
+
+
+ ...
+
+{quarkus-version}
+{camel-quarkus-version}
+...
+
+
+
+
+
+io.quarkus.platform
+quarkus-bom
+${quarkus.platform.version}
+pom
+import
+
+
+org.apache.camel.quarkus
+camel-quarkus-bom
+${camel-quarkus.version}
+pom
+import
+
+
+
+
+
+
+IMPORTANT: Ensure that the major.minor version parts of
`quarkus.platform.version` & `camel-quarkus.version` match. Mixing different
release streams will likely result in build or runtime errors.
+
+When upgrading from one major release to another (E.g from 2.x to 3.x).
+Quarkus provides an https://quarkus.io/guides/update-quarkus[updater tool]
that can apply the necessary modifications to your project and make it
compatible with the new major release.
+
+In addition, Camel & Camel Quarkus publish migration guides that document
potential breaking changes.
+
+* xref:manual::migration-and-upgrade.adoc[Camel migration guides]
+* xref:migration-guide/index.adoc[Camel Quarkus migration guides]
== What's next?
diff --git a/tooling/scripts/update-antora-config.groovy
b/tooling/scripts/update-antora-config.groovy
index 126f83bbe3..4d3459df84 100644
--- a/tooling/scripts/update-antora-config.groovy
+++ b/tooling/scripts/update-antora-config.groovy
@@ -41,6 +41,8 @@ if (!missingFiles.isEmpty()) {
}
+project.properties['camel-quarkus.version'] =
p
[camel-website] branch main updated: Announce Camel Quarkus 3.2.1
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/main by this push: new 39b4cd01 Announce Camel Quarkus 3.2.1 39b4cd01 is described below commit 39b4cd011c98119f0f4571f64d35ff082b295fde Author: Peter Palaga AuthorDate: Mon Oct 9 11:54:19 2023 +0200 Announce Camel Quarkus 3.2.1 --- .../camel-featured.jpeg| Bin 0 -> 625206 bytes .../2023/10/camel-quarkus-release-3.2.1/index.md | 22 + content/releases/q/release-3.2.1.md| 14 + 3 files changed, 36 insertions(+) diff --git a/content/blog/2023/10/camel-quarkus-release-3.2.1/camel-featured.jpeg b/content/blog/2023/10/camel-quarkus-release-3.2.1/camel-featured.jpeg new file mode 100644 index ..36c23a02 Binary files /dev/null and b/content/blog/2023/10/camel-quarkus-release-3.2.1/camel-featured.jpeg differ diff --git a/content/blog/2023/10/camel-quarkus-release-3.2.1/index.md b/content/blog/2023/10/camel-quarkus-release-3.2.1/index.md new file mode 100644 index ..70623830 --- /dev/null +++ b/content/blog/2023/10/camel-quarkus-release-3.2.1/index.md @@ -0,0 +1,22 @@ +--- +title: "Camel Quarkus 3.2.1 Released" +date: 2023-10-09 +authors: ["ppalaga"] +categories: ["Releases", "Camel Quarkus"] +preview: "Camel Quarkus 3.2.1 LTS Released" +summary: "The first patch release of the 3.2.x LTS stream bringing Camel 4.0.1" +--- + +Image by https://www.flickr.com/photos/lanzen/5984113332";>Anders Lanzen https://creativecommons.org/licenses/by-nc-sa/2.0";>CC BY-NC-SA 2.0 + +We are pleased to announce the 3.2.1 release of Camel Quarkus. The first patch release of the 3.2.x LTS stream. + +## Camel 4.0.1 +Please refer to the [Camel 4.0.1 announcement](/blog/2023/09/RELEASE-4.0.1/) for more details. + +## Quarkus 3.2.6.Final +Camel Quarkus 3.2.1 is based on Quarkus 3.2.6.Final](https://quarkus.io/blog/cve-2023-4853/). + +For more information, please check the [Release note](/releases/q-3.2.1/). + +Many thanks to all contributors and issue reporters! diff --git a/content/releases/q/release-3.2.1.md b/content/releases/q/release-3.2.1.md new file mode 100644 index ..1cae3c94 --- /dev/null +++ b/content/releases/q/release-3.2.1.md @@ -0,0 +1,14 @@ +--- +url: "/releases/q-3.2.1/" +date: 2023-10-09 +eol: 2024-03-01 +type: release-note +version: 3.2.1 +title: "New LTS Camel Quarkus release 3.2.1" +preview: "" +changelog: "" +category: "camel-quarkus" +milestone: 49 +kind: lts +jdk: [17] +--- \ No newline at end of file
[camel-quarkus] branch main updated: Add changelog for 3.2.1
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new b095a94bb9 Add changelog for 3.2.1 b095a94bb9 is described below commit b095a94bb91485d05cd81929af95bb1e96eada69 Author: Peter Palaga AuthorDate: Mon Oct 9 11:32:39 2023 +0200 Add changelog for 3.2.1 --- CHANGELOG.md | 33 + 1 file changed, 33 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bacac55f3c..45479cd9f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,38 @@ # Changelog +## 3.2.1 + +* [3.2.x] Reinstate auto update of antora.yml camel-docs-version attribute by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/5239 +* [3.2.x] Fix camel website build errors related to CQ by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/5257 +* [3.2.x] Exclude com.google.auto.value:auto-value-annotations from gRPC and Google Pubsub extensions by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/5264 +* [3.2.x] Upgrade to Quarkus CXF 2.2.3 by @ppalaga in https://github.com/apache/camel-quarkus/pull/5266 +* [3.2.x] Update supported since metadata from 3.0.0 to 3.2.0 by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/5272 +* [3.2.x] Remove redundant camel-quarkus-bom import in knative runtime module by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/5276 +* Backports 3.2.x by @zbendhiba in https://github.com/apache/camel-quarkus/pull/5283 +* Backport 3.2.x by @zhfeng in https://github.com/apache/camel-quarkus/pull/5291 +* [3.2.x] Javax replaced with jakarta in adoc files #5293 by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/5295 +* [3.2.x] Upgrade Quarkus to 3.2.6.Final by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/5305 +* Backports from main by @zbendhiba in https://github.com/apache/camel-quarkus/pull/5308 +* Update jms doc to add some usages about IBM MQ Client by @zhfeng in https://github.com/apache/camel-quarkus/pull/5342 +* [3.2.x] Upgrade to Quarkus CXF 2.2.4 by @ppalaga in https://github.com/apache/camel-quarkus/pull/5347 +* Mongodb: native build fails because of CredentialsProviderFinder by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/5337 +* Backport 3.2.x by @zhfeng in https://github.com/apache/camel-quarkus/pull/5344 +* Xslt-saxon: native build fails because of BrotliInputSreamFactory by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/5352 +* Backport 3.2.x by @zhfeng in https://github.com/apache/camel-quarkus/pull/5356 +* [3.2.x] Regen by @zhfeng in https://github.com/apache/camel-quarkus/pull/5359 +* Aws2 kinesis: native build fails because of missing netty by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/5363 +* Kafka: native build fails because of missing vertx by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/5368 +* Salesforce: native build fails because of missing netty by @JiriOndrusek in https://github.com/apache/camel-quarkus/pull/5372 +* [3.2.x] Improve descriptions for xml-jaxp & yaml-io extensions by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/5373 +* [3.2.x] Revert "Force Oracle devservices image to gvenzl/oracle-free:23.2-slim by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/5375 +* [3.2.x] Add missing quarkus-netty dependency to gRPC extension by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/5384 +* [3.2.x] Fix package name for xml-jaxp integration tests by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/5389 +* [3.2.x] Improve implementation of GooglePubsubTest.testOrdering by @jamesnetherton in https://github.com/apache/camel-quarkus/pull/5391 +* jta: fix dataSource bean reference in documentation (#5395) by @aldettinger in https://github.com/apache/camel-quarkus/pull/5396 +* [3.2.x] Upgrade to Quarkus CXF 2.2.5 by @ppalaga in https://github.com/apache/camel-quarkus/pull/5399 + +**Full Changelog**: https://github.com/apache/camel-quarkus/compare/3.2.0...3.2.1 + ## 3.4.0 * Next is 3.3.0 by @zbendhiba in https://github.com/apache/camel-quarkus/pull/5231
svn commit: r64413 - in /release/camel/camel-quarkus: 3.2.0/ 3.2.1/ 3.2.1/apache-camel-quarkus-3.2.1-src.zip 3.2.1/apache-camel-quarkus-3.2.1-src.zip.asc 3.2.1/apache-camel-quarkus-3.2.1-src.zip.sha51
Author: ppalaga Date: Mon Oct 9 09:12:40 2023 New Revision: 64413 Log: Apache Camel Quarkus 3.2.1 released artifacts Added: release/camel/camel-quarkus/3.2.1/ release/camel/camel-quarkus/3.2.1/apache-camel-quarkus-3.2.1-src.zip (with props) release/camel/camel-quarkus/3.2.1/apache-camel-quarkus-3.2.1-src.zip.asc (with props) release/camel/camel-quarkus/3.2.1/apache-camel-quarkus-3.2.1-src.zip.sha512 Removed: release/camel/camel-quarkus/3.2.0/ Added: release/camel/camel-quarkus/3.2.1/apache-camel-quarkus-3.2.1-src.zip == Binary file - no diff available. Propchange: release/camel/camel-quarkus/3.2.1/apache-camel-quarkus-3.2.1-src.zip -- svn:mime-type = application/zip Added: release/camel/camel-quarkus/3.2.1/apache-camel-quarkus-3.2.1-src.zip.asc == Binary file - no diff available. Propchange: release/camel/camel-quarkus/3.2.1/apache-camel-quarkus-3.2.1-src.zip.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-quarkus/3.2.1/apache-camel-quarkus-3.2.1-src.zip.sha512 == --- release/camel/camel-quarkus/3.2.1/apache-camel-quarkus-3.2.1-src.zip.sha512 (added) +++ release/camel/camel-quarkus/3.2.1/apache-camel-quarkus-3.2.1-src.zip.sha512 Mon Oct 9 09:12:40 2023 @@ -0,0 +1 @@ +ebe97d6f62a2aa9bf8f085ca97977ae3c891995c645946838baeea3927067c46d8a5a11967f4d83b3b9e9c459979ece39f7fa97e02fa2af782c2608ac851 apache-camel-quarkus-3.2.1-src.zip
[camel-quarkus] branch main updated (0bc74f93c1 -> 131e98998f)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 0bc74f93c1 Remove inImageBuildtimeCode check in XmlJaxbRecorder when creating JAXBContext add 131e98998f Remove redundant cxf.version property No new revisions were added by this update. Summary of changes: pom.xml | 1 - 1 file changed, 1 deletion(-)
[camel-quarkus] branch main updated (297848d97b -> 0bc74f93c1)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 297848d97b perf-tool: upgrade hyperfoil version (#5408) add 98d0de740c Use ImageMode enum in XmlJaxbRecorder instead of graal-sdk APIs add 0bc74f93c1 Remove inImageBuildtimeCode check in XmlJaxbRecorder when creating JAXBContext No new revisions were added by this update. Summary of changes: extensions-core/xml-jaxb/runtime/pom.xml | 5 - .../camel/quarkus/component/xml/jaxb/XmlJaxbRecorder.java | 11 --- 2 files changed, 4 insertions(+), 12 deletions(-)
[camel-quarkus] branch 3.2.x updated: Fixup release
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 3.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/3.2.x by this push: new 40b90b99af Fixup release 40b90b99af is described below commit 40b90b99af1ee62a0d0e74a4e89b48bf12b1b81f Author: Peter Palaga AuthorDate: Fri Oct 6 14:36:22 2023 +0200 Fixup release --- .../src/generated/resources/org/apache/camel/component/qute/qute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json index 06dd7cac22..040f8dff18 100644 --- a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json +++ b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json @@ -11,7 +11,7 @@ "supportLevel": "Preview", "groupId": "org.apache.camel.quarkus", "artifactId": "camel-quarkus-qute-component", -"version": "3.2.1-SNAPSHOT", +"version": "3.2.2-SNAPSHOT", "scheme": "qute", "extendsScheme": "", "syntax": "qute:resourceUri",
[camel-quarkus] annotated tag 3.2.1 created (now 55d1f26dc7)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to annotated tag 3.2.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 55d1f26dc7 (tag) tagging 91924c10e1243827b967911adc9d4d3f141ec55f (commit) replaces 3.2.0 by Peter Palaga on Wed Oct 4 21:01:08 2023 +0200 - Log - [maven-release-plugin] copy for tag 3.2.1 --- No new revisions were added by this update.
[camel-quarkus] branch 3.2.x updated: Upgrade to Quarkus CXF 2.2.5
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.2.x by this push:
new 120c073b46 Upgrade to Quarkus CXF 2.2.5
120c073b46 is described below
commit 120c073b46f0578a31b81a82c788de03caa2f7aa
Author: Peter Palaga
AuthorDate: Tue Oct 3 21:48:44 2023 +0200
Upgrade to Quarkus CXF 2.2.5
---
pom.xml| 3 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 500 ++---
.../src/main/generated/flattened-reduced-pom.xml | 102 ++---
.../generated/flattened-reduced-verbose-pom.xml| 500 ++---
4 files changed, 552 insertions(+), 553 deletions(-)
diff --git a/pom.xml b/pom.xml
index d091a2b84b..246104b601 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
9.37.0.Final
2.4.5
3.0.1
-2.2.4
+2.2.5
1.0.0
3.2.2
2.0.1
@@ -88,7 +88,6 @@
1.4
${commons-exec-version}
2.6
-4.0.2
${metrics-version}
${eddsa-version}
0.5.0
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 0bf76c2c95..19b7d63161 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6739,436 +6739,436 @@
3.6.4
-org.apache.cxf
-cxf-core
-4.0.2
+org.apache.cxf
+cxf-core
+4.0.3
-org.apache.cxf
-cxf-rt-features-logging
-4.0.2
+org.apache.cxf
+cxf-rt-features-logging
+4.0.3
-org.apache.cxf
-cxf-rt-features-metrics
-4.0.2
+org.apache.cxf
+cxf-rt-features-metrics
+4.0.3
-org.apache.cxf
-cxf-rt-frontend-jaxws
-4.0.2
+org.apache.cxf
+cxf-rt-frontend-jaxws
+4.0.3
-org.ow2.asm
-asm
+org.ow2.asm
+asm
-org.apache.cxf
-cxf-rt-transports-http
-4.0.2
+org.apache.cxf
+cxf-rt-transports-http
+4.0.3
-org.apache.cxf
-cxf-rt-transports-http-hc5
-4.0.2
+org.apache.cxf
+cxf-rt-transports-http-hc5
+4.0.3
-org.slf4j
-jcl-over-slf4j
+org.slf4j
+jcl-over-slf4j
-org.apache.cxf
-cxf-rt-ws-mex
-4.0.2
+org.apache.cxf
+cxf-rt-ws-mex
+4.0.3
-org.apache.cxf
-cxf-rt-ws-security
-4.0.2
+org.apache.cxf
+cxf-rt-ws-security
+4.0.3
-org.apache.cxf
-cxf-rt-ws-rm
-4.0.2
+org.apache.cxf
+cxf-rt-ws-rm
+4.0.3
-org.apache.cxf
-cxf-rt-wsdl
-4.0.2
+org.apache.cxf
+cxf-rt-wsdl
+4.0.3
-org.ow2.asm
-asm
+org.ow2.asm
+asm
-org.apache.cxf.services.sts
-cxf-services-sts-core
-4.0.2
+org.apache.cxf.services.sts
+cxf-services-sts-core
+4.0.3
-org.apache.cxf.xjcplugins
-cxf-xjc-boolean
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-boolean
+4.0.0
-org.apache.cxf.xjcplugins
-cxf-xjc-dv
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-dv
+4.0.0
-org.apache.cxf.xjcplugins
-cxf-xjc-javadoc
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-javadoc
+4.0.0
-org.apache.cxf.xjcplugins
-cxf-xjc-pl
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-pl
+4.0.0
-org.apache.cxf.xjcplugins
-cxf-xjc-ts
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-ts
+4.0.0
-org.apache.cxf.xjcplugins
-cxf-xjc-wsdlextension
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-wsdlextension
+4.0.0
-org.apache.cxf.xjc-utils
-cxf-xjc-runtime
-4.0.0
+org.apache.cxf.xjc-utils
+cxf-xjc-runtime
+4.0.0
-io.quarkiverse.cxf
-quarkus-cxf
-2.2.4
+io.quarkiverse.cxf
+quarkus-cxf
+2.2.5
-io.quarkiverse.cxf
-quarkus-cxf-axiom-api-stub
-2.2.4
[camel-quarkus] branch 3.2.x updated: Upgrade to Quarkus CXF 2.2.4
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 3.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/3.2.x by this push: new 0ccedcc1f1 Upgrade to Quarkus CXF 2.2.4 0ccedcc1f1 is described below commit 0ccedcc1f1de846af8eade084f75f057bce1f5f6 Author: Peter Palaga AuthorDate: Mon Sep 25 14:16:40 2023 +0200 Upgrade to Quarkus CXF 2.2.4 --- pom.xml| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 500 ++--- .../src/main/generated/flattened-reduced-pom.xml | 42 +- .../generated/flattened-reduced-verbose-pom.xml| 500 ++--- 4 files changed, 522 insertions(+), 522 deletions(-) diff --git a/pom.xml b/pom.xml index 1f5b3edabe..546aa1d271 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 9.37.0.Final 2.4.5 3.0.1 -2.2.3 +2.2.4 1.0.0 3.2.2 2.0.1 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index b976683258..c511ff98c1 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6739,436 +6739,436 @@ 3.6.4 -org.apache.cxf -cxf-core -4.0.2 +org.apache.cxf +cxf-core +4.0.2 -org.apache.cxf -cxf-rt-features-logging -4.0.2 +org.apache.cxf +cxf-rt-features-logging +4.0.2 -org.apache.cxf -cxf-rt-features-metrics -4.0.2 +org.apache.cxf +cxf-rt-features-metrics +4.0.2 -org.apache.cxf -cxf-rt-frontend-jaxws -4.0.2 +org.apache.cxf +cxf-rt-frontend-jaxws +4.0.2 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf -cxf-rt-transports-http -4.0.2 +org.apache.cxf +cxf-rt-transports-http +4.0.2 -org.apache.cxf -cxf-rt-transports-http-hc5 -4.0.2 +org.apache.cxf +cxf-rt-transports-http-hc5 +4.0.2 -org.slf4j -jcl-over-slf4j +org.slf4j +jcl-over-slf4j -org.apache.cxf -cxf-rt-ws-mex -4.0.2 +org.apache.cxf +cxf-rt-ws-mex +4.0.2 -org.apache.cxf -cxf-rt-ws-security -4.0.2 +org.apache.cxf +cxf-rt-ws-security +4.0.2 -org.apache.cxf -cxf-rt-ws-rm -4.0.2 +org.apache.cxf +cxf-rt-ws-rm +4.0.2 -org.apache.cxf -cxf-rt-wsdl -4.0.2 +org.apache.cxf +cxf-rt-wsdl +4.0.2 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf.services.sts -cxf-services-sts-core -4.0.2 +org.apache.cxf.services.sts +cxf-services-sts-core +4.0.2 -org.apache.cxf.xjcplugins -cxf-xjc-boolean -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-boolean +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-dv -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-dv +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-javadoc -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-javadoc +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-pl -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-pl +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-ts -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-ts +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-wsdlextension -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-wsdlextension +4.0.0 -org.apache.cxf.xjc-utils -cxf-xjc-runtime -4.0.0 +org.apache.cxf.xjc-utils +cxf-xjc-runtime +4.0.0 -io.quarkiverse.cxf -quarkus-cxf -2.2.3 +io.quarkiverse.cxf +quarkus-cxf +2.2.4 -io.quarkiverse.cxf -quarkus-cxf-axiom-api-stub -2.2.3 +io.quarkiverse.cxf +quarkus-cxf-axiom-api-stub +2.2.4 -io.quarkiverse.cxf -quarkus-cxf-deployment -2.2.3
[camel-quarkus] branch main updated (fa90fdb02c -> b17705396f)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from fa90fdb02c file: migrate file creation test to new harness #3584 (#5340) add b17705396f Upgrade to Quarkus CXF 2.4.1 No new revisions were added by this update. Summary of changes: pom.xml| 4 +- poms/bom/src/main/generated/flattened-full-pom.xml | 500 ++--- .../src/main/generated/flattened-reduced-pom.xml | 102 ++--- .../generated/flattened-reduced-verbose-pom.xml| 500 ++--- 4 files changed, 553 insertions(+), 553 deletions(-)
[camel-quarkus] branch 3.4.x updated: Upgrade to Quarkus CXF 2.4.0
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.4.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.4.x by this push:
new 669920562f Upgrade to Quarkus CXF 2.4.0
669920562f is described below
commit 669920562fbed596d999d9110c59b1529d5f1b5b
Author: Peter Palaga
AuthorDate: Sat Sep 16 12:22:41 2023 +0200
Upgrade to Quarkus CXF 2.4.0
---
pom.xml| 4 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 500 ++---
.../src/main/generated/flattened-reduced-pom.xml | 42 +-
.../generated/flattened-reduced-verbose-pom.xml| 500 ++---
4 files changed, 523 insertions(+), 523 deletions(-)
diff --git a/pom.xml b/pom.xml
index 29b96c630f..c142ab7056 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
9.37.0.Final
2.5.0
3.1.0
-2.3.1
+2.4.0
1.0.0
3.2.2
2.0.1
@@ -425,7 +425,7 @@
${maven-shade-plugin.version}
-
+
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index ab9ecf57a1..4bb1016118 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6789,436 +6789,436 @@
3.6.4
-org.apache.cxf
-cxf-core
-4.0.2
+org.apache.cxf
+cxf-core
+4.0.2
-org.apache.cxf
-cxf-rt-features-logging
-4.0.2
+org.apache.cxf
+cxf-rt-features-logging
+4.0.2
-org.apache.cxf
-cxf-rt-features-metrics
-4.0.2
+org.apache.cxf
+cxf-rt-features-metrics
+4.0.2
-org.apache.cxf
-cxf-rt-frontend-jaxws
-4.0.2
+org.apache.cxf
+cxf-rt-frontend-jaxws
+4.0.2
-org.ow2.asm
-asm
+org.ow2.asm
+asm
-org.apache.cxf
-cxf-rt-transports-http
-4.0.2
+org.apache.cxf
+cxf-rt-transports-http
+4.0.2
-org.apache.cxf
-cxf-rt-transports-http-hc5
-4.0.2
+org.apache.cxf
+cxf-rt-transports-http-hc5
+4.0.2
-org.slf4j
-jcl-over-slf4j
+org.slf4j
+jcl-over-slf4j
-org.apache.cxf
-cxf-rt-ws-mex
-4.0.2
+org.apache.cxf
+cxf-rt-ws-mex
+4.0.2
-org.apache.cxf
-cxf-rt-ws-security
-4.0.2
+org.apache.cxf
+cxf-rt-ws-security
+4.0.2
-org.apache.cxf
-cxf-rt-ws-rm
-4.0.2
+org.apache.cxf
+cxf-rt-ws-rm
+4.0.2
-org.apache.cxf
-cxf-rt-wsdl
-4.0.2
+org.apache.cxf
+cxf-rt-wsdl
+4.0.2
-org.ow2.asm
-asm
+org.ow2.asm
+asm
-org.apache.cxf.services.sts
-cxf-services-sts-core
-4.0.2
+org.apache.cxf.services.sts
+cxf-services-sts-core
+4.0.2
-org.apache.cxf.xjcplugins
-cxf-xjc-boolean
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-boolean
+4.0.0
-org.apache.cxf.xjcplugins
-cxf-xjc-dv
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-dv
+4.0.0
-org.apache.cxf.xjcplugins
-cxf-xjc-javadoc
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-javadoc
+4.0.0
-org.apache.cxf.xjcplugins
-cxf-xjc-pl
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-pl
+4.0.0
-org.apache.cxf.xjcplugins
-cxf-xjc-ts
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-ts
+4.0.0
-org.apache.cxf.xjcplugins
-cxf-xjc-wsdlextension
-4.0.0
+org.apache.cxf.xjcplugins
+cxf-xjc-wsdlextension
+4.0.0
-org.apache.cxf.xjc-utils
-cxf-xjc-runtime
-4.0.0
+org.apache.cxf.xjc-utils
+cxf-xjc-runtime
+4.0.0
-io.quarkiverse.cxf
-quarkus-cxf
-2.3.1
+io.quarkiverse.cxf
+quarkus-cxf
+2.4.0
[camel] branch camel-4.0.x updated: CAMEL-19843: HTTP/2 pseudo-headers such as :status should not be propagated from CXF message to Camel message
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new c07bf04d9f3 CAMEL-19843: HTTP/2 pseudo-headers such as :status should
not be propagated from CXF message to Camel message
c07bf04d9f3 is described below
commit c07bf04d9f3bcd95bf4673126009adbd51e0b4e8
Author: Peter Palaga
AuthorDate: Wed Sep 6 19:19:47 2023 +0200
CAMEL-19843: HTTP/2 pseudo-headers such as :status should not be
propagated from CXF message to Camel message
---
.../apache/camel/component/cxf/jaxws/DefaultCxfBinding.java | 3 +++
.../camel/component/cxf/jaxws/CxfProducerRouterTest.java| 13 +
2 files changed, 16 insertions(+)
diff --git
a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
index 13eb2c68b85..f9d35445251 100644
---
a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
+++
b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
@@ -674,6 +674,9 @@ public class DefaultCxfBinding implements CxfBinding,
HeaderFilterStrategyAware
// SOAPAction header may contain quoted value. Remove
the quotes here.
soapAction =
StringHelper.removeLeadingAndEndingQuotes(soapAction);
camelHeaders.put(SoapBindingConstants.SOAP_ACTION,
soapAction);
+} else if (entry.getKey().startsWith(":")) {
+/* Ignore HTTP/2 pseudo headers such as :status */
+continue;
} else {
LOG.trace("Populate header from CXF header={}
value={}",
entry.getKey(), entry.getValue());
diff --git
a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
index 544b4c348ca..82f9d6dd1e2 100644
---
a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
+++
b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.cxf.jaxws;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -152,6 +153,18 @@ public class CxfProducerRouterTest extends
CamelTestSupport {
}
+@Test
+public void testIgnorePseudoHeaders() throws Exception {
+Exchange senderExchange = new DefaultExchange(context,
ExchangePattern.InOut);
+senderExchange.getIn().setBody(REQUEST_MESSAGE);
+Exchange exchange = template.send("direct:EndpointB", senderExchange);
+
+org.apache.camel.Message out = exchange.getMessage();
+final List pseudoHeaders
+= out.getHeaders().keySet().stream().filter(key ->
key.startsWith(":")).collect(Collectors.toList());
+assertTrue(pseudoHeaders.isEmpty(), "Pseudo-headers such as :status
should be filtered out; found: " + pseudoHeaders);
+}
+
@Test
public void testInvokingSimpleServerWithPayLoadDataFormat() throws
Exception {
Exchange senderExchange = new DefaultExchange(context,
ExchangePattern.InOut);
[camel-quarkus] branch main updated: Test REST to SOAP bridge scenario
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 5ce0bceb08 Test REST to SOAP bridge scenario
5ce0bceb08 is described below
commit 5ce0bceb08d5d2b8b7f0dd95ef1a10e97c0b1e64
Author: Peter Palaga
AuthorDate: Wed Sep 6 14:15:11 2023 +0200
Test REST to SOAP bridge scenario
---
.../cxf-soap/cxf-soap-rest/pom.xml | 203
.../cxf/soap/rest/it/CxfSoapRestRoutes.java| 88 +
.../src/main/resources/application.properties | 23 ++
.../src/main/resources/wsdl/CalculatorService.wsdl | 366 +
.../cxf/soap/rest/it/CxfRestTestResource.java | 74 +
.../component/cxf/soap/rest/it/CxfSoapRestIT.java | 23 ++
.../cxf/soap/rest/it/CxfSoapRestTest.java | 54 +++
integration-test-groups/cxf-soap/pom.xml | 1 +
integration-tests/cxf-soap-grouped/pom.xml | 34 ++
9 files changed, 866 insertions(+)
diff --git a/integration-test-groups/cxf-soap/cxf-soap-rest/pom.xml
b/integration-test-groups/cxf-soap/cxf-soap-rest/pom.xml
new file mode 100644
index 00..e1a58c6544
--- /dev/null
+++ b/integration-test-groups/cxf-soap/cxf-soap-rest/pom.xml
@@ -0,0 +1,203 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+org.apache.camel.quarkus
+camel-quarkus-build-parent-it
+3.3.0-SNAPSHOT
+../../../poms/build-parent-it/pom.xml
+
+
+camel-quarkus-integration-test-cxf-soap-rest
+Camel Quarkus :: Integration Tests :: CXF SOAP REST bridge
+A REST to SOAP bridge
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-cxf-soap
+
+
+org.apache.camel.quarkus
+camel-quarkus-direct
+
+
+org.apache.camel.quarkus
+camel-quarkus-rest
+
+
+org.apache.camel.quarkus
+camel-quarkus-jackson
+
+
+
+
+io.quarkus
+quarkus-junit5
+test
+
+
+io.rest-assured
+rest-assured
+test
+
+
+org.testcontainers
+testcontainers
+test
+
+
+junit
+junit
+
+
+
+
+io.quarkus
+quarkus-junit4-mock
+test
+
+
+
+
+
+
+${quarkus.platform.group-id}
+quarkus-maven-plugin
+${quarkus.platform.version}
+true
+
+
+generate-code
+
+generate-code
+
+
+
+
+
+
+
+
+
+native
+
+
+native
+
+
+
+native
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+
+
+
+integration-test
+verify
+
+
+
+
+
+
+
+
+virtualDependencies
+
+
+!noVirtualDependencies
+
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-cxf-soap-deployment
+${project.version}
+pom
+test
+
+
+*
+*
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-direct-deployment
+${project.version}
+pom
+test
+
+
+*
+*
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-jackson-deployment
+
[camel] branch main updated: CAMEL-19843: HTTP/2 pseudo-headers such as :status should not be propagated from CXF message to Camel message
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b7f21f2f3cf CAMEL-19843: HTTP/2 pseudo-headers such as :status should
not be propagated from CXF message to Camel message
b7f21f2f3cf is described below
commit b7f21f2f3cf3ef5f1884d74b54632781ea1ecc56
Author: Peter Palaga
AuthorDate: Wed Sep 6 19:19:47 2023 +0200
CAMEL-19843: HTTP/2 pseudo-headers such as :status should not be
propagated from CXF message to Camel message
---
.../apache/camel/component/cxf/jaxws/DefaultCxfBinding.java | 3 +++
.../camel/component/cxf/jaxws/CxfProducerRouterTest.java| 13 +
2 files changed, 16 insertions(+)
diff --git
a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
index 13eb2c68b85..f9d35445251 100644
---
a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
+++
b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
@@ -674,6 +674,9 @@ public class DefaultCxfBinding implements CxfBinding,
HeaderFilterStrategyAware
// SOAPAction header may contain quoted value. Remove
the quotes here.
soapAction =
StringHelper.removeLeadingAndEndingQuotes(soapAction);
camelHeaders.put(SoapBindingConstants.SOAP_ACTION,
soapAction);
+} else if (entry.getKey().startsWith(":")) {
+/* Ignore HTTP/2 pseudo headers such as :status */
+continue;
} else {
LOG.trace("Populate header from CXF header={}
value={}",
entry.getKey(), entry.getValue());
diff --git
a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
index 544b4c348ca..82f9d6dd1e2 100644
---
a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
+++
b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.cxf.jaxws;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -152,6 +153,18 @@ public class CxfProducerRouterTest extends
CamelTestSupport {
}
+@Test
+public void testIgnorePseudoHeaders() throws Exception {
+Exchange senderExchange = new DefaultExchange(context,
ExchangePattern.InOut);
+senderExchange.getIn().setBody(REQUEST_MESSAGE);
+Exchange exchange = template.send("direct:EndpointB", senderExchange);
+
+org.apache.camel.Message out = exchange.getMessage();
+final List pseudoHeaders
+= out.getHeaders().keySet().stream().filter(key ->
key.startsWith(":")).collect(Collectors.toList());
+assertTrue(pseudoHeaders.isEmpty(), "Pseudo-headers such as :status
should be filtered out; found: " + pseudoHeaders);
+}
+
@Test
public void testInvokingSimpleServerWithPayLoadDataFormat() throws
Exception {
Exchange senderExchange = new DefaultExchange(context,
ExchangePattern.InOut);
[camel-quarkus] branch quarkus-main updated (52ccfc9d5b -> ba9e213ecd)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git omit 52ccfc9d5b Upgrade to Quarkus CXF 2.3.0 omit 9c232587b3 Temporarily disable debezium tests due to #5110 omit c5a2538e51 Ref #4894: Make Groovy DSL ITs platform compliant omit a7ab8c6ead Upgrade Quarkus to 3.3.0 add 7b675da236 Upgrade Quarkus to 3.3.0 add 66920e2861 Ref #4894: Make Groovy DSL ITs platform compliant add 5d233230d4 Temporarily disable debezium tests due to #5110 add ba9e213ecd Upgrade to Quarkus CXF 2.3.0 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 (52ccfc9d5b) \ N -- N -- N refs/heads/quarkus-main (ba9e213ecd) 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. No new revisions were added by this update. Summary of changes: docs/antora.yml | 4 1 file changed, 4 deletions(-)
[camel-quarkus] 02/04: Ref #4894: Make Groovy DSL ITs platform compliant
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c5a2538e51a8070861a9c6089cdd25c390ea8c05
Author: Nicolas Filotto
AuthorDate: Thu Jun 29 16:23:59 2023 +0200
Ref #4894: Make Groovy DSL ITs platform compliant
---
integration-tests/groovy-dsl/pom.xml | 55 +--
.../camel/quarkus/dsl/groovy/GroovyDslTest.java| 181 ++---
tooling/test-list/pom.xml | 1 -
3 files changed, 51 insertions(+), 186 deletions(-)
diff --git a/integration-tests/groovy-dsl/pom.xml
b/integration-tests/groovy-dsl/pom.xml
index 5e9211a412..7760421ef1 100644
--- a/integration-tests/groovy-dsl/pom.xml
+++ b/integration-tests/groovy-dsl/pom.xml
@@ -30,9 +30,6 @@
Camel Quarkus :: Integration Tests :: Groovy DSL
Integration tests for Camel Groovy DSL extension
-
-
${project.build.directory}/quarkus-app/quarkus-run.jar
-
org.apache.camel.quarkus
@@ -70,18 +67,12 @@
test
-org.assertj
-assertj-core
-test
-
-
-org.apache.camel.quarkus
-
camel-quarkus-integration-tests-process-executor-support
-test
+io.rest-assured
+rest-assured
-org.awaitility
-awaitility
+org.assertj
+assertj-core
test
@@ -185,7 +176,6 @@
native
-
${project.build.directory}/${project.artifactId}-${project.version}-runner
@@ -200,43 +190,6 @@
-
-
-
${quarkus.runner}
-
-
-
-
-
-
-
-full
-
-
-!quickly
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-surefire-plugin
-
-
-default-test
-
-test
-
-integration-test
-
-
-
${quarkus.runner}
-
-
-
-
diff --git
a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
index 82ce107208..6f41d92bba 100644
---
a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
+++
b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
@@ -16,151 +16,64 @@
*/
package org.apache.camel.quarkus.dsl.groovy;
-import java.util.concurrent.TimeUnit;
-
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
import org.apache.camel.dsl.groovy.GroovyRoutesBuilderLoader;
-import org.apache.camel.quarkus.test.support.process.QuarkusProcessExecutor;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-import org.awaitility.Awaitility;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
-import org.zeroturnaround.exec.StartedProcess;
-
-import static org.assertj.core.api.Assertions.assertThat;
+@QuarkusTest
class GroovyDslTest {
-private static int port;
-private static StartedProcess process;
-
-@BeforeAll
-static void start() throws Exception {
-// Need to use an external process to test the extension because of a
CL issue that happens only on test mode
-// due to the fact that groovy is defined as a parent first artifact
-QuarkusProcessExecutor quarkusProcessExecutor = new
[camel-quarkus] branch quarkus-main updated (75ae555603 -> 52ccfc9d5b)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 75ae555603 Temporarily disable debezium tests due to #5110 discard 975cb3b270 Temporarily disable cxf-grouped tests due to #5108 discard bb9a5c882f Ref #4894: Make Groovy DSL ITs platform compliant discard 206cdec01a Upgrade Quarkus to 3.3.0.CR1 add 02e639ed76 Fix #1615 to add xslt-saxon native support (#5133) add b849bd2394 Upgrade async-http-client to 3.0.0.Beta2 add 3eb5c710d1 Align Apache HTTP Client 5.x with Camel add d11a8b89c6 Remove redundant autowiring workaround in aws2-cw tests add 3c412624d4 Tidy iCal extension native workaround for absence of com.github.erosb:json-sKema add 21ae80849f Updated CHANGELOG.md add 047fee618b Restore AS2 testing add 407879dd13 Upgrade Quarkus to 3.2.3.Final add dc94b9ddb2 Add instructions for auto release note generation to release docs add 409bb3d75f Bump org.seleniumhq.selenium:htmlunit-driver from 4.10.0 to 4.11.0 (#5146) add 457091c80c Bump quarkiverse-jsch.version from 3.0.2 to 3.0.3 (#5145) add 93bf470280 Updated CHANGELOG.md add e6403792ae Register known jakarta.mail exception classes for reflection add abe509d72b Fix #5149 to manage com.ibm.icu:icu4j (#5150) add a289f00cc8 Updated CHANGELOG.md add 426bd18e96 Regen SBOM from commit a289f00cc8369a02eac809ceef92e1d2e2435af1 (#5151) add 1ee640f156 Updated CHANGELOG.md add 5f4d5b383a Manage test container versions in the root project pom.xml add 4e422d1936 Set encoding to UTF-8 when writing microprofile-config.properties add 8ebef52e67 Updated CHANGELOG.md add 92bd910b7e Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.4.2 to 2.4.3 (#5158) add be9686b5f4 Reclaim disk space before running integration tests add 3987bc92b1 Updated CHANGELOG.md add a3016ad1bb Ref#4772 Introduce group testing for different jdbc db types add cd1100ca46 Bump quarkiverse-pooled-jms.version from 2.0.1 to 2.0.2 (#5171) add 77116889f5 Updated CHANGELOG.md add 7424027587 Add elasticsearch JVM tests Fixes #5162 add 0bb5315b15 Add org.mapstruct:mapstruct-processor to the BOM add 5c60c3bbf6 Exclude redundant javassist dependency from camel-grpc add df2bc76eb9 Run docs module build in case Dependabot updates a version property referenced in antora.yml add 01f624fd8d Extend test coverage of gRPC extension add 5847d118cb Unban com.google.code.findbugs:jsr305 for gRPC extension add 7eecb9a2e9 Updated CHANGELOG.md add 47d63fc2cd Regen SBOM from commit 7eecb9a2e96e659db7b2c01e77ed2cdebffb27e7 (#5176) add 9c98b7e065 Updated CHANGELOG.md add ea020ce8eb Upgrade Camel to 4.0.0 add e8a9f72206 Revisit #4048 to Springless JPA extension (#5147) add 44975f443d Upgrade Quarkus to 3.2.4.Final add 2ec1fcaca7 Upgrade to Quarkus CXF 2.2.1 add 10b43aee86 Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom (#5182) add 88210e2506 Updated CHANGELOG.md add d55f744832 Fix #5180 to skip quarkus build on jms-ibmmq-client integration tests (#5183) add 2e17b12ffd Fix compareVersion in sanity-checks.groovy #5165 add 6e96ceb6a9 Introduce custom CodeGenProvider for gRPC extension add 1978f7b173 Remove integration-tests/jdbc module add bc9ced22c6 chore: regen for mapstruct and xslt-saxon add 865a4037f3 Updated CHANGELOG.md add f57d574433 Exclude unwanted vertx-grpc transitive dependencies form quarkus-grpc-common new a7ab8c6ead Upgrade Quarkus to 3.3.0 new c5a2538e51 Ref #4894: Make Groovy DSL ITs platform compliant new 9c232587b3 Temporarily disable debezium tests due to #5110 new 52ccfc9d5b Upgrade to Quarkus CXF 2.3.0 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 (75ae555603) \ N -- N -- N refs/heads/quarkus-main (52ccfc9d5b) 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 4 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: .github/workflows/camel-master-cron.yaml |13 + .github/workflows/
[camel-quarkus] 03/04: Temporarily disable debezium tests due to #5110
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 9c232587b34854685ca3a298a907a33a75e16013 Author: James Netherton AuthorDate: Fri Jul 21 15:12:20 2023 +0100 Temporarily disable debezium tests due to #5110 --- integration-tests/debezium/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/integration-tests/debezium/pom.xml b/integration-tests/debezium/pom.xml index 4750a4cd79..39df398f30 100644 --- a/integration-tests/debezium/pom.xml +++ b/integration-tests/debezium/pom.xml @@ -38,6 +38,9 @@ src/test/resources/container-license-acceptance.txt + + +true @@ -128,6 +131,7 @@ + mysqlDriver
[camel-quarkus] 04/04: Upgrade to Quarkus CXF 2.3.0
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 52ccfc9d5bd507f77a63feba4bf9d3eb3f7ef2a3 Author: Peter Palaga AuthorDate: Wed Aug 16 21:51:20 2023 +0200 Upgrade to Quarkus CXF 2.3.0 --- pom.xml| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 500 ++--- .../src/main/generated/flattened-reduced-pom.xml | 42 +- .../generated/flattened-reduced-verbose-pom.xml| 500 ++--- 4 files changed, 522 insertions(+), 522 deletions(-) diff --git a/pom.xml b/pom.xml index f438dfdb23..dd43338c67 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 9.37.0.Final 2.4.4 3.0.1 -2.2.1 +2.3.0 1.0.0 3.2.2 2.0.1 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 9996366f0c..baca8c0571 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6710,436 +6710,436 @@ 3.6.4 -org.apache.cxf -cxf-core -4.0.2 +org.apache.cxf +cxf-core +4.0.2 -org.apache.cxf -cxf-rt-features-logging -4.0.2 +org.apache.cxf +cxf-rt-features-logging +4.0.2 -org.apache.cxf -cxf-rt-features-metrics -4.0.2 +org.apache.cxf +cxf-rt-features-metrics +4.0.2 -org.apache.cxf -cxf-rt-frontend-jaxws -4.0.2 +org.apache.cxf +cxf-rt-frontend-jaxws +4.0.2 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf -cxf-rt-transports-http -4.0.2 +org.apache.cxf +cxf-rt-transports-http +4.0.2 -org.apache.cxf -cxf-rt-transports-http-hc5 -4.0.2 +org.apache.cxf +cxf-rt-transports-http-hc5 +4.0.2 -org.slf4j -jcl-over-slf4j +org.slf4j +jcl-over-slf4j -org.apache.cxf -cxf-rt-ws-mex -4.0.2 +org.apache.cxf +cxf-rt-ws-mex +4.0.2 -org.apache.cxf -cxf-rt-ws-security -4.0.2 +org.apache.cxf +cxf-rt-ws-security +4.0.2 -org.apache.cxf -cxf-rt-ws-rm -4.0.2 +org.apache.cxf +cxf-rt-ws-rm +4.0.2 -org.apache.cxf -cxf-rt-wsdl -4.0.2 +org.apache.cxf +cxf-rt-wsdl +4.0.2 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf.services.sts -cxf-services-sts-core -4.0.2 +org.apache.cxf.services.sts +cxf-services-sts-core +4.0.2 -org.apache.cxf.xjcplugins -cxf-xjc-boolean -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-boolean +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-dv -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-dv +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-javadoc -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-javadoc +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-pl -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-pl +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-ts -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-ts +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-wsdlextension -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-wsdlextension +4.0.0 -org.apache.cxf.xjc-utils -cxf-xjc-runtime -4.0.0 +org.apache.cxf.xjc-utils +cxf-xjc-runtime +4.0.0 -io.quarkiverse.cxf -quarkus-cxf -2.2.1 +io.quarkiverse.cxf +quarkus-cxf +2.3.0 -io.quarkiverse.cxf -quarkus-cxf-axiom-api-stub -2.2.1 +io.quarkiverse.cxf +quarkus-cxf-axiom-api-stub +2.3.0 -io.quarkiverse.cxf -quarkus-cxf-deployment -2.2.1 +io.quarkiverse.cxf +quarkus-cxf-deployment +2.3.0 -io.quarkiverse.cxf -quarkus-cxf-rt
[camel-quarkus] 01/04: Upgrade Quarkus to 3.3.0
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a7ab8c6eadd1d7f4a1860bcb9bc1bc24e60d86e7
Author: James Netherton
AuthorDate: Wed Jul 19 08:14:42 2023 +0100
Upgrade Quarkus to 3.3.0
---
docs/antora.yml| 6 +-
pom.xml| 14 +++---
poms/bom/src/main/generated/flattened-full-pom.xml | 22 +++---
.../src/main/generated/flattened-reduced-pom.xml | 16
.../generated/flattened-reduced-verbose-pom.xml| 16
5 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index a7659e3b01..3a6e53d34e 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,11 @@ asciidoc:
# Project versions
camel-version: 4.0.0 # replace ${camel.version}
camel-docs-version: ""
-quarkus-version: 3.2.4.Final # replace ${quarkus.version}
+<<<<<<< HEAD
+quarkus-version: 3.3.0 # replace ${quarkus.version}
+===
+quarkus-version: 3.3.0 # replace ${quarkus.version}
+>>>>>>> 206cdec01a (Upgrade Quarkus to 3.3.0.CR1)
graalvm-version: 23.0.1 # replace ${graalvm.version}
graalvm-docs-version: 22.3
mapstruct-version: 1.5.5.Final # replace ${mapstruct.version}
diff --git a/pom.xml b/pom.xml
index 146fa3282c..f438dfdb23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
2.1.0
2.0.2
2.0.2
-3.2.4.Final
+3.3.0
4.0.0
2.4.0
@@ -71,7 +71,7 @@
${angus-mail-version}
1.18
3.5.2
-1.11.1
+1.11.2
2.20.119
0.24.0
3.24.2
@@ -81,7 +81,7 @@
1.9.2
1.0.0-beta.3
3.7.1
-1.74
+1.75
0.1.2
3.1.5
${commons-beanutils-version}
@@ -102,7 +102,7 @@
1.124.0
23.0.1
4.0.13
-1.56.0
+1.56.1
${hapi-version}
${hapi-base-version}
${hapi-fhir-version}
@@ -126,9 +126,9 @@
0.2.10
${json-path-version}
2.4.10
-3.4.0
+3.5.0
${kudu-version}
-1.8.22
+1.9.0
2.24.0
${mapstruct-version}
8.2.2
@@ -143,7 +143,7 @@
3.4.30
${reactor-netty-version}
2.9.0
-
4.6.0
+
4.9.0
${spring-version}
2.0
0.43.1
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index d3058da8e6..9996366f0c 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6288,7 +6288,7 @@
io.smallrye.reactive
smallrye-reactive-messaging-camel
-4.6.0
+4.9.0
io.swagger.core.v3
@@ -6348,12 +6348,12 @@
org.apache.avro
avro-ipc-jetty
-1.11.1
+1.11.2
org.apache.avro
avro-ipc-netty
-1.11.1
+1.11.2
org.apache.httpcomponents.client5
@@ -6373,7 +6373,7 @@
org.apache.kafka
connect-runtime
-3.4.0
+3.5.0
javax.activation
@@ -6454,22 +6454,22 @@
org.bouncycastle
bcmail-jdk18on
-1.74
+1.75
org.bouncycastle
bcpg-jdk18on
-1.74
+1.75
org.bouncycastle
bcprov-ext-jdk18on
-1.74
+1.75
org.bouncycastle
bcutil-jdk18on
-1.74
+1.75
org.brotli
@@ -6504,17 +6504,17 @@
org.jetbrains.kotlin
kotlin-script-util
-1.8.22
+1.9.0
org.jetbrains.kotlin
kotlin-scripting-jvm
-1.8.22
+1.9.0
org.jetbrains.kotlin
kotlin-scripting-jvm-host
-1.8.22
+1.9.0
org.mapstruct
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index ac5a5367da..e7a7adce4d 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6278,7 +6278,7 @@
io.smallrye.reactive
smallrye-reactive-messaging-camel
-4.6.0
+4.9.0
io.swagger.core.v3
@@ -6348,7 +6348,7 @@
org.apache.kafka
connect-runtime
-3.4.0
+3.5.0
javax.activation
@@ -6429,22 +6429,22 @@
org.bouncycastle
[camel-quarkus] branch main updated: Fix compareVersion in sanity-checks.groovy #5165
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 2e17b12ffd Fix compareVersion in sanity-checks.groovy #5165
2e17b12ffd is described below
commit 2e17b12ffd1db9ae796bb99e930bed78826d9146
Author: Zheng Feng
AuthorDate: Thu Aug 10 15:52:41 2023 +0800
Fix compareVersion in sanity-checks.groovy #5165
---
tooling/scripts/sanity-checks.groovy | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tooling/scripts/sanity-checks.groovy
b/tooling/scripts/sanity-checks.groovy
index 6f87b821dc..06b1a39764 100644
--- a/tooling/scripts/sanity-checks.groovy
+++ b/tooling/scripts/sanity-checks.groovy
@@ -51,7 +51,8 @@ if (!badDeps.isEmpty()) {
}
// check jvmSince and nativeCheck not newer than current SNAPSHOT version
-final String currentVersion = project.version - '-SNAPSHOT'
+def versionRegex = ~/\-.*/
+final String currentVersion = project.version - versionRegex
final String jvmSince= project.properties['camel.quarkus.jvmSince']
final String nativeSince = project.properties['camel.quarkus.nativeSince']
[camel-quarkus] branch main updated: Upgrade to Quarkus CXF 2.2.1
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 2ec1fcaca7 Upgrade to Quarkus CXF 2.2.1 2ec1fcaca7 is described below commit 2ec1fcaca7d674f0eee74f6bc3e4b82e79713ad0 Author: Peter Palaga AuthorDate: Mon Aug 14 19:34:02 2023 +0200 Upgrade to Quarkus CXF 2.2.1 --- pom.xml| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 494 +++-- .../src/main/generated/flattened-reduced-pom.xml | 72 ++- .../generated/flattened-reduced-verbose-pom.xml| 494 +++-- 4 files changed, 576 insertions(+), 486 deletions(-) diff --git a/pom.xml b/pom.xml index 4e87e21fb2..6b69c774bd 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 9.37.0.Final 2.4.3 3.0.1 -2.2.0 +2.2.1 1.0.0 3.2.2 2.0.1 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 46a3677243..fdece605a3 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6705,406 +6705,436 @@ 3.6.4 -org.apache.cxf -cxf-core -4.0.2 +org.apache.cxf +cxf-core +4.0.2 -org.apache.cxf -cxf-rt-features-logging -4.0.2 +org.apache.cxf +cxf-rt-features-logging +4.0.2 -org.apache.cxf -cxf-rt-features-metrics -4.0.2 +org.apache.cxf +cxf-rt-features-metrics +4.0.2 -org.apache.cxf -cxf-rt-frontend-jaxws -4.0.2 +org.apache.cxf +cxf-rt-frontend-jaxws +4.0.2 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf -cxf-rt-transports-http -4.0.2 +org.apache.cxf +cxf-rt-transports-http +4.0.2 -org.apache.cxf -cxf-rt-transports-http-hc5 -4.0.2 +org.apache.cxf +cxf-rt-transports-http-hc5 +4.0.2 -org.slf4j -jcl-over-slf4j +org.slf4j +jcl-over-slf4j -org.apache.cxf -cxf-rt-ws-mex -4.0.2 +org.apache.cxf +cxf-rt-ws-mex +4.0.2 -org.apache.cxf -cxf-rt-ws-security -4.0.2 +org.apache.cxf +cxf-rt-ws-security +4.0.2 -org.apache.cxf -cxf-rt-ws-rm -4.0.2 +org.apache.cxf +cxf-rt-ws-rm +4.0.2 -org.apache.cxf -cxf-rt-wsdl -4.0.2 +org.apache.cxf +cxf-rt-wsdl +4.0.2 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf.services.sts -cxf-services-sts-core -4.0.2 +org.apache.cxf.services.sts +cxf-services-sts-core +4.0.2 -org.apache.cxf.xjcplugins -cxf-xjc-boolean -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-boolean +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-dv -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-dv +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-javadoc -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-javadoc +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-pl -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-pl +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-ts -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-ts +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-wsdlextension -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-wsdlextension +4.0.0 -org.apache.cxf.xjc-utils -cxf-xjc-runtime -4.0.0 +org.apache.cxf.xjc-utils +cxf-xjc-runtime +4.0.0 -io.quarkiverse.cxf -quarkus-cxf -2.2.0 +io.quarkiverse.cxf +quarkus-cxf +2.2.1 -io.quarkiverse.cxf -quarkus-cxf-axiom-api-stub -2.2.0 +io.quarkiverse.cxf +quarkus-cxf-axiom-api-stub +2.2.1 -io.quarkiverse.cxf -quarkus-cxf-deployment -2.2.0
[camel-quarkus] branch main updated: Build Camel on the nightly build instead of relying on the SNAPSHOT repo
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new e9f83d3d62 Build Camel on the nightly build instead of relying on the
SNAPSHOT repo
e9f83d3d62 is described below
commit e9f83d3d624307f6edbee0b62b97a8d457a6a3e6
Author: James Netherton
AuthorDate: Thu Jul 6 07:15:19 2023 +0100
Build Camel on the nightly build instead of relying on the SNAPSHOT repo
---
.github/workflows/camel-master-cron.yaml | 32 +++-
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/camel-master-cron.yaml
b/.github/workflows/camel-master-cron.yaml
index 0b730490e8..e0954b14bb 100644
--- a/.github/workflows/camel-master-cron.yaml
+++ b/.github/workflows/camel-master-cron.yaml
@@ -26,7 +26,6 @@ env:
LANG: en_US.UTF-8
MAVEN_OPTS: -Xmx3000m
CQ_MAVEN_ARGS: -V -ntp -e -Daether.connector.http.connectionMaxTtl=120
- BRANCH_OPTIONS: -Papache-snapshots
TESTCONTAINERS_RYUK_DISABLED: true
ISSUE_ID: 2927
@@ -63,9 +62,16 @@ jobs:
git fetch origin main
git rebase origin/main
git rev-parse origin/main > ~/build-data/main-sha.txt
+ - name: Build Camel
+run: |
+ cd ../
+ git clone --depth 1 --branch main
https://github.com/apache/camel.git \
+&& cd camel \
+&& echo "Current Camel commit:" $(git rev-parse HEAD) \
+&& ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquickly
- name: mvn clean install -DskipTests
run: |
- eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install
-DskipTests -Dquarkus.build.skip
+ eval ./mvnw ${CQ_MAVEN_ARGS} clean install -DskipTests
-Dquarkus.build.skip
- name: Sync Maven properties
run: |
./mvnw cq:sync-versions ${CQ_MAVEN_ARGS} -N
@@ -158,14 +164,14 @@ jobs:
IFS=,
if [[ ${JVM_MODULES[@]} ]]; then
-eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean test \
+eval ./mvnw ${CQ_MAVEN_ARGS} clean test \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
-Pdocker,ci \
-pl "${JVM_MODULES[*]}"
fi
if [[ ${NATIVE_MODULES[@]} ]]; then
-eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \
+eval ./mvnw ${CQ_MAVEN_ARGS} clean verify \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
-Pnative,docker,ci \
--fail-at-end \
@@ -216,31 +222,31 @@ jobs:
- name: cd extensions-core && mvn test
run: |
cd extensions-core
- ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip
-Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd extensions && mvn test
run: |
cd extensions
- ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip
-Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd test-framework && mvn test
run: |
cd test-framework
- ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip
-Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd tooling/perf-regression && mvn verify
run: |
cd tooling/perf-regression
- ../../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../../mvnw ${CQ_MAVEN_ARGS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
verify
- name: cd catalog && mvn test
run: |
cd catalog
- ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
test
- name: Report Build Failure
@@ -295,7 +301,7 @@ jobs:
- name: cd integration-tests-jvm && mvn clean test
run: |
cd integration-tests-jvm
- ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
--fail-at-end \
clean test
@@ -343,7 +349,7 @@ jobs:
shell: bash
run: |
cd integration-tests
- ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} \
-Dskip-testcontainers-tests -Dformatter.skip -Dimpsort.skip
-Denforcer.skip \
--fail-at-end \
clean verify
@@ -397,8
[camel-quarkus] branch main updated (9b0a2baa08 -> 93ba0a6b31)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 9b0a2baa08 Updated CHANGELOG.md
new 9f6b5cbdc4 [closes #3087] Divide HTTP tests into separate modules
new ff464b2e3f [relates #3087] Migrate netty-http module into netty http
tests
new 93ba0a6b31 [relates #3087] Create grouped module for HTTP tests
The 3 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:
.../http/README.adoc | 4 +-
integration-test-groups/http/common/pom.xml| 133 +
.../http/common/AbstractHttpResource.java | 71 +++
.../component/http/common/CommonProducers.java | 49 ++
.../quarkus/component/http/common/HttpService.java | 50 +-
.../src/main/resources/application.properties | 6 +
.../common}/src/main/resources/jsse/keystore.p12 | Bin
.../common}/src/main/resources/jsse/truststore.jks | Bin
.../component/http/common/AbstractHttpTest.java| 125 +
.../component/http/common}/HttpTestResource.java | 8 +-
.../http/http}/pom.xml | 95 ++--
.../component/http/http}/HttpProducers.java| 13 +-
.../quarkus/component/http/http/HttpResource.java | 178 +++
.../quarkus/component/http/http/HttpRoutes.java| 27 +-
.../quarkus/component/http/http/it/HttpIT.java | 7 +-
.../quarkus/component/http/http/it/HttpTest.java | 88
.../http/netty-http}/pom.xml | 94 ++--
.../component/http/netty/NettyHttpProducers.java | 12 +-
.../component/http/netty/NettyHttpResource.java| 234 +
.../component/http/netty}/NettyHttpRoutes.java | 17 +-
.../ProxyCapableClientInitializerFactory.java | 6 +-
.../http/netty}/auth/JaasLoginModule.java | 2 +-
.../http/netty}/auth/TestAuthenticator.java| 2 +-
.../http/netty}/auth/TestRolePrincipal.java| 2 +-
.../component/http/netty}/pojo/UserPojo.java | 2 +-
.../component/http/netty/it}/NettyHttpIT.java | 2 +-
.../http/netty/it}/NettyHttpJaasTest.java | 7 +-
.../http/netty/it}/NettyHttpJaasTestResource.java | 2 +-
.../component/http/netty/it/NettyHttpTest.java | 215
.../http/netty/it}/NettyHttpTestResource.java | 2 +-
.../http/netty-http/src/test/resources/config.jaas | 3 +
integration-test-groups/{ => http}/pom.xml | 32 +-
.../http/vertx-http}/pom.xml | 106 ++--
.../vertx}/VertxClientRelatedBeansProducer.java| 2 +-
.../component/http/vertx/VertxHttpService.java | 21 +-
.../component/http/vertx/VertxResource.java| 226 +
.../quarkus/component/http/vertx/VertxRoutes.java | 20 +-
.../src/main/resources/application.properties | 16 +-
.../component/http/vertx/it/VertxHttpIT.java | 4 +-
.../component/http/vertx/it/VertxHttpTest.java | 113 +
integration-test-groups/pom.xml| 1 +
.../http-grouped}/.gitignore | 0
integration-tests/{http => http-grouped}/pom.xml | 143 --
.../component/http/it/GreetingServerEndpoint.java | 48 --
.../quarkus/component/http/it/HttpResource.java| 539 -
.../camel/quarkus/component/http/it/HttpRoute.java | 95
.../http/src/main/resources/restcountries/cz.json | 81
.../camel/quarkus/component/http/it/HttpTest.java | 288 ---
.../component/netty/http/NettyHttpResource.java| 152 --
.../component/netty/http/NettyHttpAuthTest.java| 65 ---
.../component/netty/http/NettyHttpRestIT.java | 23 -
.../component/netty/http/NettyHttpRestTest.java| 58 ---
.../component/netty/http/NettyHttpTest.java| 80 ---
.../netty-http/src/test/resources/config.jaas | 3 -
integration-tests/pom.xml | 3 +-
poms/bom-test/pom.xml | 11 +
tooling/scripts/test-categories.yaml | 3 +-
57 files changed, 1825 insertions(+), 1764 deletions(-)
rename {integration-tests => integration-test-groups}/http/README.adoc (78%)
create mode 100644 integration-test-groups/http/common/pom.xml
create mode 100644
integration-test-groups/http/common/src/main/java/org/apache/camel/quarkus/component/http/common/AbstractHttpResource.java
create mode 100644
integration-test-groups/http/common/src/main/java/org/apache/camel/quarkus/component/http/common/CommonProducers.java
copy
integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/VertxClientRelatedBeansProducer.java
=>
integration-test-groups/http/common/src/main/java/org/apache/camel/quarkus/component/http/comm
[camel-quarkus] branch main updated: Replace org.graalvm.nativeimage:svm with org.graalvm.sdk:graal-sdk which has a status of public API
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 7d5f1d59e0 Replace org.graalvm.nativeimage:svm with org.graalvm.sdk:graal-sdk which has a status of public API 7d5f1d59e0 is described below commit 7d5f1d59e03548609894733265f198678bf27870 Author: Peter Palaga AuthorDate: Fri Jun 30 14:02:12 2023 +0200 Replace org.graalvm.nativeimage:svm with org.graalvm.sdk:graal-sdk which has a status of public API --- extensions-core/core/runtime/pom.xml | 4 +- .../camel/quarkus/core/graal/ResourceUtils.java| 46 extensions-support/azure-core/runtime/pom.xml | 4 +- extensions-support/consul-client/runtime/pom.xml | 4 +- extensions-support/debezium/runtime/pom.xml| 4 +- extensions-support/google-cloud/runtime/pom.xml| 4 +- extensions-support/httpclient/runtime/pom.xml | 4 +- extensions-support/retrofit/runtime/pom.xml| 4 +- extensions-support/spring/runtime/pom.xml | 4 +- .../deployment/XalanNativeImageProcessor.java | 61 +++--- extensions-support/xalan/runtime/pom.xml | 4 +- .../javax.xml.transform.TransformerFactory | 1 + extensions/activemq/runtime/pom.xml| 4 +- extensions/atlasmap/runtime/pom.xml| 4 +- extensions/bean-validator/runtime/pom.xml | 4 +- extensions/bean/runtime/pom.xml| 4 +- extensions/disruptor/runtime/pom.xml | 4 +- extensions/fhir/runtime/pom.xml| 4 +- extensions/file-watch/runtime/pom.xml | 4 +- extensions/fop/runtime/pom.xml | 4 +- extensions/google-pubsub/runtime/pom.xml | 4 +- extensions/grpc/runtime/pom.xml| 4 +- extensions/hazelcast/runtime/pom.xml | 4 +- extensions/jolt/runtime/pom.xml| 4 +- extensions/jsonpath/runtime/pom.xml| 4 +- extensions/kudu/runtime/pom.xml| 4 +- extensions/netty/runtime/pom.xml | 4 +- extensions/olingo4/runtime/pom.xml | 4 +- extensions/openapi-java/runtime/pom.xml| 4 +- extensions/paho/runtime/pom.xml| 4 +- extensions/quartz/runtime/pom.xml | 4 +- extensions/rest/runtime/pom.xml| 4 +- extensions/servicenow/runtime/pom.xml | 6 +-- extensions/shiro/runtime/pom.xml | 4 +- extensions/slack/runtime/pom.xml | 4 +- extensions/spring-rabbitmq/runtime/pom.xml | 4 +- extensions/ssh/runtime/pom.xml | 4 +- extensions/xchange/runtime/pom.xml | 4 +- extensions/xslt/deployment/pom.xml | 4 +- 39 files changed, 82 insertions(+), 172 deletions(-) diff --git a/extensions-core/core/runtime/pom.xml b/extensions-core/core/runtime/pom.xml index cf52d8bfd7..ca78a4f5f2 100644 --- a/extensions-core/core/runtime/pom.xml +++ b/extensions-core/core/runtime/pom.xml @@ -90,8 +90,8 @@ -org.graalvm.nativeimage -svm +org.graalvm.sdk +graal-sdk provided diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/ResourceUtils.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/ResourceUtils.java deleted file mode 100644 index 5a6d886f02..00 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/ResourceUtils.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.core.graal; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; - -import com.oracle.svm.core.jdk.Resources; - -/** - * Helper methods invoked from generated bytecode during image processing - */ -public
[camel-quarkus] 03/03: [relates #3087] Create grouped module for HTTP tests
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 93ba0a6b311c21ae36f9c04018088e5560957e93 Author: Andrej Vano AuthorDate: Thu Jul 13 12:38:04 2023 +0200 [relates #3087] Create grouped module for HTTP tests --- .../http/README.adoc | 4 +- .../http/common/pom.xml| 39 ++- .../http/common/AbstractHttpResource.java | 4 +- .../component/http/common/CommonProducers.java | 0 .../quarkus/component/http/common/HttpService.java | 0 .../src/main/resources/application.properties | 0 .../common/src/main/resources/jsse/keystore.p12| Bin .../common/src/main/resources/jsse/truststore.jks | Bin .../component/http/common/AbstractHttpTest.java| 2 + .../component/http/common/HttpTestResource.java| 0 integration-test-groups/http/http/pom.xml | 185 .../quarkus/component/http/http/HttpProducers.java | 0 .../quarkus/component/http/http/HttpResource.java | 0 .../quarkus/component/http/http/HttpRoutes.java| 2 +- .../quarkus/component/http/http/it/HttpIT.java | 0 .../quarkus/component/http/http/it/HttpTest.java | 0 integration-test-groups/http/netty-http/pom.xml| 215 ++ .../component/http/netty/NettyHttpProducers.java | 0 .../component/http/netty/NettyHttpResource.java| 0 .../component/http/netty/NettyHttpRoutes.java | 2 +- .../ProxyCapableClientInitializerFactory.java | 0 .../component/http/netty/auth/JaasLoginModule.java | 0 .../http/netty/auth/TestAuthenticator.java | 0 .../http/netty/auth/TestRolePrincipal.java | 0 .../component/http/netty/pojo/UserPojo.java| 0 .../component/http/netty/it/NettyHttpIT.java | 0 .../component/http/netty/it/NettyHttpJaasTest.java | 0 .../http/netty/it/NettyHttpJaasTestResource.java | 0 .../component/http/netty/it/NettyHttpTest.java | 0 .../http/netty/it/NettyHttpTestResource.java | 0 .../http/netty-http/src/test/resources/config.jaas | 0 .../http/pom.xml | 26 +- .../http/vertx-http/pom.xml| 88 +- .../vertx/VertxClientRelatedBeansProducer.java | 0 .../component/http/vertx/VertxHttpService.java | 0 .../component/http/vertx/VertxResource.java| 0 .../quarkus/component/http/vertx/VertxRoutes.java | 2 +- .../src/main/resources/application.properties | 0 .../component/http/vertx/it/VertxHttpIT.java | 0 .../component/http/vertx/it/VertxHttpTest.java | 0 integration-test-groups/pom.xml| 1 + integration-tests/http-grouped/.gitignore | 3 + integration-tests/http-grouped/pom.xml | 322 + integration-tests/http/http/pom.xml| 100 --- integration-tests/http/netty-http/pom.xml | 104 --- integration-tests/pom.xml | 2 +- poms/bom-test/pom.xml | 4 +- tooling/scripts/test-categories.yaml | 2 +- 48 files changed, 862 insertions(+), 245 deletions(-) diff --git a/integration-tests/http/README.adoc b/integration-test-groups/http/README.adoc similarity index 78% rename from integration-tests/http/README.adoc rename to integration-test-groups/http/README.adoc index 3bb970af55..a010749a0c 100644 --- a/integration-tests/http/README.adoc +++ b/integration-test-groups/http/README.adoc @@ -1,5 +1,5 @@ -== Certificate for netty-http test +== Certificate for HTTPS Server keystore has to contain server certificate. It is possible to use self-signed certificate created by following command: -`keytool -genkeypair -keystore keystore.p12 -storetype PKCS12 -storepass changeit -alias localhost -keyalg RSA -keysize 2048 -validity 9 -dname "CN=localhost"' \ No newline at end of file +`keytool -genkeypair -keystore keystore.p12 -storetype PKCS12 -storepass changeit -alias localhost -keyalg RSA -keysize 2048 -validity 9 -dname "CN=localhost"' diff --git a/integration-tests/http/common/pom.xml b/integration-test-groups/http/common/pom.xml similarity index 70% rename from integration-tests/http/common/pom.xml rename to integration-test-groups/http/common/pom.xml index c8cc6e8b3b..1c4f1c5841 100644 --- a/integration-tests/http/common/pom.xml +++ b/integration-test-groups/http/common/pom.xml @@ -24,11 +24,12 @@ org.apache.camel.quarkus -camel-quarkus-integration-test-http +camel-quarkus-build-parent-it 3.0.0-SNAPSHOT +../../../poms/build-parent-it/pom.xml -camel-quarkus-integration-test-http-common +camel-quarkus-integration-tests-http-common Camel Quarkus :: Integration Tests :: HTTP :: C
[camel-quarkus] 01/03: [closes #3087] Divide HTTP tests into separate modules
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 9f6b5cbdc413c458f3c20b177e9fc2a5c7f88fc1 Author: Andrej Vano AuthorDate: Mon Jun 26 14:03:39 2023 +0200 [closes #3087] Divide HTTP tests into separate modules --- integration-tests/http/common/pom.xml | 102 .../http/common/AbstractHttpResource.java | 71 +++ .../component/http/common/CommonProducers.java | 49 ++ .../component/http/common/HttpService.java}| 50 +- .../src/main/resources/application.properties | 6 + .../src/main/resources/jsse/keystore.p12 | Bin .../src/main/resources/jsse/truststore.jks | Bin .../component/http/common/AbstractHttpTest.java| 123 + .../component/http/common}/HttpTestResource.java | 8 +- integration-tests/http/http/pom.xml| 100 .../component/http/http}/HttpProducers.java| 13 +- .../quarkus/component/http/http/HttpResource.java | 178 +++ .../quarkus/component/http/http/HttpRoutes.java} | 38 +- .../quarkus/component/http}/http/it/HttpIT.java| 7 +- .../quarkus/component/http/http/it/HttpTest.java | 88 integration-tests/http/netty-http/pom.xml | 92 .../component/http/netty/NettyHttpProducers.java} | 12 +- .../component/http/netty/NettyHttpResource.java| 122 + .../component/http/netty/NettyHttpRoutes.java | 35 ++ .../ProxyCapableClientInitializerFactory.java | 6 +- .../component/http/netty/it/NettyHttpIT.java} | 4 +- .../component/http/netty/it/NettyHttpTest.java | 74 +++ integration-tests/http/pom.xml | 197 +--- .../component/http/it/GreetingServerEndpoint.java | 48 -- .../quarkus/component/http/it/HttpResource.java| 539 - .../camel/quarkus/component/http/it/HttpRoute.java | 95 .../http/src/main/resources/restcountries/cz.json | 81 .../camel/quarkus/component/http/it/HttpTest.java | 288 --- integration-tests/http/vertx-http/pom.xml | 96 .../vertx}/VertxClientRelatedBeansProducer.java| 2 +- .../component/http/vertx/VertxHttpService.java}| 21 +- .../component/http/vertx/VertxResource.java| 226 + .../quarkus/component/http/vertx/VertxRoutes.java} | 14 +- .../src/main/resources/application.properties | 16 +- .../component/http/vertx/it/VertxHttpIT.java} | 4 +- .../component/http/vertx/it/VertxHttpTest.java | 113 + poms/bom-test/pom.xml | 11 + 37 files changed, 1584 insertions(+), 1345 deletions(-) diff --git a/integration-tests/http/common/pom.xml b/integration-tests/http/common/pom.xml new file mode 100644 index 00..c8cc6e8b3b --- /dev/null +++ b/integration-tests/http/common/pom.xml @@ -0,0 +1,102 @@ + + +http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +4.0.0 + + +org.apache.camel.quarkus +camel-quarkus-integration-test-http +3.0.0-SNAPSHOT + + +camel-quarkus-integration-test-http-common +Camel Quarkus :: Integration Tests :: HTTP :: Common + + + +org.apache.camel.quarkus +camel-quarkus-core + + +io.quarkus +quarkus-resteasy + + +io.quarkus +quarkus-elytron-security-properties-file + + + + +io.quarkus +quarkus-junit5 + + +io.rest-assured +rest-assured + + +org.testcontainers +testcontainers + + +junit +junit + + + + +io.quarkus +quarkus-junit4-mock + + + + +org.apache.camel.quarkus +camel-quarkus-integration-test-support + + + + + + +org.jboss.jandex +jandex-maven-plugin + + +make-index + +jandex + + + + + +org.apache.maven.plugins +maven-surefire-plugin + +true + + + + + diff --git a/integration-tests/http/common/src/main/java/org/apache/camel/quarkus/component/http/common/AbstractHttpResource.java b/integration-tests/http/common/src/main/java/org/apache/camel/quarkus/component/http/common/A
[camel-quarkus] 02/03: [relates #3087] Migrate netty-http module into netty http tests
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ff464b2e3fe71071b009bd65698be56b01100a9c
Author: Andrej Vano
AuthorDate: Fri Jun 30 13:21:41 2023 +0200
[relates #3087] Migrate netty-http module into netty http tests
---
integration-tests/http/netty-http/pom.xml | 12 ++
.../component/http/netty/NettyHttpResource.java| 112 +
.../component/http/netty/NettyHttpRoutes.java | 132 +++
.../http/netty}/auth/JaasLoginModule.java | 2 +-
.../http/netty}/auth/TestAuthenticator.java| 2 +-
.../http/netty}/auth/TestRolePrincipal.java| 2 +-
.../component/http/netty}/pojo/UserPojo.java | 2 +-
.../http/netty/it}/NettyHttpJaasTest.java | 7 +-
.../http/netty/it}/NettyHttpJaasTestResource.java | 2 +-
.../component/http/netty/it/NettyHttpTest.java | 141
.../http/netty/it}/NettyHttpTestResource.java | 2 +-
.../http/netty-http/src/test/resources/config.jaas | 3 +
integration-tests/netty-http/pom.xml | 186 -
.../component/netty/http/NettyHttpResource.java| 152 -
.../component/netty/http/NettyHttpRoutes.java | 156 -
.../component/netty/http/NettyHttpAuthIT.java | 23 ---
.../component/netty/http/NettyHttpAuthTest.java| 65 ---
.../quarkus/component/netty/http/NettyHttpIT.java | 23 ---
.../component/netty/http/NettyHttpJaasIT.java | 23 ---
.../component/netty/http/NettyHttpRestIT.java | 23 ---
.../component/netty/http/NettyHttpRestTest.java| 58 ---
.../component/netty/http/NettyHttpTest.java| 80 -
.../netty-http/src/test/resources/config.jaas | 3 -
integration-tests/pom.xml | 1 -
tooling/scripts/test-categories.yaml | 1 -
25 files changed, 411 insertions(+), 802 deletions(-)
diff --git a/integration-tests/http/netty-http/pom.xml
b/integration-tests/http/netty-http/pom.xml
index f0333eb2d0..28fad55e23 100644
--- a/integration-tests/http/netty-http/pom.xml
+++ b/integration-tests/http/netty-http/pom.xml
@@ -48,6 +48,18 @@
org.apache.camel.quarkus
camel-quarkus-direct
+
+org.apache.camel.quarkus
+camel-quarkus-rest
+
+
+org.apache.camel.quarkus
+camel-quarkus-jackson
+
+
+org.apache.camel.quarkus
+camel-quarkus-jaxb
+
diff --git
a/integration-tests/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/NettyHttpResource.java
b/integration-tests/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/NettyHttpResource.java
index bd73a38713..e482ddce8a 100644
---
a/integration-tests/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/NettyHttpResource.java
+++
b/integration-tests/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/NettyHttpResource.java
@@ -18,20 +18,29 @@ package org.apache.camel.quarkus.component.http.netty;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
import java.util.zip.GZIPInputStream;
+import io.netty.handler.codec.http.FullHttpResponse;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.apache.camel.Exchange;
+import org.apache.camel.component.netty.http.NettyHttpMessage;
import org.apache.camel.quarkus.component.http.common.AbstractHttpResource;
import org.apache.camel.util.IOHelper;
@@ -119,4 +128,107 @@ public class NettyHttpResource extends
AbstractHttpResource {
.send();
return exchange.getException().getClass().getName();
}
+
+@GET
+@Path("/getRequest/{method}/{hName}/{hValue}/{body}")
+public String getRequest(@PathParam("method") String method,
@PathParam("hName") String headerName,
+@PathParam("hValue") String headerValue,
+@PathParam("body") String body,
+@QueryParam("test-port") int port) {
+return producerTemplate.toF("netty-http:http://localhost:%d/request";,
port)
+.withHeaders(Map.of(Exchange.HTTP_METHOD, method, headerName,
he
[camel-quarkus] branch main updated: Add a note to the contributor guide about keeping junit & Co. in Maven test scope
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 125a6b2ed6 Add a note to the contributor guide about keeping junit & Co. in Maven test scope 125a6b2ed6 is described below commit 125a6b2ed6633ce1aa8bc3f03fc4e32dc8248736 Author: Peter Palaga AuthorDate: Wed Jul 12 16:19:39 2023 +0200 Add a note to the contributor guide about keeping junit & Co. in Maven test scope --- docs/modules/ROOT/pages/contributor-guide/extension-testing.adoc | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/contributor-guide/extension-testing.adoc b/docs/modules/ROOT/pages/contributor-guide/extension-testing.adoc index c7cac36906..c539a8e22b 100644 --- a/docs/modules/ROOT/pages/contributor-guide/extension-testing.adoc +++ b/docs/modules/ROOT/pages/contributor-guide/extension-testing.adoc @@ -54,12 +54,17 @@ If you want to add just a new test module for an existing extension, == Minimal set of dependencies -Keeping the set of test module dependencies as small as possible has two main advantages: +Keeping the set of test module dependencies as small as possible has several advantages: * Less code is faster to compile to native image * Additional code may introduce some side effects, mainly in native compilation. For instance, an extension A may configure the native compiler in such a way that it causes also extension B to work properly in native mode. However, if B was tested in isolation, it would not work. +* This rule also applies to `junit`, `testcontainers`, `rest-assured`, `assertj` and similar testing dependencies: + Unless there is some really good reason to do the opposite, they should be kept in Maven `test` scope. + Having them in the `compile` or `runtime` scope makes them analyzed and possibly compiled by GraalVM + when the tests are run in native mode. + On one hand, it makes the native compilation slower and on the other hand, those testing artifacts may cause native compilation issues. == Grouping
[camel-quarkus] branch main updated: Velocity $foreach.index, $foreach.count and $foreach.hasNext do not work in native mode fix #5080
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new d54c3abec1 Velocity $foreach.index, $foreach.count and
$foreach.hasNext do not work in native mode fix #5080
d54c3abec1 is described below
commit d54c3abec1d488ddd4b3e5991f084cd2d982281e
Author: Peter Palaga
AuthorDate: Wed Jul 12 11:45:43 2023 +0200
Velocity $foreach.index, $foreach.count and $foreach.hasNext do not work in
native mode fix #5080
---
.../velocity/deployment/VelocityProcessor.java | 19 ---
.../camel/quarkus/component/velocity/it/Person.java | 5 +
.../component/velocity/it/VelocityResource.java | 21 +
.../velocity/src/main/resources/template/foreach.vm | 19 +++
.../quarkus/component/velocity/it/VelocityTest.java | 17 +
5 files changed, 74 insertions(+), 7 deletions(-)
diff --git
a/extensions/velocity/deployment/src/main/java/org/apache/camel/quarkus/component/velocity/deployment/VelocityProcessor.java
b/extensions/velocity/deployment/src/main/java/org/apache/camel/quarkus/component/velocity/deployment/VelocityProcessor.java
index 816b866c3e..308b834f19 100644
---
a/extensions/velocity/deployment/src/main/java/org/apache/camel/quarkus/component/velocity/deployment/VelocityProcessor.java
+++
b/extensions/velocity/deployment/src/main/java/org/apache/camel/quarkus/component/velocity/deployment/VelocityProcessor.java
@@ -19,6 +19,7 @@ package
org.apache.camel.quarkus.component.velocity.deployment;
import java.util.ArrayList;
import java.util.TreeMap;
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
@@ -26,6 +27,7 @@ import
io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import
org.apache.camel.component.velocity.CamelVelocityClasspathResourceLoader;
+import org.apache.velocity.runtime.directive.ForeachScope;
import org.jboss.jandex.IndexView;
import static java.util.stream.Collectors.toCollection;
@@ -47,7 +49,9 @@ class VelocityProcessor {
}
@BuildStep
-ReflectiveClassBuildItem registerForReflection(CombinedIndexBuildItem
combinedIndex) {
+void reflectiveClass(
+BuildProducer reflectiveClass,
+CombinedIndexBuildItem combinedIndex) {
IndexView index = combinedIndex.getIndex();
ArrayList dtos = index.getKnownClasses().stream().map(ci ->
ci.name().toString())
@@ -56,13 +60,14 @@ class VelocityProcessor {
.collect(toCollection(ArrayList::new));
dtos.add(CamelVelocityClasspathResourceLoader.class.getName());
+
reflectiveClass.produce(ReflectiveClassBuildItem.builder(dtos.toArray(new
String[dtos.size()])).build());
-return ReflectiveClassBuildItem.builder(dtos.toArray(new
String[dtos.size()])).build();
-}
-
-@BuildStep
-ReflectiveClassBuildItem registerForReflectionWithMethods() {
-return
ReflectiveClassBuildItem.builder(TreeMap.class.getName()).methods().build();
+reflectiveClass.produce(
+ReflectiveClassBuildItem.builder(
+TreeMap.class.getName(),
+ForeachScope.class.getName())
+.methods()
+.build());
}
@BuildStep
diff --git
a/integration-tests/velocity/src/main/java/org/apache/camel/quarkus/component/velocity/it/Person.java
b/integration-tests/velocity/src/main/java/org/apache/camel/quarkus/component/velocity/it/Person.java
index 9ba60b665f..a01c7e7261 100644
---
a/integration-tests/velocity/src/main/java/org/apache/camel/quarkus/component/velocity/it/Person.java
+++
b/integration-tests/velocity/src/main/java/org/apache/camel/quarkus/component/velocity/it/Person.java
@@ -24,6 +24,11 @@ public class Person {
private String name;
private String country;
+public static Person fromString(String str) {
+String[] fields = str.split(",");
+return new Person(fields[0], fields[1]);
+}
+
public Person() {
}
diff --git
a/integration-tests/velocity/src/main/java/org/apache/camel/quarkus/component/velocity/it/VelocityResource.java
b/integration-tests/velocity/src/main/java/org/apache/camel/quarkus/component/velocity/it/VelocityResource.java
index 79f0da783d..faac091151 100644
---
a/integration-tests/velocity/src/main/java/org/apache/camel/quarkus/component/velocity/it/VelocityResource.java
+++
b/integration-tests/velocity/src/main/java/org/apache/camel/quarkus/componen
