This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0643029765a4cc2430961ac122e97fc22506823e Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Wed Jul 12 09:22:37 2023 +0200 fixed optaplanner version conflict + generated files --- poms/bom/pom.xml | 8 ++++++++ poms/bom/src/main/generated/flattened-full-pom.xml | 10 +++++++++- poms/bom/src/main/generated/flattened-reduced-pom.xml | 15 +++++++++------ .../src/main/generated/flattened-reduced-verbose-pom.xml | 15 +++++++++------ 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 3b70a8ccb2..b5f0040b28 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -2000,6 +2000,14 @@ <groupId>org.optaplanner</groupId> <artifactId>optaplanner-core</artifactId> </exclusion> + <exclusion> + <groupId>org.optaplanner</groupId> + <artifactId>optaplanner-core-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.optaplanner</groupId> + <artifactId>optaplanner-persistence-common</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 25d4313c77..ba936a2e5c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-activemq</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.0.0-RC1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.0.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -1938,6 +1938,14 @@ <groupId>org.optaplanner</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>optaplanner-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </exclusion> + <exclusion> + <groupId>org.optaplanner</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>optaplanner-core-impl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>org.optaplanner</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>optaplanner-persistence-common</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 4e382a7d23..8fa9b76c43 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-activemq</artifactId> - <version>4.0.0-RC1</version> + <version>4.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -1938,6 +1938,14 @@ <groupId>org.optaplanner</groupId> <artifactId>optaplanner-core</artifactId> </exclusion> + <exclusion> + <groupId>org.optaplanner</groupId> + <artifactId>optaplanner-core-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.optaplanner</groupId> + <artifactId>optaplanner-persistence-common</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -6493,11 +6501,6 @@ <artifactId>javassist</artifactId> <version>3.28.0-GA</version> </dependency> - <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-script-util</artifactId> - <version>1.8.22</version> - </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-scripting-jvm</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 91f0a1f31f..37c644a57b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-activemq</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.0.0-RC1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.0.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -1938,6 +1938,14 @@ <groupId>org.optaplanner</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>optaplanner-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </exclusion> + <exclusion> + <groupId>org.optaplanner</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>optaplanner-core-impl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>org.optaplanner</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>optaplanner-persistence-common</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> </exclusions> </dependency> <dependency> @@ -6493,11 +6501,6 @@ <artifactId>javassist</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>3.28.0-GA</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>kotlin-script-util</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.8.22</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->