You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2023/03/10 11:40:27 UTC

[camel-spring-boot] 01/01: Merge branch 'release/4.0.0-M2'

This is an automated email from the ASF dual-hosted git repository.

gzurowski pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 9ee2936f5e9530127527eaca8c469e178bb775ea
Merge: 4a6af3dba08 f261b1f819d
Author: Gregor Zurowski <gr...@zurowski.org>
AuthorDate: Fri Mar 10 11:40:03 2023 +0000

    Merge branch 'release/4.0.0-M2'

 components-starter/camel-springdoc-starter/pom.xml |   3 +-
 .../camel-spring-boot-engine-starter/pom.xml       |   3 +-
 core-starter/camel-spring-boot-starter/pom.xml     |   3 +-
 core-starter/camel-spring-boot-xml-starter/pom.xml |   3 +-
 core/camel-spring-boot-xml/pom.xml                 |   5 +-
 core/camel-spring-boot/pom.xml                     |   5 +-
 core/pom.xml                                       |   3 +-
 dsl-starter/camel-componentdsl-starter/pom.xml     |   3 +-
 dsl-starter/camel-dsl-modeline-starter/pom.xml     |   3 +-
 dsl-starter/camel-endpointdsl-starter/pom.xml      |   3 +-
 dsl-starter/camel-groovy-dsl-starter/pom.xml       |   3 +-
 dsl-starter/camel-java-joor-dsl-starter/pom.xml    |   3 +-
 dsl-starter/camel-js-dsl-starter/pom.xml           |   3 +-
 dsl-starter/camel-jsh-dsl-starter/pom.xml          |   3 +-
 dsl-starter/camel-kotlin-dsl-starter/pom.xml       |   3 +-
 dsl-starter/camel-xml-io-dsl-starter/pom.xml       |   3 +-
 dsl-starter/camel-xml-jaxb-dsl-starter/pom.xml     |   3 +-
 dsl-starter/camel-yaml-dsl-starter/pom.xml         |   3 +-
 dsl-starter/pom.xml                                |   3 +-
 tests/camel-itest-spring-boot/pom.xml              |   3 +-
 tooling/camel-spring-boot-dependencies/pom.xml     | 836 ++++++++++-----------
 21 files changed, 440 insertions(+), 460 deletions(-)

diff --cc tooling/camel-spring-boot-dependencies/pom.xml
index 06afb58df61,515398b3ebf..da35e4e3305
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@@ -3805,8 -3835,18 +3805,8 @@@
        <dependency>
          <groupId>org.apache.camel</groupId>
          <artifactId>spi-annotations</artifactId>
-         <version>4.0.0-SNAPSHOT</version>
+         <version>4.0.0-M2</version>
        </dependency>
 -      <dependency>
 -        <groupId>org.apache.ftpserver</groupId>
 -        <artifactId>ftplet-api</artifactId>
 -        <version>1.1.2</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.apache.ftpserver</groupId>
 -        <artifactId>ftpserver-core</artifactId>
 -        <version>1.1.2</version>
 -      </dependency>
        <dependency>
          <groupId>org.apache.maven.plugin-tools</groupId>
          <artifactId>maven-plugin-annotations</artifactId>