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 +
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 +3.10.
(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'] = project.version.
[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 +${pr
[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 :: Common
[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/AbstractHttpReso
[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, headerV
[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/compo
[camel-quarkus] branch main updated: Re-add activemq extension after it was added back in Camel 4.0.0-RC1 fix #5087
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 141ad67342 Re-add activemq extension after it was added back in Camel 4.0.0-RC1 fix #5087 141ad67342 is described below commit 141ad673429a51d970127b1321b23ec9c841c625 Author: Peter Palaga AuthorDate: Tue Jul 11 14:03:54 2023 +0200 Re-add activemq extension after it was added back in Camel 4.0.0-RC1 fix #5087 --- docs/modules/ROOT/examples/components/activemq.yml | 13 ++ docs/modules/ROOT/nav.adoc | 1 + .../ROOT/pages/reference/extensions/activemq.adoc | 87 extensions/activemq/deployment/pom.xml | 65 + .../activemq/deployment/ActiveMQProcessor.java | 141 +++ extensions/activemq/pom.xml| 37 + extensions/activemq/runtime/pom.xml| 110 +++ .../activemq/runtime/src/main/doc/limitations.adoc | 2 + .../activemq/runtime/src/main/doc/usage.adoc | 9 ++ .../activemq/graal/ActiveMQSubstitutions.java | 43 ++ .../activemq/graal/SpringJMSSubstitutions.java | 89 .../main/resources/META-INF/quarkus-extension.yaml | 31 + extensions/pom.xml | 1 + integration-tests/activemq/pom.xml | 154 + .../it/ActiveMQConnectionFactoryProducer.java | 47 +++ .../quarkus/component/activemq/it/ActiveMQIT.java | 24 .../component/activemq/it/ActiveMQTest.java| 27 .../activemq/it/ActiveMQTestResource.java | 74 ++ integration-tests/pom.xml | 1 + poms/bom/pom.xml | 15 ++ poms/bom/src/main/generated/flattened-full-pom.xml | 15 ++ .../src/main/generated/flattened-reduced-pom.xml | 15 ++ .../generated/flattened-reduced-verbose-pom.xml| 15 ++ tooling/scripts/test-categories.yaml | 1 + 24 files changed, 1017 insertions(+) diff --git a/docs/modules/ROOT/examples/components/activemq.yml b/docs/modules/ROOT/examples/components/activemq.yml new file mode 100644 index 00..e1fbbf302b --- /dev/null +++ b/docs/modules/ROOT/examples/components/activemq.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-activemq +cqArtifactIdBase: activemq +cqNativeSupported: true +cqStatus: Stable +cqDeprecated: false +cqJvmSince: 1.0.0 +cqNativeSince: 1.0.0 +cqCamelPartName: activemq +cqCamelPartTitle: ActiveMQ +cqCamelPartDescription: Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component. +cqExtensionPageTitle: ActiveMQ diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index d723a52020..e39893ee19 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -50,6 +50,7 @@ *** xref:reference/extensions/aws2-translate.adoc[AWS 2 Translate] *** xref:reference/extensions/aws-secrets-manager.adoc[AWS Secrets Manager] *** xref:reference/extensions/aws-xray.adoc[AWS XRay] +*** xref:reference/extensions/activemq.adoc[ActiveMQ] *** xref:reference/extensions/arangodb.adoc[ArangoDb] *** xref:reference/extensions/asterisk.adoc[Asterisk] *** xref:reference/extensions/atlasmap.adoc[AtlasMap] diff --git a/docs/modules/ROOT/pages/reference/extensions/activemq.adoc b/docs/modules/ROOT/pages/reference/extensions/activemq.adoc new file mode 100644 index 00..068614c7c5 --- /dev/null +++ b/docs/modules/ROOT/pages/reference/extensions/activemq.adoc @@ -0,0 +1,87 @@ +// Do not edit directly! +// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +[id="extensions-activemq"] += ActiveMQ +:page-aliases: extensions/activemq.adoc +:linkattrs: +:cq-artifact-id: camel-quarkus-activemq +:cq-native-supported: true +:cq-status: Stable +:cq-status-deprecation: Stable +:cq-description: Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component. +:cq-deprecated: false +:cq-jvm-since: 1.0.0 +:cq-native-since: 1.0.0 + +ifeval::[{doc-show-badges} == true] +[.badges] +[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0## +endif::[] + +Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component. + +[id="extensions-activemq-whats-inside"] +== What's inside + +* xref:{cq-camel-components}::activemq-component.adoc[ActiveMQ component], URI syntax: `activemq:destinationType:destinationName` + +Please refer to the above link for usage and configuration details. + +[id="extensions-activemq-maven-coordinates"] +== Maven coordinates + +https:
[camel-quarkus] branch main updated: NettyHttpJaasTestResource reads config.jaas from disk fix #5083
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 dcf2bc8ca2 NettyHttpJaasTestResource reads config.jaas from disk fix #5083 dcf2bc8ca2 is described below commit dcf2bc8ca2a2a6693269b0505e187563bc7d71a9 Author: Peter Palaga AuthorDate: Fri Jul 7 19:23:34 2023 +0200 NettyHttpJaasTestResource reads config.jaas from disk fix #5083 --- .../quarkus/component/netty/http/NettyHttpJaasTestResource.java | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/integration-tests/netty-http/src/test/java/org/apache/camel/quarkus/component/netty/http/NettyHttpJaasTestResource.java b/integration-tests/netty-http/src/test/java/org/apache/camel/quarkus/component/netty/http/NettyHttpJaasTestResource.java index 0e103e9594..d2dea0476e 100644 --- a/integration-tests/netty-http/src/test/java/org/apache/camel/quarkus/component/netty/http/NettyHttpJaasTestResource.java +++ b/integration-tests/netty-http/src/test/java/org/apache/camel/quarkus/component/netty/http/NettyHttpJaasTestResource.java @@ -17,6 +17,7 @@ package org.apache.camel.quarkus.component.netty.http; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -24,16 +25,16 @@ import java.util.Map; public class NettyHttpJaasTestResource extends NettyHttpTestResource { private static final String JAAS_FILE_NAME = "config.jaas"; -private static final Path SOURCE_FILE = Paths.get("src/test/resources/").resolve(JAAS_FILE_NAME); private static final Path TARGET_FILE = Paths.get("target/").resolve(JAAS_FILE_NAME); @Override public Map start() { if (!Files.exists(TARGET_FILE)) { -try { -Files.copy(SOURCE_FILE, TARGET_FILE); +try (InputStream in = getClass().getClassLoader().getResourceAsStream(JAAS_FILE_NAME)) { +Files.createDirectories(TARGET_FILE.getParent()); +Files.copy(in, TARGET_FILE); } catch (IOException e) { -throw new RuntimeException("Unable to copy " + JAAS_FILE_NAME, e); +throw new RuntimeException("Unable to copy " + JAAS_FILE_NAME + " from class path to " + TARGET_FILE, e); } }
[camel-quarkus] branch main updated: Enable Twilio test after the component was fixed via Camel 4.0.0-M2 #4527
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 0aa1aa1bee Enable Twilio test after the component was fixed via Camel 4.0.0-M2 #4527 0aa1aa1bee is described below commit 0aa1aa1bee3fa6277fcc8db552579f13a154e518 Author: Peter Palaga AuthorDate: Fri Jul 7 16:40:01 2023 +0200 Enable Twilio test after the component was fixed via Camel 4.0.0-M2 #4527 --- integration-tests/pom.xml | 2 +- .../apache/camel/quarkus/component/twilio/it/TwilioResource.java| 6 +++--- tooling/scripts/test-categories.yaml| 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 3ac8d352fe..0e9584ac0c 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -222,7 +222,7 @@ tarfile telegram tika - +twilio twitter univocity-parsers validator diff --git a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java index 2a333f2a15..a585ea261a 100644 --- a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java +++ b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java @@ -116,9 +116,9 @@ public class TwilioResource { return new TwilioRestClient.Builder( ConfigProvider.getConfig().getValue("camel.component.twilio.username", String.class), ConfigProvider.getConfig().getValue("camel.component.twilio.password", String.class)) - .accountSid(ConfigProvider.getConfig().getValue("camel.component.twilio.account-sid", String.class)) -.httpClient(client) -.build(); + .accountSid(ConfigProvider.getConfig().getValue("camel.component.twilio.account-sid", String.class)) +.httpClient(client) +.build(); } return null; } diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index 43531438d5..cfb11e2bb2 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -215,4 +215,5 @@ group-13: - servicenow - slack - nitrite + - twilio - pgevent
svn commit: r62858 - in /release/camel/camel-quarkus: 3.0.0-M1/ 3.0.0-M2/ 3.0.0-RC1/ 3.0.0-RC1/apache-camel-quarkus-3.0.0-RC1-src.zip 3.0.0-RC1/apache-camel-quarkus-3.0.0-RC1-src.zip.asc 3.0.0-RC1/apa
Author: ppalaga Date: Fri Jul 7 13:42:13 2023 New Revision: 62858 Log: Apache Camel Quarkus 3.0.0-RC1 released artifacts Added: release/camel/camel-quarkus/3.0.0-RC1/ release/camel/camel-quarkus/3.0.0-RC1/apache-camel-quarkus-3.0.0-RC1-src.zip (with props) release/camel/camel-quarkus/3.0.0-RC1/apache-camel-quarkus-3.0.0-RC1-src.zip.asc (with props) release/camel/camel-quarkus/3.0.0-RC1/apache-camel-quarkus-3.0.0-RC1-src.zip.sha512 Removed: release/camel/camel-quarkus/3.0.0-M1/ release/camel/camel-quarkus/3.0.0-M2/ Added: release/camel/camel-quarkus/3.0.0-RC1/apache-camel-quarkus-3.0.0-RC1-src.zip == Binary file - no diff available. Propchange: release/camel/camel-quarkus/3.0.0-RC1/apache-camel-quarkus-3.0.0-RC1-src.zip -- svn:mime-type = application/zip Added: release/camel/camel-quarkus/3.0.0-RC1/apache-camel-quarkus-3.0.0-RC1-src.zip.asc == Binary file - no diff available. Propchange: release/camel/camel-quarkus/3.0.0-RC1/apache-camel-quarkus-3.0.0-RC1-src.zip.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-quarkus/3.0.0-RC1/apache-camel-quarkus-3.0.0-RC1-src.zip.sha512 == --- release/camel/camel-quarkus/3.0.0-RC1/apache-camel-quarkus-3.0.0-RC1-src.zip.sha512 (added) +++ release/camel/camel-quarkus/3.0.0-RC1/apache-camel-quarkus-3.0.0-RC1-src.zip.sha512 Fri Jul 7 13:42:13 2023 @@ -0,0 +1 @@ +64af0a0214dd1bf110199a0606e8eb516edc1d72487acd9b1786bde66e6aa247f2cfd16bc6709de5b7e886989916b00568f0848c867b1f4bbca2a9b86e819d96 apache-camel-quarkus-3.0.0-RC1-src.zip
[camel] branch main updated: Prefer using camel.surefire.* properties where possible, remove superfluous surefire configuration, e.g. it is default or inherited 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.git The following commit(s) were added to refs/heads/main by this push: new 3e903408075 Prefer using camel.surefire.* properties where possible, remove superfluous surefire configuration, e.g. it is default or inherited anyway 3e903408075 is described below commit 3e90340807532bedb972a89de7f3c93a12ac0294 Author: Peter Palaga AuthorDate: Wed Jul 5 12:14:20 2023 +0200 Prefer using camel.surefire.* properties where possible, remove superfluous surefire configuration, e.g. it is default or inherited anyway --- components/camel-asterisk/pom.xml | 25 + .../camel-aws/camel-aws-secrets-manager/pom.xml| 23 +--- components/camel-aws/camel-aws2-kms/pom.xml| 23 +--- components/camel-aws/camel-aws2-lambda/pom.xml | 23 +--- components/camel-aws/camel-aws2-sns/pom.xml| 23 +--- components/camel-box/camel-box-component/pom.xml | 25 ++--- components/camel-cxf/camel-cxf-common/pom.xml | 23 components/camel-cxf/camel-cxf-rest/pom.xml| 29 ++- components/camel-cxf/camel-cxf-soap/pom.xml| 29 ++- .../camel-cxf/camel-cxf-spring-common/pom.xml | 42 -- components/camel-cxf/camel-cxf-spring-rest/pom.xml | 29 ++- components/camel-cxf/camel-cxf-spring-soap/pom.xml | 29 ++- components/camel-elasticsearch/pom.xml | 4 +-- components/camel-facebook/pom.xml | 26 +- components/camel-flink/pom.xml | 22 +--- .../camel-google/camel-google-functions/pom.xml| 26 +- .../camel-google-secret-manager/pom.xml| 26 +- .../camel-google/camel-google-sheets/pom.xml | 12 ++- .../camel-google/camel-google-storage/pom.xml | 28 ++- components/camel-hazelcast/pom.xml | 5 +-- components/camel-ignite/pom.xml| 22 +--- components/camel-jcr/pom.xml | 23 +--- components/camel-jgroups-raft/pom.xml | 2 +- components/camel-jgroups/pom.xml | 2 +- components/camel-jms/pom.xml | 9 + components/camel-jpa/pom.xml | 11 ++ components/camel-kudu/pom.xml | 22 ++-- components/camel-leveldb/pom.xml | 19 -- components/camel-mail/pom.xml | 24 + components/camel-master/pom.xml| 25 - components/camel-mina/pom.xml | 2 +- components/camel-mllp/pom.xml | 25 - components/camel-observation/pom.xml | 8 + components/camel-opensearch/pom.xml| 4 +-- components/camel-opentelemetry/pom.xml | 8 + components/camel-printer/pom.xml | 19 +- components/camel-pulsar/pom.xml| 14 +--- components/camel-robotframework/pom.xml| 24 ++--- components/camel-rocketmq/pom.xml | 25 +++-- components/camel-rxjava/pom.xml| 26 ++ .../camel-salesforce-component/pom.xml | 9 - components/camel-sap-netweaver/pom.xml | 11 +- components/camel-service/pom.xml | 25 - components/camel-servlet/pom.xml | 20 +-- components/camel-sjms/pom.xml | 22 +--- components/camel-sjms2/pom.xml | 22 +--- components/camel-soap/pom.xml | 22 +--- components/camel-undertow/pom.xml | 23 +--- components/camel-xmpp/pom.xml | 1 - components/camel-zookeeper-master/pom.xml | 6 components/camel-zookeeper/pom.xml | 8 + core/camel-core/pom.xml| 2 +- core/camel-main/pom.xml| 22 +--- core/camel-management/pom.xml | 17 + dsl/camel-kotlin-dsl/pom.xml | 25 ++--- parent/pom.xml | 3 +- pom.xml| 6 tests/test-bundles/pom.xml | 2 +- .../pom.xml| 27 +++--- 59 files changed, 80 insertions(+), 979 deletions(-) diff --git a/components/camel-asterisk/pom.xml b/components/camel-asterisk/pom.xml index d5c09d80ca0..ee768669dd9 100644 --- a/components/camel-asterisk/pom.xml +++ b/components/camel-asterisk/pom.xml @@ -32,6 +32,7 @@ Camel Asterisk
[camel] branch main updated (111f0173e8a -> cee432c2303)
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 111f0173e8a Upgrade slack-api-client to 1.29.2 new a232bb5ed7d Use properties for Maven plugin versions new ee9dfe5637a surefire.version property is not needed anymore because we do not inherit from org.apache:apache anywhere else than in org.apache.camel:camel new 1fa64174f54 Reformat components/camel-azure/pom.xml new cee432c2303 CAMEL-19579 - Manage commons-lang3 to build and test with a single deterministic version 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: components/camel-aws/camel-aws-xray/pom.xml| 1 - components/camel-azure/camel-azure-cosmosdb/pom.xml| 1 - components/camel-azure/camel-azure-eventhubs/pom.xml | 1 - components/camel-azure/camel-azure-files/pom.xml | 8 +--- components/camel-azure/camel-azure-key-vault/pom.xml | 6 -- components/camel-azure/camel-azure-servicebus/pom.xml | 6 -- components/camel-azure/camel-azure-storage-blob/pom.xml| 1 - components/camel-azure/camel-azure-storage-datalake/pom.xml| 1 - components/camel-azure/camel-azure-storage-queue/pom.xml | 1 - components/camel-azure/pom.xml | 4 ++-- components/camel-cxf/camel-cxf-rest/pom.xml| 7 --- components/camel-cxf/camel-cxf-spring-rest/pom.xml | 7 --- components/camel-cxf/camel-cxf-spring-soap/pom.xml | 7 --- components/camel-dhis2/camel-dhis2-component/pom.xml | 5 + components/camel-dhis2/pom.xml | 6 -- components/camel-grape/pom.xml | 1 - components/camel-hashicorp-vault/pom.xml | 8 +--- components/camel-huawei/camel-huaweicloud-smn/pom.xml | 10 -- components/camel-ironmq/pom.xml| 5 - components/camel-jt400/pom.xml | 5 - components/camel-kafka/pom.xml | 7 --- components/camel-mongodb/pom.xml | 1 - components/camel-olingo2/camel-olingo2-component/pom.xml | 1 - components/camel-olingo4/camel-olingo4-component/pom.xml | 5 - components/camel-pdf/pom.xml | 1 - components/camel-salesforce/camel-salesforce-codegen/pom.xml | 5 - components/camel-salesforce/camel-salesforce-component/pom.xml | 1 - components/camel-spring-batch/pom.xml | 1 - components/camel-stitch/pom.xml| 6 -- components/camel-telegram/pom.xml | 1 - parent/pom.xml | 6 ++ pom.xml| 10 +- tooling/openapi-rest-dsl-generator/pom.xml | 1 - 33 files changed, 24 insertions(+), 113 deletions(-)
[camel] 04/04: CAMEL-19579 - Manage commons-lang3 to build and test with a single deterministic version
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 commit cee432c23038d57685a2de3f921b15b1fe062a50 Author: Peter Palaga AuthorDate: Wed Jul 5 11:30:36 2023 +0200 CAMEL-19579 - Manage commons-lang3 to build and test with a single deterministic version --- components/camel-aws/camel-aws-xray/pom.xml| 1 - components/camel-azure/camel-azure-cosmosdb/pom.xml| 1 - components/camel-azure/camel-azure-eventhubs/pom.xml | 1 - components/camel-azure/camel-azure-files/pom.xml | 8 +--- components/camel-azure/camel-azure-key-vault/pom.xml | 6 -- components/camel-azure/camel-azure-servicebus/pom.xml | 6 -- components/camel-azure/camel-azure-storage-blob/pom.xml| 1 - components/camel-azure/camel-azure-storage-datalake/pom.xml| 1 - components/camel-azure/camel-azure-storage-queue/pom.xml | 1 - components/camel-cxf/camel-cxf-rest/pom.xml| 7 --- components/camel-cxf/camel-cxf-spring-rest/pom.xml | 7 --- components/camel-cxf/camel-cxf-spring-soap/pom.xml | 7 --- components/camel-dhis2/camel-dhis2-component/pom.xml | 5 + components/camel-dhis2/pom.xml | 6 -- components/camel-grape/pom.xml | 1 - components/camel-hashicorp-vault/pom.xml | 8 +--- components/camel-huawei/camel-huaweicloud-smn/pom.xml | 10 -- components/camel-ironmq/pom.xml| 5 - components/camel-jt400/pom.xml | 5 - components/camel-kafka/pom.xml | 7 --- components/camel-mongodb/pom.xml | 1 - components/camel-olingo2/camel-olingo2-component/pom.xml | 1 - components/camel-olingo4/camel-olingo4-component/pom.xml | 5 - components/camel-pdf/pom.xml | 1 - components/camel-salesforce/camel-salesforce-codegen/pom.xml | 5 - components/camel-salesforce/camel-salesforce-component/pom.xml | 1 - components/camel-spring-batch/pom.xml | 1 - components/camel-stitch/pom.xml| 6 -- components/camel-telegram/pom.xml | 1 - parent/pom.xml | 6 ++ tooling/openapi-rest-dsl-generator/pom.xml | 1 - 31 files changed, 17 insertions(+), 106 deletions(-) diff --git a/components/camel-aws/camel-aws-xray/pom.xml b/components/camel-aws/camel-aws-xray/pom.xml index 4ef0eb7f07c..e917759853f 100644 --- a/components/camel-aws/camel-aws-xray/pom.xml +++ b/components/camel-aws/camel-aws-xray/pom.xml @@ -96,7 +96,6 @@ org.apache.commons commons-lang3 -${commons-lang3-version} test diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml b/components/camel-azure/camel-azure-cosmosdb/pom.xml index 52b95d63714..dafe3491ba5 100644 --- a/components/camel-azure/camel-azure-cosmosdb/pom.xml +++ b/components/camel-azure/camel-azure-cosmosdb/pom.xml @@ -79,7 +79,6 @@ org.apache.commons commons-lang3 -${commons-lang3-version} test diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml b/components/camel-azure/camel-azure-eventhubs/pom.xml index 23c2a265e7c..be4a868c784 100644 --- a/components/camel-azure/camel-azure-eventhubs/pom.xml +++ b/components/camel-azure/camel-azure-eventhubs/pom.xml @@ -83,7 +83,6 @@ org.apache.commons commons-lang3 -${commons-lang3-version} test diff --git a/components/camel-azure/camel-azure-files/pom.xml b/components/camel-azure/camel-azure-files/pom.xml index 10e3056356a..448a8468a2f 100644 --- a/components/camel-azure/camel-azure-files/pom.xml +++ b/components/camel-azure/camel-azure-files/pom.xml @@ -20,7 +20,7 @@ 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/maven-v4_0_0.xsd;> 4.0.0 - + org.apache.camel camel-azure-parent 4.0.0-SNAPSHOT @@ -55,12 +55,6 @@ ${mockito-version} test - -org.apache.commons -commons-lang3 -${commons-lang3-version} -test - org.awaitility awaitility diff --git a/components/camel-azure/camel-azure-key-vault/pom.xml b/components/camel-azure/camel-azure-key-vault/pom.xml inde
[camel] 03/04: Reformat components/camel-azure/pom.xml
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 commit 1fa64174f548a7395b5489378a8b640107265311 Author: Peter Palaga AuthorDate: Wed Jul 5 10:33:10 2023 +0200 Reformat components/camel-azure/pom.xml --- components/camel-azure/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-azure/pom.xml b/components/camel-azure/pom.xml index 31cf3313e18..c6d42ea57f0 100644 --- a/components/camel-azure/pom.xml +++ b/components/camel-azure/pom.xml @@ -51,8 +51,8 @@ camel-azure-storage-queue camel-azure-cosmosdb camel-azure-servicebus - camel-azure-key-vault - camel-azure-files +camel-azure-key-vault +camel-azure-files
[camel] 01/04: Use properties for Maven plugin versions
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 commit a232bb5ed7d73028fa0d1b7a822347a9d0b8d97d Author: Peter Palaga AuthorDate: Wed Jul 5 10:05:27 2023 +0200 Use properties for Maven plugin versions --- pom.xml | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4feca088b94..13956d2059f 100644 --- a/pom.xml +++ b/pom.xml @@ -118,18 +118,20 @@ 1980-01-01T00:00:02Z -3.4.2 2.7.9 1.5.0 2.1.0 4.2 +3.4.2 3.11.0 3.6.0 3.3.0 3.6.0 3.5.0 +3.0.1 3.1.0 3.1.2 +2.16.0 ${maven-surefire-plugin-version} @@ -541,7 +543,7 @@ org.apache.maven.plugins maven-release-plugin -3.0.1 +${maven-release-plugin-version} true true @@ -558,7 +560,7 @@ org.codehaus.mojo versions-maven-plugin -2.16.0 +${versions-maven-plugin-version}
[camel] 02/04: surefire.version property is not needed anymore because we do not inherit from org.apache:apache anywhere else than in org.apache.camel:camel
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 commit ee9dfe5637a6b8751d5e64ea576d744ba6124bfb Author: Peter Palaga AuthorDate: Wed Jul 5 10:07:21 2023 +0200 surefire.version property is not needed anymore because we do not inherit from org.apache:apache anywhere else than in org.apache.camel:camel --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 13956d2059f..20920cb1f0b 100644 --- a/pom.xml +++ b/pom.xml @@ -132,8 +132,6 @@ 3.1.0 3.1.2 2.16.0 - -${maven-surefire-plugin-version} 4.0.1 4.0.1
[camel] branch CAMEL-19573 deleted (was 4b7bdc56de3)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch CAMEL-19573 in repository https://gitbox.apache.org/repos/asf/camel.git was 4b7bdc56de3 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard 4b7bdc56de3 [maven-release-plugin] prepare for next development iteration discard f4f6a58e889 [maven-release-plugin] prepare release camel-4.0.0-test discard 5fad8c13065 remove some modules for the sake of testing
[camel] annotated tag camel-4.0.0-test deleted (was 29ff3b89bb1)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to annotated tag camel-4.0.0-test in repository https://gitbox.apache.org/repos/asf/camel.git *** WARNING: tag camel-4.0.0-test was deleted! *** tag was 29ff3b89bb1 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: CAMEL-19573 - Stop syncing version properties in git, generate the effective camel-dependencies during the build
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 351f7153fcc CAMEL-19573 - Stop syncing version properties in git, generate the effective camel-dependencies during the build 351f7153fcc is described below commit 351f7153fcca48213e66ae9eb2e4534fbd986464 Author: Peter Palaga AuthorDate: Tue Jul 4 14:22:13 2023 +0200 CAMEL-19573 - Stop syncing version properties in git, generate the effective camel-dependencies during the build --- camel-dependencies/pom.xml | 496 ++--- catalog/camel-catalog/pom.xml | 26 -- pom.xml| 4 +- .../maven/sync/properties/SyncPropertiesMojo.java | 32 +- .../main/resources/camel-dependencies-template.xml | 37 +- 5 files changed, 74 insertions(+), 521 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index e8cb485e847..3e8b81f994c 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -22,474 +22,52 @@ 4.0.0 -org.apache -apache -25 - +org.apache.camel +camel-parent +4.0.0-SNAPSHOT +../parent -org.apache.camel camel-dependencies -4.0.0-SNAPSHOT pom Camel :: Dependencies Camel Dependencies POM - -1.1.3 -2.28.0 -5.18.1 -2.0.2 -1.21.1 -2.0.0.AM26 -1.1.27 -6.20.0 -4.11.0 -1.8.0 -8.0.1 -1.14.0 -3.24.2 -3.37.0 -2.5.2 -3.0.0 -3.0.3 -1.11.1 -1.11.1 -1.11.1 -4.2.0 -2.20.98 -2.14.0 -1.2.14 -1.2.14 - 12.0.0-beta.18 -1.74 -2.58.0 -3.24.0 - 3.4.0 -0.9.5.5 -3.1.6 -2.7.4 -2.7.2 -4.16.0 -3.2.12 -3.6.2 -4.8.157 -2.7 -7.0.9 -7.0.9 -1.9.4 -1.4 -1.16.0 -3.2.2 -4.4 -1.21 -1.9 -2.8.0 -1.8 -1.4 -2.9.0 -1.3 -2.13.0 -2.6 -3.12.0 -1.2 -3.6.1 -3.9.0 -2.11.1 -1.10.0 -1.7 -1.1 -1.5.3 -4.10 -3.4.7 -5.4.0 -4.0.2 -4.0.2 -4.0.0 -4.0.0 -2.5.2-jakarta4 - 8.0.33 -2.3.0.Final -1.4.0 -10.14.2.0 -2.17 -0.18.0 -3.4.4 -1.8.0 -1.9.1 -2.4.1 -0.21.0 -3.5.2 -3.3.1 -5.4.5 -0.3.0 -2.1.5 -3.10.8 - 8.8.1 - 8.8.1 -3.1.0 -2.4.13 -2.0.34 -3.0.5 -4.0.5 -1.17.1 -2.8 -2.21.0 -2.3.32 -1.1.2 - 1.1.1 - 1.0 - 1.0 -1.0.1 - 1.0 - 1.0 - 2.0.0 -1.1 - 1.1 -1.0 -1.0 -4.0.1 -2.1.0 -1.35.2 - v3-rev20211229-1.32.1 - v2-rev20220110-1.32.1 - v1-rev20211108-1.32.1 - v4-rev20210629-1.32.1 - 1.7.0 -26.1.6 - 2.2.0 - 1.62.0 - 2.2.0 -2.2.0 -1.34.0 -22.3.2 -18.4 -2.0.0 -2.4.4 - 1.5.3 -4.3.0 - 2.0.59.Final -1.56.0 -2.10.1 -32.0.1-jre -3.0 -3.3.6 -2.2 -2.3 -6.4.2 -2.3 -5.3.1 -2.1.11 -8.0.0.Final -5.6.15.Final -2.6.1 -2.7.1 -4.1.5 -5.1.4 -4.5.14 -5.2.2 -4.4.16 -1.7 -3.23.3.1 -3.1.45 -1.0.7 -73.1 -2.15.0 -1.9.0 -14.0.11.Final - 6.8.0 -2.22 -1.10 -3.0.5 -2.5.1 -2.21.16 -1.0.0-preview.20230409 -2.15.1 -2.15.2 -2.14.3 -2.1.1 -2.1.1 -2.1.5 - 5.0.1 -5.0.0 - 4.0.1 -2.0.1 -3.1.0 -2.1.1 -3.0.0 -3.0.0 - 3.1.0 -6.0.0 - 2.0.1 -4.0.0 -3.0.0 -4.0.0 -3.0.3 -3.1.1 -2.4.0 -0.12 -1.9.3 -0.1.9 -2.0.0 -3.0.1 -0.22 -3.13.10 -1.11.1 -3.28.0-GA -3.0.0 -3.1.0 -1.4.5 - 2.0.0.Final -3.4.3.Final -1.4.10.Final -3.3.8.Final -1.1.1 -1.72 -2.0 -4.4.2 -0.7.5 -1.5.4 -${jetty-version} -11.0.15
[camel] branch CAMEL-19573 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch CAMEL-19573 in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/CAMEL-19573 by this push: new 4b7bdc56de3 [maven-release-plugin] prepare for next development iteration 4b7bdc56de3 is described below commit 4b7bdc56de384214c0d190da9bfc771c55a00083 Author: Peter Palaga AuthorDate: Tue Jul 4 22:30:51 2023 +0200 [maven-release-plugin] prepare for next development iteration --- buildingtools/pom.xml | 2 +- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml| 6 +++--- tooling/camel-tooling-util/pom.xml | 2 +- tooling/maven/pom.xml | 2 +- tooling/maven/sync-properties-maven-plugin/pom.xml | 2 +- tooling/parent/pom.xml | 2 +- tooling/pom.xml| 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml index dc23654e435..b99b53b9e23 100644 --- a/buildingtools/pom.xml +++ b/buildingtools/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel -4.0.0-test +4.0.1-test-SNAPSHOT camel-buildtools diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 49478cc6513..9051cd5dafd 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-parent -4.0.0-test +4.0.1-test-SNAPSHOT ../parent diff --git a/parent/pom.xml b/parent/pom.xml index ca6173e61f0..c02b48544e3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel -4.0.0-test +4.0.1-test-SNAPSHOT camel-parent diff --git a/pom.xml b/pom.xml index dd15e4b7918..4b89c05a3c3 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.camel camel -4.0.0-test +4.0.1-test-SNAPSHOT pom Camel @@ -78,7 +78,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel.git scm:git:https://gitbox.apache.org/repos/asf/camel.git https://gitbox.apache.org/repos/asf?p=camel.git;a=summary -camel-4.0.0-test +HEAD jira @@ -106,7 +106,7 @@ ${jdk.version} - 2023-07-04T20:30:16Z + 2023-07-04T20:30:51Z 3.4.2 1.5.0 diff --git a/tooling/camel-tooling-util/pom.xml b/tooling/camel-tooling-util/pom.xml index 8e1e88ba2b3..288aa6ef626 100644 --- a/tooling/camel-tooling-util/pom.xml +++ b/tooling/camel-tooling-util/pom.xml @@ -23,7 +23,7 @@ org.apache.camel tooling -4.0.0-test +4.0.1-test-SNAPSHOT camel-tooling-util diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index c63660c47da..4936a70da35 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -23,7 +23,7 @@ org.apache.camel tooling-parent -4.0.0-test +4.0.1-test-SNAPSHOT ../parent diff --git a/tooling/maven/sync-properties-maven-plugin/pom.xml b/tooling/maven/sync-properties-maven-plugin/pom.xml index 75e15ea92e0..3ff2eac4b2b 100644 --- a/tooling/maven/sync-properties-maven-plugin/pom.xml +++ b/tooling/maven/sync-properties-maven-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.camel maven-plugins -4.0.0-test +4.0.1-test-SNAPSHOT sync-properties-maven-plugin diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml index c20b323785e..282f219e729 100644 --- a/tooling/parent/pom.xml +++ b/tooling/parent/pom.xml @@ -23,7 +23,7 @@ org.apache.camel tooling -4.0.0-test +4.0.1-test-SNAPSHOT tooling-parent diff --git a/tooling/pom.xml b/tooling/pom.xml index 5276c68afaa..f0cc86bccfe 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-parent -4.0.0-test +4.0.1-test-SNAPSHOT ../parent
[camel] annotated tag camel-4.0.0-test created (now 29ff3b89bb1)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to annotated tag camel-4.0.0-test in repository https://gitbox.apache.org/repos/asf/camel.git at 29ff3b89bb1 (tag) tagging f4f6a58e889f3d384ffb66c433ad4ce6379da9ab (commit) replaces camel-4.0.0-RC1 by Peter Palaga on Tue Jul 4 22:30:42 2023 +0200 - Log - [maven-release-plugin] copy for tag camel-4.0.0-test --- No new revisions were added by this update.
[camel] branch CAMEL-19573 updated: [maven-release-plugin] prepare release camel-4.0.0-test
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch CAMEL-19573 in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/CAMEL-19573 by this push: new f4f6a58e889 [maven-release-plugin] prepare release camel-4.0.0-test f4f6a58e889 is described below commit f4f6a58e889f3d384ffb66c433ad4ce6379da9ab Author: Peter Palaga AuthorDate: Tue Jul 4 22:30:33 2023 +0200 [maven-release-plugin] prepare release camel-4.0.0-test --- buildingtools/pom.xml | 2 +- camel-dependencies/pom.xml | 5 ++--- parent/pom.xml | 6 +++--- pom.xml| 6 +++--- tooling/camel-tooling-util/pom.xml | 2 +- tooling/maven/pom.xml | 2 +- tooling/maven/sync-properties-maven-plugin/pom.xml | 2 +- tooling/parent/pom.xml | 2 +- tooling/pom.xml| 2 +- 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml index 4a672cdf5cc..dc23654e435 100644 --- a/buildingtools/pom.xml +++ b/buildingtools/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel -4.0.0-SNAPSHOT +4.0.0-test camel-buildtools diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 3e8b81f994c..49478cc6513 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -17,14 +17,13 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns="http://maven.apache.org/POM/4.0.0; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;> +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 camel-parent -4.0.0-SNAPSHOT +4.0.0-test ../parent diff --git a/parent/pom.xml b/parent/pom.xml index b434583fb25..ca6173e61f0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel -4.0.0-SNAPSHOT +4.0.0-test camel-parent @@ -44,8 +44,8 @@ 600 false - - + + 1.1.3 diff --git a/pom.xml b/pom.xml index 05f954d8297..dd15e4b7918 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.camel camel -4.0.0-SNAPSHOT +4.0.0-test pom Camel @@ -78,7 +78,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel.git scm:git:https://gitbox.apache.org/repos/asf/camel.git https://gitbox.apache.org/repos/asf?p=camel.git;a=summary -HEAD +camel-4.0.0-test jira @@ -106,7 +106,7 @@ ${jdk.version} - 1980-01-01T00:00:02Z + 2023-07-04T20:30:16Z 3.4.2 1.5.0 diff --git a/tooling/camel-tooling-util/pom.xml b/tooling/camel-tooling-util/pom.xml index 72dae03888c..8e1e88ba2b3 100644 --- a/tooling/camel-tooling-util/pom.xml +++ b/tooling/camel-tooling-util/pom.xml @@ -23,7 +23,7 @@ org.apache.camel tooling -4.0.0-SNAPSHOT +4.0.0-test camel-tooling-util diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index 275dbfa1a7c..c63660c47da 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -23,7 +23,7 @@ org.apache.camel tooling-parent -4.0.0-SNAPSHOT +4.0.0-test ../parent diff --git a/tooling/maven/sync-properties-maven-plugin/pom.xml b/tooling/maven/sync-properties-maven-plugin/pom.xml index e3838aa1922..75e15ea92e0 100644 --- a/tooling/maven/sync-properties-maven-plugin/pom.xml +++ b/tooling/maven/sync-properties-maven-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.camel maven-plugins -4.0.0-SNAPSHOT +4.0.0-test sync-properties-maven-plugin diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml index fa033106956..c20b323785e 100644 --- a/tooling/parent/pom.xml +++ b/tooling/parent/pom.xml @@ -23,7 +23,7 @@ org.apache.camel tooling -4.0.0-SNAPSHOT +4.0.0-test tooling-parent diff --git a/tooling/pom.xml b/tooling/pom.xml index 3ec749aefbe..5276c68afaa 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-parent -4.0.0-SNAPSHOT +4.0.0-test ../parent
[camel] 01/01: remove some modules for the sake of testing
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch CAMEL-19573 in repository https://gitbox.apache.org/repos/asf/camel.git commit 5fad8c13065fa0fbb992cb4211bf2e7167f691fe Author: Peter Palaga AuthorDate: Tue Jul 4 22:05:23 2023 +0200 remove some modules for the sake of testing --- pom.xml| 11 +--- release.properties | 31 ++ tooling/maven/pom.xml | 7 - tooling/maven/sync-properties-maven-plugin/pom.xml | 4 --- .../maven/sync/properties/SyncPropertiesMojo.java | 15 +-- tooling/pom.xml| 5 6 files changed, 45 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index f82a4b6b397..05f954d8297 100644 --- a/pom.xml +++ b/pom.xml @@ -69,19 +69,9 @@ parent -etc -bom buildingtools tooling -core -test-infra -components -catalog camel-dependencies -dsl -archetypes -tests -docs @@ -118,6 +108,7 @@ 1980-01-01T00:00:02Z +3.4.2 1.5.0 3.6.0 3.11.0 diff --git a/release.properties b/release.properties new file mode 100644 index 000..0ab6040c271 --- /dev/null +++ b/release.properties @@ -0,0 +1,31 @@ +#release configuration +#Tue Jul 04 22:20:26 CEST 2023 +projectVersionPolicyId=default +project.scm.org.apache.camel\:camel-parent.empty=true +project.scm.org.apache.camel\:sync-properties-maven-plugin.empty=true +scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel} +pinExternals=false +projectVersionPolicyConfig=${projectVersionPolicyConfig}\n +pushChanges=true +project.scm.org.apache.camel\:maven-plugins.empty=true +project.scm.org.apache.camel\:camel.url=https\://gitbox.apache.org/repos/asf?p\=camel.git;a\=summary +project.scm.org.apache.camel\:camel-tooling-util.empty=true +project.scm.org.apache.camel\:camel-dependencies.empty=true +scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel} +remoteTagging=true +scm.commentPrefix=[maven-release-plugin] +releaseStrategyId=default +project.scm.org.apache.camel\:camel.connection=scm\:git\:http\://gitbox.apache.org/repos/asf/camel.git +project.scm.org.apache.camel\:tooling.empty=true +completedPhase=scm-check-modifications +scm.url=scm\:git\:https\://gitbox.apache.org/repos/asf/camel.git +scm.developmentCommitComment=@{prefix} prepare for next development iteration +project.scm.org.apache.camel\:camel.tag=HEAD +scm.tagNameFormat=@{project.artifactId}-@{project.version} +exec.additionalArguments=-Prelease,sourcecheck,hibernate +project.scm.org.apache.camel\:camel.developerConnection=scm\:git\:https\://gitbox.apache.org/repos/asf/camel.git +project.scm.org.apache.camel\:tooling-parent.empty=true +exec.snapshotReleasePluginAllowed=false +preparationGoals=clean install +exec.pomFileName=pom.xml +scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel} diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index 481371a154e..275dbfa1a7c 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -34,14 +34,7 @@ Camel Maven Plugins -camel-package-maven-plugin -camel-maven-plugin -camel-eip-documentation-enricher-maven-plugin -camel-api-component-maven-plugin -bom-generator-maven-plugin -camel-restdsl-openapi-plugin sync-properties-maven-plugin -camel-component-maven-plugin diff --git a/tooling/maven/sync-properties-maven-plugin/pom.xml b/tooling/maven/sync-properties-maven-plugin/pom.xml index a7ada0d0047..e3838aa1922 100644 --- a/tooling/maven/sync-properties-maven-plugin/pom.xml +++ b/tooling/maven/sync-properties-maven-plugin/pom.xml @@ -44,10 +44,6 @@ - -org.apache.camel -camel-util - org.apache.camel camel-tooling-util 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 04af5bdb7a5..f2140d156d9 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 @@ -31,7 +31,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.camel.tooling.util.FileUtil; -import org.apache.camel.util.IOHelper; import org.apache.maven.model.Model; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -145,7 +144,7
[camel] branch CAMEL-19573 updated (a5d73086d6d -> 5fad8c13065)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch CAMEL-19573 in repository https://gitbox.apache.org/repos/asf/camel.git discard a5d73086d6d remove some modules for the sake of testing new 5fad8c13065 remove some modules for the sake of testing 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 (a5d73086d6d) \ N -- N -- N refs/heads/CAMEL-19573 (5fad8c13065) 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 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. Summary of changes: pom.xml | 1 + 1 file changed, 1 insertion(+)
[camel] branch CAMEL-19573 updated (e8798e8238e -> a5d73086d6d)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch CAMEL-19573 in repository https://gitbox.apache.org/repos/asf/camel.git discard e8798e8238e [maven-release-plugin] prepare for next development iteration discard c12a903ca72 [maven-release-plugin] prepare release camel-4.0.0-test This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/CAMEL-19573 (a5d73086d6d) \ O -- O -- O (e8798e8238e) 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: buildingtools/pom.xml | 2 +- camel-dependencies/pom.xml | 5 +++-- parent/pom.xml | 6 +++--- pom.xml| 4 ++-- tooling/camel-tooling-util/pom.xml | 2 +- tooling/maven/pom.xml | 2 +- tooling/maven/sync-properties-maven-plugin/pom.xml | 2 +- tooling/parent/pom.xml | 2 +- tooling/pom.xml| 2 +- 9 files changed, 14 insertions(+), 13 deletions(-)
[camel] annotated tag camel-4.0.0-test deleted (was 20ad55b11f0)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to annotated tag camel-4.0.0-test in repository https://gitbox.apache.org/repos/asf/camel.git *** WARNING: tag camel-4.0.0-test was deleted! *** tag was 20ad55b11f0 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch CAMEL-19573 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch CAMEL-19573 in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/CAMEL-19573 by this push: new e8798e8238e [maven-release-plugin] prepare for next development iteration e8798e8238e is described below commit e8798e8238e584e61ea980634e419e3a413d8867 Author: Peter Palaga AuthorDate: Tue Jul 4 22:24:33 2023 +0200 [maven-release-plugin] prepare for next development iteration --- buildingtools/pom.xml | 2 +- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml| 6 +++--- tooling/camel-tooling-util/pom.xml | 2 +- tooling/maven/pom.xml | 2 +- tooling/maven/sync-properties-maven-plugin/pom.xml | 2 +- tooling/parent/pom.xml | 2 +- tooling/pom.xml| 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml index dc23654e435..b99b53b9e23 100644 --- a/buildingtools/pom.xml +++ b/buildingtools/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel -4.0.0-test +4.0.1-test-SNAPSHOT camel-buildtools diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 49478cc6513..9051cd5dafd 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-parent -4.0.0-test +4.0.1-test-SNAPSHOT ../parent diff --git a/parent/pom.xml b/parent/pom.xml index ca6173e61f0..c02b48544e3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel -4.0.0-test +4.0.1-test-SNAPSHOT camel-parent diff --git a/pom.xml b/pom.xml index 5dcabd92f84..d604a71250a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.camel camel -4.0.0-test +4.0.1-test-SNAPSHOT pom Camel @@ -78,7 +78,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel.git scm:git:https://gitbox.apache.org/repos/asf/camel.git https://gitbox.apache.org/repos/asf?p=camel.git;a=summary -camel-4.0.0-test +HEAD jira @@ -106,7 +106,7 @@ ${jdk.version} - 2023-07-04T20:23:56Z + 2023-07-04T20:24:33Z 1.5.0 3.6.0 diff --git a/tooling/camel-tooling-util/pom.xml b/tooling/camel-tooling-util/pom.xml index 8e1e88ba2b3..288aa6ef626 100644 --- a/tooling/camel-tooling-util/pom.xml +++ b/tooling/camel-tooling-util/pom.xml @@ -23,7 +23,7 @@ org.apache.camel tooling -4.0.0-test +4.0.1-test-SNAPSHOT camel-tooling-util diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index c63660c47da..4936a70da35 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -23,7 +23,7 @@ org.apache.camel tooling-parent -4.0.0-test +4.0.1-test-SNAPSHOT ../parent diff --git a/tooling/maven/sync-properties-maven-plugin/pom.xml b/tooling/maven/sync-properties-maven-plugin/pom.xml index 75e15ea92e0..3ff2eac4b2b 100644 --- a/tooling/maven/sync-properties-maven-plugin/pom.xml +++ b/tooling/maven/sync-properties-maven-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.camel maven-plugins -4.0.0-test +4.0.1-test-SNAPSHOT sync-properties-maven-plugin diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml index c20b323785e..282f219e729 100644 --- a/tooling/parent/pom.xml +++ b/tooling/parent/pom.xml @@ -23,7 +23,7 @@ org.apache.camel tooling -4.0.0-test +4.0.1-test-SNAPSHOT tooling-parent diff --git a/tooling/pom.xml b/tooling/pom.xml index 5276c68afaa..f0cc86bccfe 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-parent -4.0.0-test +4.0.1-test-SNAPSHOT ../parent
[camel] annotated tag camel-4.0.0-test created (now 20ad55b11f0)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to annotated tag camel-4.0.0-test in repository https://gitbox.apache.org/repos/asf/camel.git at 20ad55b11f0 (tag) tagging c12a903ca72e1dc46f370da8bccb34cd7acc7b10 (commit) replaces camel-4.0.0-RC1 by Peter Palaga on Tue Jul 4 22:24:24 2023 +0200 - Log - [maven-release-plugin] copy for tag camel-4.0.0-test --- No new revisions were added by this update.
[camel] 01/02: remove some modules for the sake of testing
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch CAMEL-19573 in repository https://gitbox.apache.org/repos/asf/camel.git commit a5d73086d6d9233dd392fabd6678e61f1919327f Author: Peter Palaga AuthorDate: Tue Jul 4 22:05:23 2023 +0200 remove some modules for the sake of testing --- pom.xml| 10 --- release.properties | 31 ++ tooling/maven/pom.xml | 7 - tooling/maven/sync-properties-maven-plugin/pom.xml | 4 --- .../maven/sync/properties/SyncPropertiesMojo.java | 15 +-- tooling/pom.xml| 5 6 files changed, 44 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index f82a4b6b397..f61235cb55e 100644 --- a/pom.xml +++ b/pom.xml @@ -69,19 +69,9 @@ parent -etc -bom buildingtools tooling -core -test-infra -components -catalog camel-dependencies -dsl -archetypes -tests -docs diff --git a/release.properties b/release.properties new file mode 100644 index 000..0ab6040c271 --- /dev/null +++ b/release.properties @@ -0,0 +1,31 @@ +#release configuration +#Tue Jul 04 22:20:26 CEST 2023 +projectVersionPolicyId=default +project.scm.org.apache.camel\:camel-parent.empty=true +project.scm.org.apache.camel\:sync-properties-maven-plugin.empty=true +scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel} +pinExternals=false +projectVersionPolicyConfig=${projectVersionPolicyConfig}\n +pushChanges=true +project.scm.org.apache.camel\:maven-plugins.empty=true +project.scm.org.apache.camel\:camel.url=https\://gitbox.apache.org/repos/asf?p\=camel.git;a\=summary +project.scm.org.apache.camel\:camel-tooling-util.empty=true +project.scm.org.apache.camel\:camel-dependencies.empty=true +scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel} +remoteTagging=true +scm.commentPrefix=[maven-release-plugin] +releaseStrategyId=default +project.scm.org.apache.camel\:camel.connection=scm\:git\:http\://gitbox.apache.org/repos/asf/camel.git +project.scm.org.apache.camel\:tooling.empty=true +completedPhase=scm-check-modifications +scm.url=scm\:git\:https\://gitbox.apache.org/repos/asf/camel.git +scm.developmentCommitComment=@{prefix} prepare for next development iteration +project.scm.org.apache.camel\:camel.tag=HEAD +scm.tagNameFormat=@{project.artifactId}-@{project.version} +exec.additionalArguments=-Prelease,sourcecheck,hibernate +project.scm.org.apache.camel\:camel.developerConnection=scm\:git\:https\://gitbox.apache.org/repos/asf/camel.git +project.scm.org.apache.camel\:tooling-parent.empty=true +exec.snapshotReleasePluginAllowed=false +preparationGoals=clean install +exec.pomFileName=pom.xml +scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel} diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index 481371a154e..275dbfa1a7c 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -34,14 +34,7 @@ Camel Maven Plugins -camel-package-maven-plugin -camel-maven-plugin -camel-eip-documentation-enricher-maven-plugin -camel-api-component-maven-plugin -bom-generator-maven-plugin -camel-restdsl-openapi-plugin sync-properties-maven-plugin -camel-component-maven-plugin diff --git a/tooling/maven/sync-properties-maven-plugin/pom.xml b/tooling/maven/sync-properties-maven-plugin/pom.xml index a7ada0d0047..e3838aa1922 100644 --- a/tooling/maven/sync-properties-maven-plugin/pom.xml +++ b/tooling/maven/sync-properties-maven-plugin/pom.xml @@ -44,10 +44,6 @@ - -org.apache.camel -camel-util - org.apache.camel camel-tooling-util 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 04af5bdb7a5..f2140d156d9 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 @@ -31,7 +31,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.camel.tooling.util.FileUtil; -import org.apache.camel.util.IOHelper; import org.apache.maven.model.Model; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -145,7 +144,7 @@ public class SyncPropertiesMojo extends AbstractMojo { final String template; try (InputStream
[camel] branch CAMEL-19573 created (now c12a903ca72)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch CAMEL-19573 in repository https://gitbox.apache.org/repos/asf/camel.git at c12a903ca72 [maven-release-plugin] prepare release camel-4.0.0-test This branch includes the following new commits: new a5d73086d6d remove some modules for the sake of testing new c12a903ca72 [maven-release-plugin] prepare release camel-4.0.0-test 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] 02/02: [maven-release-plugin] prepare release camel-4.0.0-test
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch CAMEL-19573 in repository https://gitbox.apache.org/repos/asf/camel.git commit c12a903ca72e1dc46f370da8bccb34cd7acc7b10 Author: Peter Palaga AuthorDate: Tue Jul 4 22:24:12 2023 +0200 [maven-release-plugin] prepare release camel-4.0.0-test --- buildingtools/pom.xml | 2 +- camel-dependencies/pom.xml | 5 ++--- parent/pom.xml | 6 +++--- pom.xml| 6 +++--- tooling/camel-tooling-util/pom.xml | 2 +- tooling/maven/pom.xml | 2 +- tooling/maven/sync-properties-maven-plugin/pom.xml | 2 +- tooling/parent/pom.xml | 2 +- tooling/pom.xml| 2 +- 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml index 4a672cdf5cc..dc23654e435 100644 --- a/buildingtools/pom.xml +++ b/buildingtools/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel -4.0.0-SNAPSHOT +4.0.0-test camel-buildtools diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 3e8b81f994c..49478cc6513 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -17,14 +17,13 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns="http://maven.apache.org/POM/4.0.0; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;> +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 camel-parent -4.0.0-SNAPSHOT +4.0.0-test ../parent diff --git a/parent/pom.xml b/parent/pom.xml index b434583fb25..ca6173e61f0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel -4.0.0-SNAPSHOT +4.0.0-test camel-parent @@ -44,8 +44,8 @@ 600 false - - + + 1.1.3 diff --git a/pom.xml b/pom.xml index f61235cb55e..5dcabd92f84 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.camel camel -4.0.0-SNAPSHOT +4.0.0-test pom Camel @@ -78,7 +78,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel.git scm:git:https://gitbox.apache.org/repos/asf/camel.git https://gitbox.apache.org/repos/asf?p=camel.git;a=summary -HEAD +camel-4.0.0-test jira @@ -106,7 +106,7 @@ ${jdk.version} - 1980-01-01T00:00:02Z + 2023-07-04T20:23:56Z 1.5.0 3.6.0 diff --git a/tooling/camel-tooling-util/pom.xml b/tooling/camel-tooling-util/pom.xml index 72dae03888c..8e1e88ba2b3 100644 --- a/tooling/camel-tooling-util/pom.xml +++ b/tooling/camel-tooling-util/pom.xml @@ -23,7 +23,7 @@ org.apache.camel tooling -4.0.0-SNAPSHOT +4.0.0-test camel-tooling-util diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index 275dbfa1a7c..c63660c47da 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -23,7 +23,7 @@ org.apache.camel tooling-parent -4.0.0-SNAPSHOT +4.0.0-test ../parent diff --git a/tooling/maven/sync-properties-maven-plugin/pom.xml b/tooling/maven/sync-properties-maven-plugin/pom.xml index e3838aa1922..75e15ea92e0 100644 --- a/tooling/maven/sync-properties-maven-plugin/pom.xml +++ b/tooling/maven/sync-properties-maven-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.camel maven-plugins -4.0.0-SNAPSHOT +4.0.0-test sync-properties-maven-plugin diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml index fa033106956..c20b323785e 100644 --- a/tooling/parent/pom.xml +++ b/tooling/parent/pom.xml @@ -23,7 +23,7 @@ org.apache.camel tooling -4.0.0-SNAPSHOT +4.0.0-test tooling-parent diff --git a/tooling/pom.xml b/tooling/pom.xml index 3ec749aefbe..5276c68afaa 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-parent -4.0.0-SNAPSHOT +4.0.0-test ../parent
[camel] branch main updated: Fixup ae4213b Add .sdkmanrc to select the recommended Maven and Java versions if the user uses SDKMAN
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 8be2cba1ffa Fixup ae4213b Add .sdkmanrc to select the recommended Maven and Java versions if the user uses SDKMAN 8be2cba1ffa is described below commit 8be2cba1ffa6072ba867c825b595096a4b2d5206 Author: Peter Palaga AuthorDate: Tue Jul 4 14:27:16 2023 +0200 Fixup ae4213b Add .sdkmanrc to select the recommended Maven and Java versions if the user uses SDKMAN --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 67809de135c..dfb47716626 100644 --- a/pom.xml +++ b/pom.xml @@ -350,6 +350,7 @@ **/yarn.lock **/zkserver*.conf .mvn/** +.sdkmanrc KEYS camel-sbom/*.xml doap.rdf
[camel] branch main updated (1af7e7b45f7 -> ae4213b73dd)
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 1af7e7b45f7 Upgrade Cassandra Driver to version 4.16.0 new bfdcaf6c9e8 Instruct Maven Wrapper to use Maven 3.9.3 new ae4213b73dd Add .sdkmanrc to select the recommended Maven and Java versions if the user uses SDKMAN 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: .mvn/wrapper/maven-wrapper.properties | 2 +- .sdkmanrc | 4 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .sdkmanrc
[camel] 02/02: Add .sdkmanrc to select the recommended Maven and Java versions if the user uses SDKMAN
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 commit ae4213b73dd909921e95aefe95036600ff4e55db Author: Peter Palaga AuthorDate: Tue Jul 4 12:18:44 2023 +0200 Add .sdkmanrc to select the recommended Maven and Java versions if the user uses SDKMAN --- .sdkmanrc | 4 1 file changed, 4 insertions(+) diff --git a/.sdkmanrc b/.sdkmanrc new file mode 100644 index 000..f5b36ed0d37 --- /dev/null +++ b/.sdkmanrc @@ -0,0 +1,4 @@ +# Enable auto-env through the sdkman_auto_env config +# Add key=value pairs of SDKs to use below +java=17.0.7-tem +maven=3.9.3
[camel] 01/02: Instruct Maven Wrapper to use Maven 3.9.3
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 commit bfdcaf6c9e831f2cdb809293dce77af3533042d6 Author: Peter Palaga AuthorDate: Tue Jul 4 12:14:20 2023 +0200 Instruct Maven Wrapper to use Maven 3.9.3 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 3c6fda8c6e4..6d3a56651da 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
[camel-quarkus] annotated tag 3.0.0-RC1 created (now 3619f489a6)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to annotated tag 3.0.0-RC1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 3619f489a6 (tag) tagging 9c0e04c6ebe214c46264abc1010d5b606ad6b394 (commit) replaces 1.0.0-CR3 by Peter Palaga on Tue Jul 4 09:07:20 2023 +0200 - Log - [maven-release-plugin] copy for tag 3.0.0-RC1 --- No new revisions were added by this update.
[camel-quarkus] branch 3.0.0-RC1.x created (now 9c0e04c6eb)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch 3.0.0-RC1.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 9c0e04c6eb [maven-release-plugin] Prepare release 3.0.0-RC1 This branch includes the following new commits: new 4251ad602a Fix quarkiverse-micrometer.version Maven repository link new 9c0e04c6eb [maven-release-plugin] Prepare release 3.0.0-RC1 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: Fix quarkiverse-micrometer.version Maven repository link
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 3.0.0-RC1.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 4251ad602ad16274ac3ecf602a7d874864ef8782 Author: Peter Palaga AuthorDate: Tue Jul 4 08:55:45 2023 +0200 Fix quarkiverse-micrometer.version Maven repository link --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 876db0683b..e6fa02c5dd 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 2.0.1 3.0.1 3.0.1 - 3.0.2 + 3.0.2 3.1.0.Final 2.0.0 2.0.1
[camel] 02/03: CAMEL-19560 - Manage micrometer artifacts to build and test with a single deterministic set of versions
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 commit 23679ee36519f7d45905ff6bb37bbc70a8ae2f6b Author: Peter Palaga AuthorDate: Wed Jun 28 22:02:21 2023 +0200 CAMEL-19560 - Manage micrometer artifacts to build and test with a single deterministic set of versions --- components/camel-micrometer/pom.xml | 2 -- components/camel-observation/pom.xml | 2 -- parent/pom.xml | 26 ++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/components/camel-micrometer/pom.xml b/components/camel-micrometer/pom.xml index 07925cfe607..83ed3437643 100644 --- a/components/camel-micrometer/pom.xml +++ b/components/camel-micrometer/pom.xml @@ -45,12 +45,10 @@ io.micrometer micrometer-core -${micrometer-version} io.micrometer micrometer-registry-jmx -${micrometer-version} true diff --git a/components/camel-observation/pom.xml b/components/camel-observation/pom.xml index fe3e54a142c..9d2d5dabf88 100644 --- a/components/camel-observation/pom.xml +++ b/components/camel-observation/pom.xml @@ -57,12 +57,10 @@ io.micrometer micrometer-core -${micrometer-version} io.micrometer micrometer-tracing -${micrometer-tracing-version} diff --git a/parent/pom.xml b/parent/pom.xml index 93544658c9e..05d0b941812 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2795,6 +2795,32 @@ commons-codec ${commons-codec-version} + + +io.micrometer +micrometer-commons +${micrometer-version} + + +io.micrometer +micrometer-core +${micrometer-version} + + +io.micrometer +micrometer-observation +${micrometer-version} + + +io.micrometer +micrometer-registry-jmx +${micrometer-version} + + +io.micrometer +micrometer-tracing +${micrometer-tracing-version} +
[camel] 03/03: Make CurrentSpanTest in Micrometer and Observation more robust by awaiting Span.current().getSpanContext().isValid() to become false after sending/receiving messages
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 commit 5ab7abb15ba5fa388c57f2a1c949bef68d6e0eba Author: Peter Palaga AuthorDate: Wed Jun 28 23:53:45 2023 +0200 Make CurrentSpanTest in Micrometer and Observation more robust by awaiting Span.current().getSpanContext().isValid() to become false after sending/receiving messages --- components/camel-observation/pom.xml | 6 .../CamelMicrometerObservationTestSupport.java | 12 ++- .../apache/camel/observation/CurrentSpanTest.java | 38 ++ components/camel-opentelemetry/pom.xml | 6 .../CamelOpenTelemetryTestSupport.java | 9 + .../camel/opentelemetry/CurrentSpanTest.java | 37 ++--- 6 files changed, 82 insertions(+), 26 deletions(-) diff --git a/components/camel-observation/pom.xml b/components/camel-observation/pom.xml index 9d2d5dabf88..24aeb5748cf 100644 --- a/components/camel-observation/pom.xml +++ b/components/camel-observation/pom.xml @@ -80,6 +80,12 @@ ${opentelemetry-version} test + +org.awaitility +awaitility +${awaitility-version} +test + diff --git a/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java b/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java index 945c4f8b8f5..4022b6f186a 100644 --- a/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java +++ b/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java @@ -25,6 +25,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import io.micrometer.core.instrument.MeterRegistry; @@ -56,6 +57,7 @@ import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; import org.apache.camel.CamelContext; import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.tracing.SpanDecorator; +import org.awaitility.Awaitility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -183,7 +185,14 @@ class CamelMicrometerObservationTestSupport extends CamelTestSupport { } protected void verifyTraceSpanNumbers(int numOfTraces, int numSpansPerTrace) { -Map> traces = new HashMap<>(); +final Map> traces = new HashMap<>(); + +Awaitility.await() +.alias("inMemorySpanExporter.getFinishedSpanItems() should eventually contain all expected spans") +.atMost(5, TimeUnit.SECONDS) +.pollInterval(10, TimeUnit.MILLISECONDS) +.pollDelay(0, TimeUnit.MILLISECONDS) +.until(() -> inMemorySpanExporter.getFinishedSpanItems().size() >= (numOfTraces * numSpansPerTrace)); List finishedSpans = inMemorySpanExporter.getFinishedSpanItems(); // Sort spans into separate traces @@ -192,6 +201,7 @@ class CamelMicrometerObservationTestSupport extends CamelTestSupport { spans.add(finishedSpans.get(i)); } +LOG.info("Found traces: " + traces); assertEquals(numOfTraces, traces.size()); for (Map.Entry> spans : traces.entrySet()) { diff --git a/components/camel-observation/src/test/java/org/apache/camel/observation/CurrentSpanTest.java b/components/camel-observation/src/test/java/org/apache/camel/observation/CurrentSpanTest.java index 158e5b8290a..d66e9ce170c 100644 --- a/components/camel-observation/src/test/java/org/apache/camel/observation/CurrentSpanTest.java +++ b/components/camel-observation/src/test/java/org/apache/camel/observation/CurrentSpanTest.java @@ -46,10 +46,10 @@ import org.apache.camel.support.DefaultConsumer; import org.apache.camel.support.DefaultProducer; import org.apache.camel.tracing.ActiveSpanManager; import org.apache.camel.util.StopWatch; +import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -82,12 +82,11 @@ class CurrentSpanTest extends CamelMicrometerObservationTestSupport { // sync pipeline template.sendBody("direct:bar", "Hello World"); +awaitInvalidSpanContext(); List spans = verify(expectedSpans, false); assertEquals(spans.get(0).getParentSpanId(), spans.get(1).getSpanId()); -
[camel] branch main updated (155b1cd58d5 -> 5ab7abb15ba)
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 155b1cd58d5 Upgrade Jsonapi to version 0.12 new 5c04f63daa8 Output better test failure messages in MicrometerExchangeEventNotifierTest new 23679ee3651 CAMEL-19560 - Manage micrometer artifacts to build and test with a single deterministic set of versions new 5ab7abb15ba Make CurrentSpanTest in Micrometer and Observation more robust by awaiting Span.current().getSpanContext().isValid() to become false after sending/receiving messages 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: components/camel-micrometer/pom.xml| 8 +++-- .../MicrometerExchangeEventNotifierTest.java | 12 +++ components/camel-observation/pom.xml | 8 +++-- .../CamelMicrometerObservationTestSupport.java | 12 ++- .../apache/camel/observation/CurrentSpanTest.java | 38 ++ components/camel-opentelemetry/pom.xml | 6 .../CamelOpenTelemetryTestSupport.java | 9 + .../camel/opentelemetry/CurrentSpanTest.java | 37 ++--- parent/pom.xml | 26 +++ 9 files changed, 120 insertions(+), 36 deletions(-)
[camel] 01/03: Output better test failure messages in MicrometerExchangeEventNotifierTest
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 commit 5c04f63daa8523bf70af77251ff979c61362d520 Author: Peter Palaga AuthorDate: Wed Jun 28 22:24:20 2023 +0200 Output better test failure messages in MicrometerExchangeEventNotifierTest --- components/camel-micrometer/pom.xml | 6 ++ .../eventnotifier/MicrometerExchangeEventNotifierTest.java | 12 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/components/camel-micrometer/pom.xml b/components/camel-micrometer/pom.xml index 41ce7936b8e..07925cfe607 100644 --- a/components/camel-micrometer/pom.xml +++ b/components/camel-micrometer/pom.xml @@ -104,6 +104,12 @@ ${hamcrest-version} test + +org.assertj +assertj-core +${assertj-version} +test + diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierTest.java index 61271520e63..94486512ef6 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierTest.java @@ -24,12 +24,12 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ExpressionAdapter; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTES_EXCHANGES_INFLIGHT; import static org.apache.camel.component.micrometer.MicrometerConstants.ROUTE_ID_TAG; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.assertj.core.api.Assertions.withPrecision; public class MicrometerExchangeEventNotifierTest extends AbstractMicrometerEventNotifierTest { @@ -54,7 +54,7 @@ public class MicrometerExchangeEventNotifierTest extends AbstractMicrometerEvent @Override public Object evaluate(Exchange exchange) { try { -assertEquals(1.0D, currentInflightExchanges(), 0.1D); + Assertions.assertThat(currentInflightExchanges()).isEqualTo(1.0D, withPrecision(0.1D)); Thread.sleep(SLEEP); return exchange.getIn().getBody(); } catch (InterruptedException e) { @@ -71,9 +71,9 @@ public class MicrometerExchangeEventNotifierTest extends AbstractMicrometerEvent mock.assertIsSatisfied(); Timer timer = meterRegistry.find(MOCK_OUT).timer(); -assertEquals(count, timer.count()); -assertTrue(timer.mean(TimeUnit.MILLISECONDS) > SLEEP.doubleValue()); -assertEquals(0.0D, currentInflightExchanges(), 0.1D); +Assertions.assertThat(timer.count()).isEqualTo(count); + Assertions.assertThat(timer.mean(TimeUnit.MILLISECONDS)).isGreaterThan(SLEEP.doubleValue()); +Assertions.assertThat(currentInflightExchanges()).isEqualTo(0.0D, withPrecision(0.1D)); } private double currentInflightExchanges() {
[camel] branch main updated (4fee5ca29de -> 0a77627eba4)
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 4fee5ca29de Upgrade Openstack4j to version 3.11 add 0a77627eba4 Fixup 4fee5ca Upgrade Openstack4j to version 3.11 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
[camel] 02/02: Fixup 74e04f0 Upgrade AWS SDK v2 to version 2.20.97
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 commit cd04445bae15733bbaa59c3aa31bef4fe0408314 Author: Peter Palaga AuthorDate: Mon Jul 3 09:46:32 2023 +0200 Fixup 74e04f0 Upgrade AWS SDK v2 to version 2.20.97 --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 42dc20e00a8..49200ea0ad1 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -59,7 +59,7 @@ 1.11.1 1.11.1 4.2.0 -2.20.96 +2.20.97 2.14.0 1.2.14 1.2.14
[camel] branch main updated (74e04f052ae -> cd04445bae1)
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 74e04f052ae Upgrade AWS SDK v2 to version 2.20.97 new 80d7e3cfc90 Regen after recent changes in camel-azure-files component new cd04445bae1 Fixup 74e04f0 Upgrade AWS SDK v2 to version 2.20.97 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-dependencies/pom.xml | 3 +-- docs/components/modules/ROOT/nav.adoc | 2 +- .../src/generated/resources/metadata.json | 2 +- .../builder/endpoint/StaticEndpointBuilders.java | 22 ++ .../endpoint/dsl/FilesEndpointBuilderFactory.java | 22 ++ 5 files changed, 31 insertions(+), 20 deletions(-)
[camel] 01/02: Regen after recent changes in camel-azure-files component
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 commit 80d7e3cfc90a0e6c6dabb7ddbe1f1d3ffe49c32c Author: Peter Palaga AuthorDate: Mon Jul 3 09:42:32 2023 +0200 Regen after recent changes in camel-azure-files component --- camel-dependencies/pom.xml | 3 +-- docs/components/modules/ROOT/nav.adoc | 2 +- .../src/generated/resources/metadata.json | 2 +- .../builder/endpoint/StaticEndpointBuilders.java | 22 ++ .../endpoint/dsl/FilesEndpointBuilderFactory.java | 22 ++ 5 files changed, 31 insertions(+), 20 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index fe131be9e87..42dc20e00a8 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -39,7 +39,6 @@ 1.1.3 - 2.28.0 5.18.1 2.0.2 @@ -60,7 +59,7 @@ 1.11.1 1.11.1 4.2.0 -2.20.94 +2.20.96 2.14.0 1.2.14 1.2.14 diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc index 648517804e5..e0c48b7b564 100644 --- a/docs/components/modules/ROOT/nav.adoc +++ b/docs/components/modules/ROOT/nav.adoc @@ -38,12 +38,12 @@ ** xref:azure-summary.adoc[Azure] *** xref:azure-cosmosdb-component.adoc[Azure CosmosDB] *** xref:azure-eventhubs-component.adoc[Azure Event Hubs] +*** xref:azure-files-component.adoc[Azure Files] *** xref:azure-key-vault-component.adoc[Azure Key Vault] *** xref:azure-servicebus-component.adoc[Azure ServiceBus] *** xref:azure-storage-blob-component.adoc[Azure Storage Blob Service] *** xref:azure-storage-datalake-component.adoc[Azure Storage Datalake Service] *** xref:azure-storage-queue-component.adoc[Azure Storage Queue Service] -** xref:azure-files-component.adoc[Azure Files] ** xref:bean-component.adoc[Bean] ** xref:bean-validator-component.adoc[Bean Validator] ** xref:bonita-component.adoc[Bonita] diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json b/dsl/camel-componentdsl/src/generated/resources/metadata.json index e0e3b95fb8c..6fd3db32d5a 100644 --- a/dsl/camel-componentdsl/src/generated/resources/metadata.json +++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json @@ -766,7 +766,7 @@ "version": "4.0.0-SNAPSHOT", "scheme": "azure-files", "extendsScheme": "file", -"syntax": "azure-files:\/\/account[.host]\/share[\/dir]", +"syntax": "azure-files:\/\/account\/share", "async": false, "api": false, "consumerOnly": false, diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java index f5ca1e1cce2..c8394c3e42f 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java @@ -1592,10 +1592,13 @@ public class StaticEndpointBuilders { * Since: 3.21 * Maven coordinates: org.apache.camel:camel-azure-files * - * Syntax: azure-files://account[.host]/share[/dir] + * Syntax: azure-files://account/share * - * Path parameter: host (required) - * Hostname of the FTP server + * Path parameter: account (required) + * The account to use + * + * Path parameter: share (required) + * The share to use * * Path parameter: port * Port of the FTP server @@ -1603,7 +1606,7 @@ public class StaticEndpointBuilders { * Path parameter: directoryName * The starting directory * - * @param path //account[.host]/share[/dir] + * @param path //account/share * @return the dsl builder */ public static org.apache.camel.builder.endpoint.dsl.FilesEndpointBuilderFactory.FilesEndpointBuilder azureFiles( @@ -1618,10 +1621,13 @@ public class StaticEndpointBuilders { * Since: 3.21 * Maven coordinates: org.apache.camel:camel-azure-files * - * Syntax: azure-files://account[.host]/share[/dir] + * Syntax: azure-files://account/share * - * Path parameter: host (required) - * Hostname of the FTP server + * Path parameter: account (required) + * The account to use + * + * Path parameter: share (required) + * The share to use * * Path parameter: port * Port of the FTP server @@ -1631,7 +1637,7 @@ public class StaticEndpointBuilders { * * @param componentName to use a custom component name for the endpoint * instead of the
[camel] 02/02: Upgrade to commons-codec 1.16.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.git commit cc795cc9527878ebf70e55c6b8afbc620e2f009d Author: Peter Palaga AuthorDate: Wed Jun 28 21:14:13 2023 +0200 Upgrade to commons-codec 1.16.0 --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 3b99e9cd2b8..85982ef7a1f 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -81,7 +81,7 @@ 7.0.9 1.9.4 1.4 -1.15 +1.16.0 3.2.2 4.4 1.21 diff --git a/parent/pom.xml b/parent/pom.xml index 08eee19757b..9e0f73ee010 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -90,7 +90,7 @@ 7.0.9 7.0.9 1.9.4 -1.15 +1.16.0 3.2.2 4.4