This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 234fdf0df5433d93c4e31af257512f03acedff0c Author: Luca Burgazzoli <[email protected]> AuthorDate: Mon Dec 14 15:48:39 2020 +0100 Update to camel 3.7.0 --- .github/workflows/ci-build-camel-master.yaml | 16 +++++++-------- camel-k-loader-yaml/impl-common/pom.xml | 7 ++++--- pom.xml | 30 +++++++++++++++++++++++----- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci-build-camel-master.yaml b/.github/workflows/ci-build-camel-master.yaml index 799214d..467449d 100644 --- a/.github/workflows/ci-build-camel-master.yaml +++ b/.github/workflows/ci-build-camel-master.yaml @@ -54,17 +54,17 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Build camel (master) - run: | - git clone --depth 1 --branch master https://github.com/apache/camel.git \ - && cd camel \ - && echo "Current Camel commit:" $(git rev-parse HEAD) \ - && ./mvnw clean install -Pfastinstall +# - name: Build camel (master) +# run: | +# git clone --depth 1 --branch master https://github.com/apache/camel.git \ +# && cd camel \ +# && echo "Current Camel commit:" $(git rev-parse HEAD) \ +# && ./mvnw ${MAVEN_ARGS} clean install -Pfastinstall - name: Build camel-quarkus (camel-master) run: | git clone --depth 1 --branch camel-master https://github.com/apache/camel-quarkus.git \ && cd camel-quarkus \ && echo "Current Camel Quarkus commit:" $(git rev-parse HEAD) \ - && ./mvnw clean install -Dquickly + && ./mvnw ${MAVEN_ARGS} clean install -Dquickly -s $(pwd)/settings-camel-3.7.0.xml - name: Build camel-k-runtime - run: ./mvnw -Dcheckstyle.failOnViolation=true -Psourcecheck clean install + run: ./mvnw ${MAVEN_ARGS} -Dcheckstyle.failOnViolation=true -Psourcecheck clean install diff --git a/camel-k-loader-yaml/impl-common/pom.xml b/camel-k-loader-yaml/impl-common/pom.xml index 0700dca..2ef00ef 100644 --- a/camel-k-loader-yaml/impl-common/pom.xml +++ b/camel-k-loader-yaml/impl-common/pom.xml @@ -54,10 +54,11 @@ <artifactId>jackson-dataformat-yaml</artifactId> </dependency> + <!-- JAXB APIs are required by jackson-dataformat-yaml --> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>${jaxb-api-version}</version> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>${jakarta-jaxb-version}</version> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index 91bdcbd..57e7eda 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>camel-dependencies</artifactId> - <version>3.7.0-SNAPSHOT</version> + <version>3.7.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -38,20 +38,18 @@ <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> - <camel-version>3.7.0-SNAPSHOT</camel-version> + <camel-version>3.7.0</camel-version> <!-- quarkus --> <camel-quarkus-version>1.5.0-SNAPSHOT</camel-quarkus-version> <graalvm-version>20.2.0</graalvm-version> - <quarkus-version>1.10.2.Final</quarkus-version> + <quarkus-version>1.10.3.Final</quarkus-version> <!-- camel-k --> <joor-version>0.9.13</joor-version> <groovy-version>3.0.7</groovy-version> <kotlin-version>1.4.21</kotlin-version> <spock-version>2.0-M4-groovy-3.0</spock-version> - <jaxb-api-version>2.3.1</jaxb-api-version> - <jaxb-core-version>2.3.0.1</jaxb-core-version> <immutables-version>2.8.9-ea-1</immutables-version> <semver4j-version>3.1.0</semver4j-version> @@ -334,6 +332,17 @@ <repositories> <repository> + <id>camel-3.7.0</id> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + <url>https://repository.apache.org/content/repositories/orgapachecamel-1263</url> + <layout>default</layout> + </repository> + <repository> <id>apache.snapshots</id> <url>https://repository.apache.org/snapshots/</url> <name>Apache Snapshot Repo</name> @@ -348,6 +357,17 @@ <pluginRepositories> <pluginRepository> + <id>camel-3.7.0</id> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + <url>https://repository.apache.org/content/repositories/orgapachecamel-1263</url> + <layout>default</layout> + </pluginRepository> + <pluginRepository> <id>apache.snapshots</id> <url>https://repository.apache.org/snapshots/</url> <snapshots>
