This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit f622188e9a13fa8eacb65e4abf70c9480b835b2f Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Mon Sep 30 15:49:03 2024 +0200 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 + tooling/maven/bom-generator-maven-plugin/pom.xml | 11 - .../maven/camel-api-component-maven-plugin/pom.xml | 11 - tooling/maven/camel-component-maven-plugin/pom.xml | 11 - .../pom.xml | 11 - tooling/maven/camel-maven-plugin/pom.xml | 11 - tooling/maven/camel-package-maven-plugin/pom.xml | 12 - tooling/maven/camel-restdsl-openapi-plugin/pom.xml | 11 - tooling/maven/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 62a34099d00..ba81926e860 100644 --- a/catalog/camel-catalog-common/pom.xml +++ b/catalog/camel-catalog-common/pom.xml @@ -33,18 +33,6 @@ <description>Camel Catalog Common</description> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>org.apache.maven</groupId> diff --git a/catalog/camel-csimple-maven-plugin/pom.xml b/catalog/camel-csimple-maven-plugin/pom.xml index 896461ae7d0..78fc072cb10 100644 --- a/catalog/camel-csimple-maven-plugin/pom.xml +++ b/catalog/camel-csimple-maven-plugin/pom.xml @@ -33,18 +33,6 @@ <name>Camel :: Catalog :: Camel Compiled Simple Maven Plugin</name> <description>Maven plugin to source code generate csimple language</description> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> diff --git a/catalog/camel-report-maven-plugin/pom.xml b/catalog/camel-report-maven-plugin/pom.xml index 0109687dea6..ca2ca7559d5 100644 --- a/catalog/camel-report-maven-plugin/pom.xml +++ b/catalog/camel-report-maven-plugin/pom.xml @@ -33,18 +33,6 @@ <name>Camel :: Catalog :: Camel Report Maven Plugin</name> <description>Maven plugin with tools to generate reports on your Camel projects</description> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>commons-codec</groupId> 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 9f08524d930..375f8e224be 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 @@ <firstVersion>3.0.0</firstVersion> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>org.apache.camel</groupId> diff --git a/components/camel-salesforce/camel-salesforce-codegen/pom.xml b/components/camel-salesforce/camel-salesforce-codegen/pom.xml index aee3c31416e..a484b982354 100644 --- a/components/camel-salesforce/camel-salesforce-codegen/pom.xml +++ b/components/camel-salesforce/camel-salesforce-codegen/pom.xml @@ -37,18 +37,6 @@ <firstVersion>3.15.0</firstVersion> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>org.apache.camel</groupId> diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml index fbfa39bf0e7..9d5d36dccc3 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 @@ <firstVersion>2.12.0</firstVersion> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> diff --git a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml index bbfa7010adb..14a8190a01f 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 @@ <firstVersion>2.18.0</firstVersion> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> 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 73071abff61..18f046c10ab 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 @@ <camel-prepare-component>false</camel-prepare-component> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>org.apache.maven</groupId> diff --git a/parent/pom.xml b/parent/pom.xml index 0601d96080d..4c137d0e519 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -332,13 +332,17 @@ <maven-antrun-plugin-version>3.1.0</maven-antrun-plugin-version> <maven-archetype-plugin-version>3.3.0</maven-archetype-plugin-version> <maven-archetype-packaging-version>3.3.0</maven-archetype-packaging-version> - <maven-owasp-plugin-version>10.0.4</maven-owasp-plugin-version> + <maven-archiver-version>3.6.2</maven-archiver-version> + <maven-artifact-transfer-version>0.13.1</maven-artifact-transfer-version> + <maven-dependency-tree-version>3.3.0</maven-dependency-tree-version> <maven-jar-plugin-version>3.4.2</maven-jar-plugin-version> <maven-javadoc-plugin-version>3.10.0</maven-javadoc-plugin-version> + <maven-maven-plugin-descriptor-version>2.2.1</maven-maven-plugin-descriptor-version> + <maven-owasp-plugin-version>10.0.4</maven-owasp-plugin-version> <maven-plugin-plugin-version>3.15.0</maven-plugin-plugin-version> <maven-plugin-annotations-version>3.9.0</maven-plugin-annotations-version> <maven-plugin-testing-harness-version>3.3.0</maven-plugin-testing-harness-version> - <!-- resources plugin needed by Camel maven archetypes --> + <maven-project-version>2.2.1</maven-project-version> <maven-resources-plugin-version>3.3.1</maven-resources-plugin-version> <maven-reporting-api-version>3.1.1</maven-reporting-api-version> <maven-reporting-impl-version>3.2.0</maven-reporting-impl-version> @@ -400,6 +404,11 @@ <picocli-version>4.7.6</picocli-version> <pinecone-client-version>1.2.2</pinecone-client-version> <plc4x-version>0.12.0</plc4x-version> + <plexus-archiver-version>4.10.0</plexus-archiver-version> + <plexus-build-api-version>1.2.0</plexus-build-api-version> + <plexus-container-default-version>2.1.1</plexus-container-default-version> + <plexus-utils-version>4.0.2</plexus-utils-version> + <plexus-xml-version>4.0.4</plexus-xml-version> <pooled-jms-version>3.1.6</pooled-jms-version> <properties-maven-plugin-version>1.2.1</properties-maven-plugin-version> <proto-google-common-protos-version>2.22.0</proto-google-common-protos-version> @@ -2893,6 +2902,12 @@ <type>pom</type> </dependency> + + <!-- + If we import the grpc-bom, we get a lot of duplicate dependencies + and conflicts between BOMs. The only way is to manually manage + those dependencies. + <dependency> <groupId>io.grpc</groupId> <artifactId>grpc-bom</artifactId> @@ -2900,6 +2915,181 @@ <scope>import</scope> <type>pom</type> </dependency> + --> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-all</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-alts</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-android</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-api</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-auth</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-benchmarks</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-binder</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-census</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-context</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-core</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-cronet</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-gcp-csm-observability</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-gcp-observability</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-googleapis</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-grpclb</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-inprocess</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-interop-testing</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-netty</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-netty-shaded</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-okhttp</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-opentelemetry</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-protobuf</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-protobuf-lite</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-rls</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-services</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-servlet</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-servlet-jakarta</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-stub</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-testing</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-testing-proto</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-util</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-xds</artifactId> + <version>${grpc-version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>protoc-gen-grpc-java</artifactId> + <version>${grpc-version}</version> + <type>pom</type> + </dependency> + + <dependency> + <groupId>com.google.cloud</groupId> + <artifactId>libraries-bom</artifactId> + <version>${google-cloud-bom-version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> <dependency> <groupId>com.github.ben-manes.caffeine</groupId> @@ -3002,6 +3192,168 @@ <version>${bytebuddy-version}</version> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>${maven-version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>${maven-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + <version>${maven-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-repository-metadata</artifactId> + <version>${maven-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-toolchain</artifactId> + <version>${maven-project-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + <version>${maven-project-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>${maven-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${maven-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>${maven-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${maven-plugin-annotations-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-descriptor</artifactId> + <version>${maven-maven-plugin-descriptor-version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>${maven-project-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + <version>${maven-dependency-tree-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-artifact-transfer</artifactId> + <version>${maven-artifact-transfer-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-api</artifactId> + <version>${maven-reporting-api-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-impl</artifactId> + <version>${maven-reporting-impl-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-api</artifactId> + <version>${maven-resolver-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-util</artifactId> + <version>${maven-resolver-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + <version>${plexus-container-default-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>${plexus-utils-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-xml</artifactId> + <version>${plexus-xml-version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-xml-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-build-api</artifactId> + <version>${plexus-build-api-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${maven-javadoc-plugin-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-archiver</artifactId> + <version>${maven-archiver-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-archiver</artifactId> + <version>${plexus-archiver-version}</version> + </dependency> </dependencies> </dependencyManagement> diff --git a/tooling/camel-tooling-maven/pom.xml b/tooling/camel-tooling-maven/pom.xml index 7c6f9e356c1..2bbfba07ca2 100644 --- a/tooling/camel-tooling-maven/pom.xml +++ b/tooling/camel-tooling-maven/pom.xml @@ -110,6 +110,10 @@ <artifactId>maven-resolver-util</artifactId> <version>${maven-resolver-version}</version> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-xml</artifactId> + </dependency> <!-- testing --> <dependency> diff --git a/tooling/maven/bom-generator-maven-plugin/pom.xml b/tooling/maven/bom-generator-maven-plugin/pom.xml index 10ab88f68f8..f64249cd4c0 100644 --- a/tooling/maven/bom-generator-maven-plugin/pom.xml +++ b/tooling/maven/bom-generator-maven-plugin/pom.xml @@ -32,17 +32,6 @@ <name>Camel :: Maven Plugins :: BOM Generator</name> <description>Maven plugin to help generating BOM projects</description> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml index 9e60c176c7e..505c6b30353 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 @@ <name>Camel :: Maven Plugins :: Camel API Component Plugin</name> <description>Maven plugin to generate code for Camel Components based on third party APIs</description> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> diff --git a/tooling/maven/camel-component-maven-plugin/pom.xml b/tooling/maven/camel-component-maven-plugin/pom.xml index c64ae76c5ea..b380609154b 100644 --- a/tooling/maven/camel-component-maven-plugin/pom.xml +++ b/tooling/maven/camel-component-maven-plugin/pom.xml @@ -32,17 +32,6 @@ <name>Camel :: Maven Plugins :: Camel Maven Component</name> <description>Maven plugin to help package 3rd party component developers to generate all needed metadata files needed for Camel</description> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> <groupId>org.apache.maven</groupId> 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 de8c82392ab..e117502432a 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 @@ <camel.surefire.fork.additional-vmargs>--add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED</camel.surefire.fork.additional-vmargs> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> diff --git a/tooling/maven/camel-maven-plugin/pom.xml b/tooling/maven/camel-maven-plugin/pom.xml index 64aa358fe72..d88948eedaf 100644 --- a/tooling/maven/camel-maven-plugin/pom.xml +++ b/tooling/maven/camel-maven-plugin/pom.xml @@ -32,17 +32,6 @@ <name>Camel :: Maven Plugins :: Camel Maven Plugin</name> <description>Maven plugin to run Camel standalone</description> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index 11df844932b..8e2cbc41e59 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -36,18 +36,6 @@ <skip.camel.maven.plugin.tests>false</skip.camel.maven.plugin.tests> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>org.apache.camel</groupId> diff --git a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml index 489c4f4801e..89b030acb00 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml +++ b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml @@ -37,17 +37,6 @@ <skip.camel.maven.plugin.tests>false</skip.camel.maven.plugin.tests> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> <dependencies> <dependency> <groupId>org.apache.camel</groupId> diff --git a/tooling/maven/sync-properties-maven-plugin/pom.xml b/tooling/maven/sync-properties-maven-plugin/pom.xml index 623baa9c4a3..a5d704ed9e8 100644 --- a/tooling/maven/sync-properties-maven-plugin/pom.xml +++ b/tooling/maven/sync-properties-maven-plugin/pom.xml @@ -31,18 +31,6 @@ <name>Camel :: Maven Plugins :: Sync Properties</name> <description>Copies one POM file properties to different POM file</description> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>org.apache.camel</groupId> diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml index 23fcc00fb5a..0cc44be532b 100644 --- a/tooling/parent/pom.xml +++ b/tooling/parent/pom.xml @@ -32,187 +32,4 @@ <name>Camel :: Tooling Parent</name> <description>Camel Tooling Parent POM</description> - <properties> - <maven-version>3.9.9</maven-version> - <maven-maven-plugin-descriptor-version>2.2.1</maven-maven-plugin-descriptor-version> - <maven-project-version>2.2.1</maven-project-version> - <maven-dependency-tree-version>3.3.0</maven-dependency-tree-version> - <maven-plugin-annotations-version>3.15.0</maven-plugin-annotations-version> - <maven-reporting-api-version>3.1.1</maven-reporting-api-version> - <maven-reporting-impl-version>3.2.0</maven-reporting-impl-version> - <plexus-build-api-version>1.2.0</plexus-build-api-version> - <plexus-container-default-version>2.1.1</plexus-container-default-version> - <plexus-utils-version>4.0.2</plexus-utils-version> - <plexus-xml-version>4.0.4</plexus-xml-version> - <maven-archiver-version>3.6.2</maven-archiver-version> - <plexus-archiver-version>4.10.0</plexus-archiver-version> - <maven-artifact-transfer-version>0.13.1</maven-artifact-transfer-version> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>${maven-version}</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-nop</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - <version>${maven-version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-settings</artifactId> - <version>${maven-version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-repository-metadata</artifactId> - <version>${maven-version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-toolchain</artifactId> - <version>${maven-project-version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> - <version>${maven-project-version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>${maven-version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>${maven-version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> - <version>${maven-version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-annotations</artifactId> - <version>${maven-plugin-annotations-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-descriptor</artifactId> - <version>${maven-maven-plugin-descriptor-version}</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>${maven-project-version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - <version>${maven-dependency-tree-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-artifact-transfer</artifactId> - <version>${maven-artifact-transfer-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - <version>${maven-reporting-api-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> - <version>${maven-reporting-impl-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.resolver</groupId> - <artifactId>maven-resolver-api</artifactId> - <version>${maven-resolver-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.resolver</groupId> - <artifactId>maven-resolver-util</artifactId> - <version>${maven-resolver-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - <version>${plexus-container-default-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>${plexus-utils-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-xml</artifactId> - <version>${plexus-xml-version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-xml-impl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-build-api</artifactId> - <version>${plexus-build-api-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${maven-javadoc-plugin-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-archiver</artifactId> - <version>${maven-archiver-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-archiver</artifactId> - <version>${plexus-archiver-version}</version> - </dependency> - </dependencies> - </dependencyManagement> </project>