You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2022/05/31 08:09:11 UTC
[camel-k-runtime] branch release-1.13.x updated (b3d3884e -> 10801a63)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch release-1.13.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
from b3d3884e Fix the Camel-K version for the doc generation (#819)
new 7974f486 fix(deps): non-productized dependencies with their community correspondent
new 10801a63 fix: backport divergencies located in 1.14.x
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
itests/camel-k-itests-loader-groovy/pom.xml | 14 ---------
itests/camel-k-itests-runtime/pom.xml | 27 -----------------
pom.xml | 45 ++++++++++-------------------
support/camel-k-maven-plugin/pom.xml | 4 +--
support/camel-k-runtime-bom/pom.xml | 19 ++++++++----
5 files changed, 30 insertions(+), 79 deletions(-)
[camel-k-runtime] 02/02: fix: backport divergencies located in 1.14.x
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.13.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 10801a63f695ef05588b5b2b44c1d843887a82c8
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue May 31 10:08:45 2022 +0200
fix: backport divergencies located in 1.14.x
---
itests/camel-k-itests-loader-groovy/pom.xml | 14 ---------
itests/camel-k-itests-runtime/pom.xml | 27 -----------------
pom.xml | 45 ++++++++++-------------------
support/camel-k-maven-plugin/pom.xml | 2 --
support/camel-k-runtime-bom/pom.xml | 19 ++++++++----
5 files changed, 29 insertions(+), 78 deletions(-)
diff --git a/itests/camel-k-itests-loader-groovy/pom.xml b/itests/camel-k-itests-loader-groovy/pom.xml
index cca94fa0..88164a92 100644
--- a/itests/camel-k-itests-loader-groovy/pom.xml
+++ b/itests/camel-k-itests-loader-groovy/pom.xml
@@ -69,20 +69,6 @@
<scope>test</scope>
</dependency>
- <!-- The following dependencies guarantee that this module is built after them. -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-groovy-dsl</artifactId>
- <version>${camel-version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</project>
diff --git a/itests/camel-k-itests-runtime/pom.xml b/itests/camel-k-itests-runtime/pom.xml
index 28d6fc6c..6a931e25 100644
--- a/itests/camel-k-itests-runtime/pom.xml
+++ b/itests/camel-k-itests-runtime/pom.xml
@@ -67,33 +67,6 @@
<scope>test</scope>
</dependency>
- <!-- The following dependencies guarantee that this module is built after them. -->
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-groovy-dsl</artifactId>
- <version>${camel-version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 75c762dd..0b957b70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,8 +42,8 @@
<!-- quarkus -->
<camel-quarkus-version>2.8.0</camel-quarkus-version>
- <graalvm-version>22.0.0</graalvm-version>
<quarkus-version>2.8.0.Final</quarkus-version>
+ <quarkus-native-builder-image>quay.io/quarkus/ubi-quarkus-native-image:22.0.0-java11</quarkus-native-builder-image>
<!-- camel-k -->
<groovy-version>3.0.10</groovy-version>
@@ -403,19 +403,19 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-bom</artifactId>
- <version>${quarkus-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bom</artifactId>
- <version>${camel-quarkus-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
+ <groupId>io.quarkus.platform</groupId>
+ <artifactId>quarkus-bom</artifactId>
+ <version>${quarkus-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkus.platform</groupId>
+ <artifactId>quarkus-camel-bom</artifactId>
+ <version>${quarkus-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- components -->
<dependency>
@@ -637,19 +637,6 @@
<version>${project.version}</version>
</dependency>
- <!-- graalvm -->
- <dependency>
- <groupId>org.graalvm.js</groupId>
- <artifactId>js</artifactId>
- <version>${graalvm-version}</version>
- </dependency>
- <dependency>
- <groupId>org.graalvm.nativeimage</groupId>
- <artifactId>svm</artifactId>
- <version>${graalvm-version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- groovy -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -990,7 +977,7 @@
<properties>
<quarkus.native.container-build>true</quarkus.native.container-build>
<quarkus.native.container-runtime>docker</quarkus.native.container-runtime>
- <quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-native-image:${graalvm-version}-java11</quarkus.native.builder-image>
+ <quarkus.native.builder-image>${quarkus-native-builder-image}</quarkus.native.builder-image>
</properties>
</profile>
<profile>
@@ -1003,7 +990,7 @@
<properties>
<quarkus.native.container-build>true</quarkus.native.container-build>
<quarkus.native.container-runtime>podman</quarkus.native.container-runtime>
- <quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-native-image:${graalvm-version}-java11</quarkus.native.builder-image>
+ <quarkus.native.builder-image>${quarkus-native-builder-image}</quarkus.native.builder-image>
</properties>
</profile>
</profiles>
diff --git a/support/camel-k-maven-plugin/pom.xml b/support/camel-k-maven-plugin/pom.xml
index a9eb672e..e611376f 100644
--- a/support/camel-k-maven-plugin/pom.xml
+++ b/support/camel-k-maven-plugin/pom.xml
@@ -87,7 +87,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-catalog</artifactId>
- <version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -102,7 +101,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog</artifactId>
- <version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml
index ac11c9fd..954100a9 100644
--- a/support/camel-k-runtime-bom/pom.xml
+++ b/support/camel-k-runtime-bom/pom.xml
@@ -97,12 +97,19 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-bom</artifactId>
- <version>${quarkus-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
+ <groupId>io.quarkus.platform</groupId>
+ <artifactId>quarkus-bom</artifactId>
+ <version>${quarkus-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkus.platform</groupId>
+ <artifactId>quarkus-camel-bom</artifactId>
+ <version>${quarkus-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-core-api</artifactId>
[camel-k-runtime] 01/02: fix(deps): non-productized dependencies with their community correspondent
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.13.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 7974f4869f821c6b7c97f03c7d68ff7745fcf6b5
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue May 31 09:50:20 2022 +0200
fix(deps): non-productized dependencies with their community correspondent
---
support/camel-k-maven-plugin/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/support/camel-k-maven-plugin/pom.xml b/support/camel-k-maven-plugin/pom.xml
index 4883c30d..a9eb672e 100644
--- a/support/camel-k-maven-plugin/pom.xml
+++ b/support/camel-k-maven-plugin/pom.xml
@@ -82,12 +82,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-openapi-rest-dsl-generator</artifactId>
- <version>${camel-version}</version>
+ <version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-catalog</artifactId>
- <version>${camel-version}</version>
+ <version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog</artifactId>
- <version>${camel-version}</version>
+ <version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>