This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3cdbc79682bbb168cd3e59db47054c71f708108b Author: James Netherton <[email protected]> AuthorDate: Tue Apr 5 07:23:48 2022 +0100 Manage spring-jdbc and spring-orm in the BOM --- poms/bom/pom.xml | 10 ++++ poms/bom/src/main/generated/flattened-full-pom.xml | 54 +++++++++++++--------- .../src/main/generated/flattened-reduced-pom.xml | 10 ++++ .../generated/flattened-reduced-verbose-pom.xml | 48 +++++++++++-------- 4 files changed, 81 insertions(+), 41 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 9a14ceab16..6e2420801a 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -10260,11 +10260,21 @@ <artifactId>spring-expression</artifactId> <version>${spring.version}</version> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>${spring.version}</version> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-messaging</artifactId> <version>${spring.version}</version> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>${spring.version}</version> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index a59106671f..fb52bb0eeb 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -10222,54 +10222,64 @@ </dependency> <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10264 --> - <artifactId>spring-messaging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10265 --> + <artifactId>spring-jdbc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10265 --> <version>5.3.16</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10266 --> </dependency> <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10269 --> - <artifactId>spring-tx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10270 --> + <artifactId>spring-messaging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10270 --> <version>5.3.16</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10271 --> </dependency> <dependency> - <groupId>org.threeten</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10274 --> - <artifactId>threetenbp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10275 --> - <version>1.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10276 --> + <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10274 --> + <artifactId>spring-orm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10275 --> + <version>5.3.16</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10276 --> </dependency> <dependency> - <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10279 --> - <artifactId>core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10280 --> - <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10281 --> + <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10279 --> + <artifactId>spring-tx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10280 --> + <version>5.3.16</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10281 --> </dependency> <dependency> - <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10284 --> - <artifactId>geth</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10285 --> - <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10286 --> + <groupId>org.threeten</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10284 --> + <artifactId>threetenbp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10285 --> + <version>1.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10286 --> </dependency> <dependency> <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10289 --> - <artifactId>parity</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10290 --> + <artifactId>core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10290 --> <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10291 --> </dependency> <dependency> <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10294 --> - <artifactId>quorum</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10295 --> - <version>0.8.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10296 --> + <artifactId>geth</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10295 --> + <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10296 --> </dependency> <dependency> - <groupId>xalan</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10299 --> - <artifactId>xalan</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10300 --> - <version>2.7.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10301 --> + <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10299 --> + <artifactId>parity</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10300 --> + <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10301 --> + </dependency> + <dependency> + <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10304 --> + <artifactId>quorum</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10305 --> + <version>0.8.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10306 --> + </dependency> + <dependency> + <groupId>xalan</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10309 --> + <artifactId>xalan</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10310 --> + <version>2.7.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10311 --> <exclusions> <exclusion> - <groupId>xml-apis</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10304 --> - <artifactId>xml-apis</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10305 --> + <groupId>xml-apis</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10314 --> + <artifactId>xml-apis</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10315 --> </exclusion> </exclusions> </dependency> <dependency> - <groupId>xerces</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10310 --> - <artifactId>xercesImpl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10311 --> - <version>2.12.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10312 --> + <groupId>xerces</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10320 --> + <artifactId>xercesImpl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10321 --> + <version>2.12.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10322 --> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId><!-- org.codehaus.groovy:groovy-bom:3.0.8, line 839 --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 7a362390b7..1ee823456a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -10195,11 +10195,21 @@ <artifactId>spring-expression</artifactId> <version>5.3.16</version> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>5.3.16</version> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-messaging</artifactId> <version>5.3.16</version> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>5.3.16</version> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</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 9fbf1278ac..9f7e2d6a48 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -10197,47 +10197,57 @@ </dependency> <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10264 --> - <artifactId>spring-messaging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10265 --> + <artifactId>spring-jdbc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10265 --> <version>5.3.16</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10266 --> </dependency> <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10269 --> - <artifactId>spring-tx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10270 --> + <artifactId>spring-messaging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10270 --> <version>5.3.16</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10271 --> </dependency> <dependency> - <groupId>org.threeten</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10274 --> - <artifactId>threetenbp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10275 --> - <version>1.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10276 --> + <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10274 --> + <artifactId>spring-orm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10275 --> + <version>5.3.16</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10276 --> </dependency> <dependency> - <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10279 --> - <artifactId>core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10280 --> - <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10281 --> + <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10279 --> + <artifactId>spring-tx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10280 --> + <version>5.3.16</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10281 --> </dependency> <dependency> - <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10284 --> - <artifactId>geth</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10285 --> - <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10286 --> + <groupId>org.threeten</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10284 --> + <artifactId>threetenbp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10285 --> + <version>1.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10286 --> </dependency> <dependency> <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10289 --> - <artifactId>parity</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10290 --> + <artifactId>core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10290 --> <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10291 --> </dependency> <dependency> <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10294 --> - <artifactId>quorum</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10295 --> - <version>0.8.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10296 --> + <artifactId>geth</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10295 --> + <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10296 --> </dependency> <dependency> - <groupId>xalan</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10299 --> - <artifactId>xalan</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10300 --> - <version>2.7.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10301 --> + <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10299 --> + <artifactId>parity</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10300 --> + <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10301 --> + </dependency> + <dependency> + <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10304 --> + <artifactId>quorum</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10305 --> + <version>0.8.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10306 --> + </dependency> + <dependency> + <groupId>xalan</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10309 --> + <artifactId>xalan</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10310 --> + <version>2.7.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10311 --> <exclusions> <exclusion> - <groupId>xml-apis</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10304 --> - <artifactId>xml-apis</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10305 --> + <groupId>xml-apis</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10314 --> + <artifactId>xml-apis</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:2.7.2-SNAPSHOT, line 10315 --> </exclusion> </exclusions> </dependency>
