From f622188e9a13fa8eacb65e4abf70c9480b835b2f Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 30 Sep 2024 15:49:03 +0200 Subject: [PATCH] Cleanup dependency management (#15745) --- catalog/camel-catalog-common/pom.xml | 12 - catalog/camel-csimple-maven-plugin/pom.xml | 12 - catalog/camel-report-maven-plugin/pom.xml | 12 - .../camel-debezium-maven-plugin/pom.xml | 12 - .../camel-salesforce-codegen/pom.xml | 12 - .../camel-salesforce-maven-plugin/pom.xml | 12 - .../camel-servicenow-maven-plugin/pom.xml | 12 - .../camel-yaml-dsl-maven-plugin/pom.xml | 12 - parent/pom.xml | 356 +++++++++++++++++- tooling/camel-tooling-maven/pom.xml | 4 + .../maven/bom-generator-maven-plugin/pom.xml | 11 - .../camel-api-component-maven-plugin/pom.xml | 11 - .../camel-component-maven-plugin/pom.xml | 11 - .../pom.xml | 11 - tooling/maven/camel-maven-plugin/pom.xml | 11 - .../maven/camel-package-maven-plugin/pom.xml | 12 - .../camel-restdsl-openapi-plugin/pom.xml | 11 - .../sync-properties-maven-plugin/pom.xml | 12 - tooling/parent/pom.xml | 183 --------- 19 files changed, 358 insertions(+), 371 deletions(-) diff --git a/catalog/camel-catalog-common/pom.xml b/catalog/camel-catalog-common/pom.xml index 62a34099d0078..ba81926e860f6 100644 --- a/catalog/camel-catalog-common/pom.xml +++ b/catalog/camel-catalog-common/pom.xml @@ -33,18 +33,6 @@ Camel Catalog Common - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - - org.apache.maven diff --git a/catalog/camel-csimple-maven-plugin/pom.xml b/catalog/camel-csimple-maven-plugin/pom.xml index 896461ae7d01b..78fc072cb108d 100644 --- a/catalog/camel-csimple-maven-plugin/pom.xml +++ b/catalog/camel-csimple-maven-plugin/pom.xml @@ -33,18 +33,6 @@ Camel :: Catalog :: Camel Compiled Simple Maven Plugin Maven plugin to source code generate csimple language - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - - diff --git a/catalog/camel-report-maven-plugin/pom.xml b/catalog/camel-report-maven-plugin/pom.xml index 0109687dea68b..ca2ca7559d569 100644 --- a/catalog/camel-report-maven-plugin/pom.xml +++ b/catalog/camel-report-maven-plugin/pom.xml @@ -33,18 +33,6 @@ Camel :: Catalog :: Camel Report Maven Plugin Maven plugin with tools to generate reports on your Camel projects - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - - commons-codec diff --git a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml index 9f08524d93009..375f8e224be9a 100644 --- a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml +++ b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml @@ -37,18 +37,6 @@ 3.0.0 - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - - org.apache.camel diff --git a/components/camel-salesforce/camel-salesforce-codegen/pom.xml b/components/camel-salesforce/camel-salesforce-codegen/pom.xml index aee3c31416edd..a484b98235415 100644 --- a/components/camel-salesforce/camel-salesforce-codegen/pom.xml +++ b/components/camel-salesforce/camel-salesforce-codegen/pom.xml @@ -37,18 +37,6 @@ 3.15.0 - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - - org.apache.camel diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml index fbfa39bf0e715..9d5d36dccc32b 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml @@ -38,18 +38,6 @@ 2.12.0 - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - - diff --git a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml index bbfa7010adb1c..14a8190a01fa9 100644 --- a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml +++ b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml @@ -38,18 +38,6 @@ 2.18.0 - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - - diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml index 73071abff61f9..18f046c10ab49 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml @@ -37,18 +37,6 @@ false - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - - org.apache.maven diff --git a/parent/pom.xml b/parent/pom.xml index 0601d96080db5..4c137d0e51940 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -332,13 +332,17 @@ 3.1.0 3.3.0 3.3.0 - 10.0.4 + 3.6.2 + 0.13.1 + 3.3.0 3.4.2 3.10.0 + 2.2.1 + 10.0.4 3.15.0 3.9.0 3.3.0 - + 2.2.1 3.3.1 3.1.1 3.2.0 @@ -400,6 +404,11 @@ 4.7.6 1.2.2 0.12.0 + 4.10.0 + 1.2.0 + 2.1.1 + 4.0.2 + 4.0.4 3.1.6 1.2.1 2.22.0 @@ -2893,6 +2902,12 @@ pom + + + + io.grpc + grpc-all + ${grpc-version} + + + io.grpc + grpc-alts + ${grpc-version} + + + io.grpc + grpc-android + ${grpc-version} + + + io.grpc + grpc-api + ${grpc-version} + + + io.grpc + grpc-auth + ${grpc-version} + + + io.grpc + grpc-benchmarks + ${grpc-version} + + + io.grpc + grpc-binder + ${grpc-version} + + + io.grpc + grpc-census + ${grpc-version} + + + io.grpc + grpc-context + ${grpc-version} + + + io.grpc + grpc-core + ${grpc-version} + + + io.grpc + grpc-cronet + ${grpc-version} + + + io.grpc + grpc-gcp-csm-observability + ${grpc-version} + + + io.grpc + grpc-gcp-observability + ${grpc-version} + + + io.grpc + grpc-googleapis + ${grpc-version} + + + io.grpc + grpc-grpclb + ${grpc-version} + + + io.grpc + grpc-inprocess + ${grpc-version} + + + io.grpc + grpc-interop-testing + ${grpc-version} + + + io.grpc + grpc-netty + ${grpc-version} + + + io.grpc + grpc-netty-shaded + ${grpc-version} + + + io.grpc + grpc-okhttp + ${grpc-version} + + + io.grpc + grpc-opentelemetry + ${grpc-version} + + + io.grpc + grpc-protobuf + ${grpc-version} + + + io.grpc + grpc-protobuf-lite + ${grpc-version} + + + io.grpc + grpc-rls + ${grpc-version} + + + io.grpc + grpc-services + ${grpc-version} + + + io.grpc + grpc-servlet + ${grpc-version} + + + io.grpc + grpc-servlet-jakarta + ${grpc-version} + + + io.grpc + grpc-stub + ${grpc-version} + + + io.grpc + grpc-testing + ${grpc-version} + + + io.grpc + grpc-testing-proto + ${grpc-version} + + + io.grpc + grpc-util + ${grpc-version} + + + io.grpc + grpc-xds + ${grpc-version} + + + io.grpc + protoc-gen-grpc-java + ${grpc-version} + pom + + + + com.google.cloud + libraries-bom + ${google-cloud-bom-version} + pom + import + com.github.ben-manes.caffeine @@ -3002,6 +3192,168 @@ ${bytebuddy-version} + + org.apache.maven + maven-core + ${maven-version} + provided + + + org.slf4j + slf4j-jdk14 + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + slf4j-nop + + + + + org.apache.maven + maven-model + ${maven-version} + provided + + + org.apache.maven + maven-settings + ${maven-version} + provided + + + org.apache.maven + maven-repository-metadata + ${maven-version} + provided + + + org.apache.maven + maven-toolchain + ${maven-project-version} + provided + + + org.apache.maven + maven-artifact-manager + ${maven-project-version} + provided + + + org.apache.maven + maven-artifact + ${maven-version} + provided + + + org.apache.maven + maven-plugin-api + ${maven-version} + provided + + + org.apache.maven + maven-compat + ${maven-version} + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${maven-plugin-annotations-version} + + + org.apache.maven + maven-plugin-descriptor + ${maven-maven-plugin-descriptor-version} + provided + + + log4j + log4j + + + + + org.apache.maven + maven-project + ${maven-project-version} + provided + + + org.apache.maven.shared + maven-dependency-tree + ${maven-dependency-tree-version} + + + org.apache.maven.shared + maven-artifact-transfer + ${maven-artifact-transfer-version} + + + org.apache.maven.reporting + maven-reporting-api + ${maven-reporting-api-version} + + + org.apache.maven.reporting + maven-reporting-impl + ${maven-reporting-impl-version} + + + org.apache.maven.resolver + maven-resolver-api + ${maven-resolver-version} + + + org.apache.maven.resolver + maven-resolver-util + ${maven-resolver-version} + + + org.codehaus.plexus + plexus-container-default + ${plexus-container-default-version} + + + org.codehaus.plexus + plexus-utils + ${plexus-utils-version} + + + org.codehaus.plexus + plexus-xml + ${plexus-xml-version} + + + org.apache.maven + maven-xml-impl + + + + + org.codehaus.plexus + plexus-build-api + ${plexus-build-api-version} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin-version} + + + org.apache.maven + maven-archiver + ${maven-archiver-version} + + + org.codehaus.plexus + plexus-archiver + ${plexus-archiver-version} + diff --git a/tooling/camel-tooling-maven/pom.xml b/tooling/camel-tooling-maven/pom.xml index 7c6f9e356c194..2bbfba07ca2ce 100644 --- a/tooling/camel-tooling-maven/pom.xml +++ b/tooling/camel-tooling-maven/pom.xml @@ -110,6 +110,10 @@ maven-resolver-util ${maven-resolver-version} + + org.codehaus.plexus + plexus-xml + diff --git a/tooling/maven/bom-generator-maven-plugin/pom.xml b/tooling/maven/bom-generator-maven-plugin/pom.xml index 10ab88f68f82f..f64249cd4c02b 100644 --- a/tooling/maven/bom-generator-maven-plugin/pom.xml +++ b/tooling/maven/bom-generator-maven-plugin/pom.xml @@ -32,17 +32,6 @@ Camel :: Maven Plugins :: BOM Generator Maven plugin to help generating BOM projects - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml index 9e60c176c7ef2..505c6b30353c0 100644 --- a/tooling/maven/camel-api-component-maven-plugin/pom.xml +++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml @@ -32,17 +32,6 @@ Camel :: Maven Plugins :: Camel API Component Plugin Maven plugin to generate code for Camel Components based on third party APIs - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - diff --git a/tooling/maven/camel-component-maven-plugin/pom.xml b/tooling/maven/camel-component-maven-plugin/pom.xml index c64ae76c5eaf8..b380609154b58 100644 --- a/tooling/maven/camel-component-maven-plugin/pom.xml +++ b/tooling/maven/camel-component-maven-plugin/pom.xml @@ -32,17 +32,6 @@ Camel :: Maven Plugins :: Camel Maven Component Maven plugin to help package 3rd party component developers to generate all needed metadata files needed for Camel - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - org.apache.maven diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml index de8c82392ab25..e117502432aed 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml @@ -36,17 +36,6 @@ --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - diff --git a/tooling/maven/camel-maven-plugin/pom.xml b/tooling/maven/camel-maven-plugin/pom.xml index 64aa358fe72d5..d88948eedaf2e 100644 --- a/tooling/maven/camel-maven-plugin/pom.xml +++ b/tooling/maven/camel-maven-plugin/pom.xml @@ -32,17 +32,6 @@ Camel :: Maven Plugins :: Camel Maven Plugin Maven plugin to run Camel standalone - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index 11df844932be5..8e2cbc41e5955 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -36,18 +36,6 @@ false - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - - org.apache.camel diff --git a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml index 489c4f4801ed7..89b030acb0098 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml @@ -37,17 +37,6 @@ false - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - org.apache.camel diff --git a/tooling/maven/sync-properties-maven-plugin/pom.xml b/tooling/maven/sync-properties-maven-plugin/pom.xml index 623baa9c4a39d..a5d704ed9e82c 100644 --- a/tooling/maven/sync-properties-maven-plugin/pom.xml +++ b/tooling/maven/sync-properties-maven-plugin/pom.xml @@ -31,18 +31,6 @@ Camel :: Maven Plugins :: Sync Properties Copies one POM file properties to different POM file - - - - org.apache.camel - tooling-parent - ${project.version} - pom - import - - - - org.apache.camel diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml index 23fcc00fb5aac..0cc44be532b27 100644 --- a/tooling/parent/pom.xml +++ b/tooling/parent/pom.xml @@ -32,187 +32,4 @@ Camel :: Tooling Parent Camel Tooling Parent POM - - 3.9.9 - 2.2.1 - 2.2.1 - 3.3.0 - 3.15.0 - 3.1.1 - 3.2.0 - 1.2.0 - 2.1.1 - 4.0.2 - 4.0.4 - 3.6.2 - 4.10.0 - 0.13.1 - - - - - - org.apache.maven - maven-core - ${maven-version} - provided - - - org.slf4j - slf4j-jdk14 - - - org.slf4j - jcl-over-slf4j - - - org.slf4j - slf4j-nop - - - - - org.apache.maven - maven-model - ${maven-version} - provided - - - org.apache.maven - maven-settings - ${maven-version} - provided - - - org.apache.maven - maven-repository-metadata - ${maven-version} - provided - - - org.apache.maven - maven-toolchain - ${maven-project-version} - provided - - - org.apache.maven - maven-artifact-manager - ${maven-project-version} - provided - - - org.apache.maven - maven-artifact - ${maven-version} - provided - - - org.apache.maven - maven-plugin-api - ${maven-version} - provided - - - org.apache.maven - maven-compat - ${maven-version} - provided - - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${maven-plugin-annotations-version} - - - org.apache.maven - maven-plugin-descriptor - ${maven-maven-plugin-descriptor-version} - provided - - - log4j - log4j - - - - - org.apache.maven - maven-project - ${maven-project-version} - provided - - - org.apache.maven.shared - maven-dependency-tree - ${maven-dependency-tree-version} - - - org.apache.maven.shared - maven-artifact-transfer - ${maven-artifact-transfer-version} - - - org.apache.maven.reporting - maven-reporting-api - ${maven-reporting-api-version} - - - org.apache.maven.reporting - maven-reporting-impl - ${maven-reporting-impl-version} - - - org.apache.maven.resolver - maven-resolver-api - ${maven-resolver-version} - - - org.apache.maven.resolver - maven-resolver-util - ${maven-resolver-version} - - - org.codehaus.plexus - plexus-container-default - ${plexus-container-default-version} - - - org.codehaus.plexus - plexus-utils - ${plexus-utils-version} - - - org.codehaus.plexus - plexus-xml - ${plexus-xml-version} - - - org.apache.maven - maven-xml-impl - - - - - org.codehaus.plexus - plexus-build-api - ${plexus-build-api-version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin-version} - - - org.apache.maven - maven-archiver - ${maven-archiver-version} - - - org.codehaus.plexus - plexus-archiver - ${plexus-archiver-version} - - -