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 52ed2930c0fe9666a25d75f79e4e520d92b85547 Author: Peter Palaga <ppal...@redhat.com> AuthorDate: Wed Jun 28 21:13:53 2023 +0200 CAMEL-19559 - Manage commons-codec to build and test with a single deterministic version --- catalog/camel-catalog-maven-grape/pom.xml | 13 ------------- catalog/camel-catalog-maven/pom.xml | 1 - catalog/camel-report-maven-plugin/pom.xml | 1 - components/camel-as2/camel-as2-api/pom.xml | 4 ++++ components/camel-atom/pom.xml | 5 ----- components/camel-base64/pom.xml | 1 - components/camel-crypto/pom.xml | 1 - components/camel-github/pom.xml | 1 - components/camel-google/camel-google-mail/pom.xml | 6 ++++++ components/camel-kubernetes/pom.xml | 6 ------ components/camel-oaipmh/pom.xml | 1 - components/camel-rss/pom.xml | 4 ++++ components/camel-xmlsecurity/pom.xml | 1 - parent/pom.xml | 6 ++++++ tooling/camel-tooling-maven/pom.xml | 1 - 15 files changed, 20 insertions(+), 32 deletions(-) diff --git a/catalog/camel-catalog-maven-grape/pom.xml b/catalog/camel-catalog-maven-grape/pom.xml index 59a7fc12467..d0024f1fc45 100644 --- a/catalog/camel-catalog-maven-grape/pom.xml +++ b/catalog/camel-catalog-maven-grape/pom.xml @@ -54,28 +54,15 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <version>4.5.10</version> - <exclusions> - <exclusion> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> <version>${httpcore4-version}</version> - <exclusions> - <exclusion> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons-codec-version}</version> </dependency> <!-- disable all components --> diff --git a/catalog/camel-catalog-maven/pom.xml b/catalog/camel-catalog-maven/pom.xml index 864c37cfca6..f9d5e3d3b60 100644 --- a/catalog/camel-catalog-maven/pom.xml +++ b/catalog/camel-catalog-maven/pom.xml @@ -51,7 +51,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons-codec-version}</version> </dependency> <!-- disable all components --> diff --git a/catalog/camel-report-maven-plugin/pom.xml b/catalog/camel-report-maven-plugin/pom.xml index ce0266329ae..948132d7f39 100644 --- a/catalog/camel-report-maven-plugin/pom.xml +++ b/catalog/camel-report-maven-plugin/pom.xml @@ -49,7 +49,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons-codec-version}</version> </dependency> <dependency> diff --git a/components/camel-as2/camel-as2-api/pom.xml b/components/camel-as2/camel-as2-api/pom.xml index f44fde3a502..45ab8fb3597 100644 --- a/components/camel-as2/camel-as2-api/pom.xml +++ b/components/camel-as2/camel-as2-api/pom.xml @@ -43,6 +43,10 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-debug-jdk18on</artifactId> diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml index 383574ba82c..ec5e7364604 100644 --- a/components/camel-atom/pom.xml +++ b/components/camel-atom/pom.xml @@ -42,7 +42,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons-codec-version}</version> </dependency> <dependency> <groupId>org.apache.abdera</groupId> @@ -57,10 +56,6 @@ <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-stax-api_1.0_spec</artifactId> </exclusion> - <exclusion> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </exclusion> </exclusions> </dependency> <dependency> diff --git a/components/camel-base64/pom.xml b/components/camel-base64/pom.xml index b7dd920bd98..14538774ebf 100644 --- a/components/camel-base64/pom.xml +++ b/components/camel-base64/pom.xml @@ -44,7 +44,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons-codec-version}</version> </dependency> <!-- testing --> diff --git a/components/camel-crypto/pom.xml b/components/camel-crypto/pom.xml index 9370049614a..7e500ab7bec 100644 --- a/components/camel-crypto/pom.xml +++ b/components/camel-crypto/pom.xml @@ -39,7 +39,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons-codec-version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> diff --git a/components/camel-github/pom.xml b/components/camel-github/pom.xml index 25f81c75c65..75e62822740 100644 --- a/components/camel-github/pom.xml +++ b/components/camel-github/pom.xml @@ -47,7 +47,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons-codec-version}</version> </dependency> <!-- testing --> diff --git a/components/camel-google/camel-google-mail/pom.xml b/components/camel-google/camel-google-mail/pom.xml index d911b714674..95e7d1b054f 100644 --- a/components/camel-google/camel-google-mail/pom.xml +++ b/components/camel-google/camel-google-mail/pom.xml @@ -145,6 +145,12 @@ <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml index b5e01ed65de..d92df60302b 100644 --- a/components/camel-kubernetes/pom.xml +++ b/components/camel-kubernetes/pom.xml @@ -122,12 +122,6 @@ <artifactId>camel-log</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>${commons-codec-version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> diff --git a/components/camel-oaipmh/pom.xml b/components/camel-oaipmh/pom.xml index b7af5b9bb37..d64f8863d13 100644 --- a/components/camel-oaipmh/pom.xml +++ b/components/camel-oaipmh/pom.xml @@ -75,7 +75,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons-codec-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-rss/pom.xml b/components/camel-rss/pom.xml index f27f8662b77..236d3755ecc 100644 --- a/components/camel-rss/pom.xml +++ b/components/camel-rss/pom.xml @@ -54,6 +54,10 @@ <artifactId>rome</artifactId> <version>${rome-version}</version> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> <!-- test dependencies --> <dependency> diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml index 64b757a4c26..b9a76832541 100644 --- a/components/camel-xmlsecurity/pom.xml +++ b/components/camel-xmlsecurity/pom.xml @@ -55,7 +55,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons-codec-version}</version> </dependency> <dependency> <groupId>org.apache.santuario</groupId> diff --git a/parent/pom.xml b/parent/pom.xml index 0418e37093e..08eee19757b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2780,6 +2780,12 @@ </exclusion> </exclusions> </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons-codec-version}</version> + </dependency> </dependencies> </dependencyManagement> diff --git a/tooling/camel-tooling-maven/pom.xml b/tooling/camel-tooling-maven/pom.xml index d06e4186946..46bf05602c4 100644 --- a/tooling/camel-tooling-maven/pom.xml +++ b/tooling/camel-tooling-maven/pom.xml @@ -56,7 +56,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons-codec-version}</version> </dependency> <!-- maven / maven resolver -->