This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9da812dfdc81b96903cb69f22e1c25e4d5f0bca6 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Mon Mar 18 08:04:24 2024 +0000 Fixup adding com.squareup.okhttp3:mockwebserver to camel-quarkus-bom Fixes #5806 --- poms/bom/pom.xml | 7 +++++++ poms/bom/src/main/generated/flattened-full-pom.xml | 6 ++++++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 11 +++++++++++ poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 11 +++++++++++ 4 files changed, 35 insertions(+) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 71e5d2be1c..4c4c9d93c3 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6332,6 +6332,12 @@ <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <version>${okhttp.version}</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.squareup.okio</groupId> @@ -7130,6 +7136,7 @@ <resolutionEntryPointInclude>xerces:xercesImpl</resolutionEntryPointInclude> <resolutionEntryPointInclude>com.ibm.mq:com.ibm.mq.jakarta.client</resolutionEntryPointInclude> <resolutionEntryPointInclude>com.ibm.icu:icu4j</resolutionEntryPointInclude> + <resolutionEntryPointInclude>com.squareup.okhttp3:mockwebserver</resolutionEntryPointInclude> <resolutionEntryPointInclude>org.mapstruct:mapstruct-processor</resolutionEntryPointInclude> </resolutionEntryPointIncludes> <bannedDependencyResources> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index c90548e873..00ae7e8f30 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6255,6 +6255,12 @@ <groupId>com.squareup.okhttp3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>mockwebserver</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.12.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>junit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>junit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 6266b3ca5a..36e133540a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6236,6 +6236,17 @@ <artifactId>logging-interceptor</artifactId> <version>4.12.0</version> </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>mockwebserver</artifactId> + <version>4.12.0</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>com.squareup.okio</groupId> <artifactId>okio</artifactId> 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 c8035dffb3..cdf8d9706c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6236,6 +6236,17 @@ <artifactId>logging-interceptor</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.12.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>mockwebserver</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.12.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>junit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>junit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->