From 4b71e0851f5a10cb2ae78fb7e79380afdde35610 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Wed, 5 Jul 2023 10:05:27 +0200 Subject: [PATCH 1/4] 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 4feca088b94e2..13956d2059ff2 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} From e9cd5687c4f7ba6096590fbbcd79b567e373f231 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Wed, 5 Jul 2023 10:07:21 +0200 Subject: [PATCH 2/4] 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 13956d2059ff2..20920cb1f0b40 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 From 4760ddb89cc236f95d94b7b30660e231009a2a44 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Wed, 5 Jul 2023 10:33:10 +0200 Subject: [PATCH 3/4] 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 31cf3313e182c..c6d42ea57f073 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 From 40b7080551860a58b652dfe93477accc8a172e76 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Wed, 5 Jul 2023 11:30:36 +0200 Subject: [PATCH 4/4] 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 ------ .../camel-azure/camel-azure-storage-blob/pom.xml | 1 - .../camel-azure/camel-azure-storage-datalake/pom.xml | 1 - .../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 - .../camel-olingo2/camel-olingo2-component/pom.xml | 1 - .../camel-olingo4/camel-olingo4-component/pom.xml | 5 ----- components/camel-pdf/pom.xml | 1 - .../camel-salesforce/camel-salesforce-codegen/pom.xml | 5 ----- .../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 4ef0eb7f07c44..e917759853f2b 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 52b95d6371414..dafe3491ba54c 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 23c2a265e7c3f..be4a868c78454 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 10e3056356a2c..448a8468a2fd3 100644 --- a/components/camel-azure/camel-azure-files/pom.xml +++ b/components/camel-azure/camel-azure-files/pom.xml @@ -20,7 +20,7 @@ 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 index 46417f16a5813..b6e86dcc90c40 100644 --- a/components/camel-azure/camel-azure-key-vault/pom.xml +++ b/components/camel-azure/camel-azure-key-vault/pom.xml @@ -88,11 +88,5 @@ ${awaitility-version} test - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - test - diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml b/components/camel-azure/camel-azure-servicebus/pom.xml index 4d6f6ece8591a..8526d1cc60ff6 100644 --- a/components/camel-azure/camel-azure-servicebus/pom.xml +++ b/components/camel-azure/camel-azure-servicebus/pom.xml @@ -76,11 +76,5 @@ ${awaitility-version} test - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - test - diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml b/components/camel-azure/camel-azure-storage-blob/pom.xml index 51e51ba5a8868..0f498f5925ebb 100644 --- a/components/camel-azure/camel-azure-storage-blob/pom.xml +++ b/components/camel-azure/camel-azure-storage-blob/pom.xml @@ -97,7 +97,6 @@ org.apache.commons commons-lang3 - ${commons-lang3-version} test diff --git a/components/camel-azure/camel-azure-storage-datalake/pom.xml b/components/camel-azure/camel-azure-storage-datalake/pom.xml index 33421ed5521f1..e8bfd2eebbb9e 100644 --- a/components/camel-azure/camel-azure-storage-datalake/pom.xml +++ b/components/camel-azure/camel-azure-storage-datalake/pom.xml @@ -69,7 +69,6 @@ org.apache.commons commons-lang3 - ${commons-lang3-version} test diff --git a/components/camel-azure/camel-azure-storage-queue/pom.xml b/components/camel-azure/camel-azure-storage-queue/pom.xml index 4b726f88024b4..9cff7600e3d63 100644 --- a/components/camel-azure/camel-azure-storage-queue/pom.xml +++ b/components/camel-azure/camel-azure-storage-queue/pom.xml @@ -89,7 +89,6 @@ org.apache.commons commons-lang3 - ${commons-lang3-version} test diff --git a/components/camel-cxf/camel-cxf-rest/pom.xml b/components/camel-cxf/camel-cxf-rest/pom.xml index 255b39f41033d..9a8e08640a7af 100644 --- a/components/camel-cxf/camel-cxf-rest/pom.xml +++ b/components/camel-cxf/camel-cxf-rest/pom.xml @@ -207,13 +207,6 @@ test - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - test - - com.sun.xml.bind diff --git a/components/camel-cxf/camel-cxf-spring-rest/pom.xml b/components/camel-cxf/camel-cxf-spring-rest/pom.xml index b09428a0758d3..aa3ba6508d7e4 100644 --- a/components/camel-cxf/camel-cxf-spring-rest/pom.xml +++ b/components/camel-cxf/camel-cxf-spring-rest/pom.xml @@ -217,13 +217,6 @@ test - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - test - - com.sun.xml.bind diff --git a/components/camel-cxf/camel-cxf-spring-soap/pom.xml b/components/camel-cxf/camel-cxf-spring-soap/pom.xml index 4e2c89d2d7e47..45769b8c9be71 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/pom.xml +++ b/components/camel-cxf/camel-cxf-spring-soap/pom.xml @@ -232,13 +232,6 @@ test - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - test - - com.sun.xml.bind diff --git a/components/camel-dhis2/camel-dhis2-component/pom.xml b/components/camel-dhis2/camel-dhis2-component/pom.xml index f76fc25989c3d..81875dbfcd5f5 100644 --- a/components/camel-dhis2/camel-dhis2-component/pom.xml +++ b/components/camel-dhis2/camel-dhis2-component/pom.xml @@ -62,6 +62,11 @@ ${testcontainers-version} test + + org.apache.commons + commons-lang3 + test + diff --git a/components/camel-dhis2/pom.xml b/components/camel-dhis2/pom.xml index ef0c1a4044c7c..5347584413ae7 100644 --- a/components/camel-dhis2/pom.xml +++ b/components/camel-dhis2/pom.xml @@ -64,11 +64,5 @@ camel-test-junit5 test - - org.apache.commons - commons-lang3 - 3.12.0 - test - diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml index 3f921c0fcfafb..9f5313a6845ed 100644 --- a/components/camel-grape/pom.xml +++ b/components/camel-grape/pom.xml @@ -41,7 +41,6 @@ org.apache.commons commons-lang3 - ${commons-lang3-version} org.apache.camel diff --git a/components/camel-hashicorp-vault/pom.xml b/components/camel-hashicorp-vault/pom.xml index 871aa2fbd22f7..3fb35f7700ee5 100644 --- a/components/camel-hashicorp-vault/pom.xml +++ b/components/camel-hashicorp-vault/pom.xml @@ -74,12 +74,6 @@ ${awaitility-version} test - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - test - org.apache.camel camel-test-infra-hashicorp-vault @@ -88,7 +82,7 @@ test - + ppc64le diff --git a/components/camel-huawei/camel-huaweicloud-smn/pom.xml b/components/camel-huawei/camel-huaweicloud-smn/pom.xml index d771654f904a6..eb8c4fb64017d 100644 --- a/components/camel-huawei/camel-huaweicloud-smn/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-smn/pom.xml @@ -50,12 +50,6 @@ jackson-core - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - - com.huaweicloud.sdk @@ -67,6 +61,10 @@ huaweicloud-sdk-smn ${huaweicloud-sdk-version} + + org.apache.commons + commons-lang3 + diff --git a/components/camel-ironmq/pom.xml b/components/camel-ironmq/pom.xml index bb738a480fe20..74cfb4426417c 100644 --- a/components/camel-ironmq/pom.xml +++ b/components/camel-ironmq/pom.xml @@ -49,11 +49,6 @@ com.google.code.gson gson - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml index d57f6c86edfd8..86f600a93c383 100644 --- a/components/camel-jt400/pom.xml +++ b/components/camel-jt400/pom.xml @@ -45,11 +45,6 @@ ${jt400-version} java11 - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml index 750da92fe2935..2e3981e50a86b 100644 --- a/components/camel-kafka/pom.xml +++ b/components/camel-kafka/pom.xml @@ -135,13 +135,6 @@ ${mockito-version} test - - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - test - diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml index e722ce244039e..bfbcd1c85a728 100644 --- a/components/camel-mongodb/pom.xml +++ b/components/camel-mongodb/pom.xml @@ -99,7 +99,6 @@ org.apache.commons commons-lang3 - ${commons-lang3-version} test diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml index 7a59c0913abf9..b80536dae3265 100644 --- a/components/camel-olingo2/camel-olingo2-component/pom.xml +++ b/components/camel-olingo2/camel-olingo2-component/pom.xml @@ -53,7 +53,6 @@ org.apache.commons commons-lang3 - ${commons-lang3-version} diff --git a/components/camel-olingo4/camel-olingo4-component/pom.xml b/components/camel-olingo4/camel-olingo4-component/pom.xml index ab7c467d096c9..61a4c4e47e6f3 100644 --- a/components/camel-olingo4/camel-olingo4-component/pom.xml +++ b/components/camel-olingo4/camel-olingo4-component/pom.xml @@ -63,11 +63,6 @@ odata-commons-api ${olingo4-version} - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - org.apache.camel camel-test-junit5 diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml index 4ae8a700b9e66..f33a2561c48de 100644 --- a/components/camel-pdf/pom.xml +++ b/components/camel-pdf/pom.xml @@ -43,7 +43,6 @@ org.apache.commons commons-lang3 - ${commons-lang3-version} diff --git a/components/camel-salesforce/camel-salesforce-codegen/pom.xml b/components/camel-salesforce/camel-salesforce-codegen/pom.xml index 3e43ee7a78be5..7981d359ec4f7 100644 --- a/components/camel-salesforce/camel-salesforce-codegen/pom.xml +++ b/components/camel-salesforce/camel-salesforce-codegen/pom.xml @@ -65,11 +65,6 @@ velocity-engine-core ${velocity-version} - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - org.apache.commons commons-text diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml index ffddaa32fc543..42b91b41d6fae 100644 --- a/components/camel-salesforce/camel-salesforce-component/pom.xml +++ b/components/camel-salesforce/camel-salesforce-component/pom.xml @@ -114,7 +114,6 @@ org.apache.commons commons-lang3 - ${commons-lang3-version} jakarta.annotation diff --git a/components/camel-spring-batch/pom.xml b/components/camel-spring-batch/pom.xml index a5d7fb7935983..25954ce2125a3 100644 --- a/components/camel-spring-batch/pom.xml +++ b/components/camel-spring-batch/pom.xml @@ -48,7 +48,6 @@ org.apache.commons commons-lang3 - ${commons-lang3-version} test diff --git a/components/camel-stitch/pom.xml b/components/camel-stitch/pom.xml index 899cec11fd30c..23e563422d2f2 100644 --- a/components/camel-stitch/pom.xml +++ b/components/camel-stitch/pom.xml @@ -71,11 +71,5 @@ ${awaitility-version} test - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - test - diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml index b222e6e18bd42..a476c85bcf9e6 100644 --- a/components/camel-telegram/pom.xml +++ b/components/camel-telegram/pom.xml @@ -50,7 +50,6 @@ org.apache.commons commons-lang3 - ${commons-lang3-version} diff --git a/parent/pom.xml b/parent/pom.xml index f1e76d0e2aa75..5867a18c50b67 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2819,6 +2819,12 @@ micrometer-tracing ${micrometer-tracing-version} + + + org.apache.commons + commons-lang3 + ${commons-lang3-version} + diff --git a/tooling/openapi-rest-dsl-generator/pom.xml b/tooling/openapi-rest-dsl-generator/pom.xml index a5868f7b63d5c..b0142d97c6919 100644 --- a/tooling/openapi-rest-dsl-generator/pom.xml +++ b/tooling/openapi-rest-dsl-generator/pom.xml @@ -62,7 +62,6 @@ org.apache.commons commons-lang3 - ${commons-lang3-version}