You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/06/05 10:09:05 UTC
[camel-kamelets] branch main updated (6cd03f63 -> 40ef83ff)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
from 6cd03f63 Regen SBOM from commit 76b527bd4c28b66d324149b710fad7d00f958212
new 64adc035 Align jackson version with core camel project
new 40ef83ff Align jackson version with core camel project
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:
library/camel-kamelets-catalog/pom.xml | 18 +++++++++---------
library/camel-kamelets-utils/pom.xml | 10 +++++-----
pom.xml | 12 +++---------
3 files changed, 17 insertions(+), 23 deletions(-)
[camel-kamelets] 02/02: Align jackson version with core camel project
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 40ef83ff63ae49f06633c84ee48f26691415f8c0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jun 5 11:39:28 2023 +0200
Align jackson version with core camel project
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
library/camel-kamelets-catalog/pom.xml | 18 +++++++++---------
library/camel-kamelets-utils/pom.xml | 10 +++++-----
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/library/camel-kamelets-catalog/pom.xml b/library/camel-kamelets-catalog/pom.xml
index ce0ec444..ea227540 100644
--- a/library/camel-kamelets-catalog/pom.xml
+++ b/library/camel-kamelets-catalog/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.kamelets</groupId>
@@ -61,7 +61,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson2-version}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
@@ -71,32 +71,32 @@
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson2-version}</version>
</dependency>
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
- <version>${classgraph.version}</version>
+ <version>${classgraph-version}</version>
</dependency>
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
+ <version>${log4j2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
+ <version>${log4j2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
- <version>${log4j.version}</version>
+ <version>${log4j2-version}</version>
<scope>test</scope>
</dependency>
@@ -104,13 +104,13 @@
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
- <version>${junit.jupiter.version}</version>
+ <version>${junit-jupiter-version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
- <version>${junit.jupiter.version}</version>
+ <version>${junit-jupiter-version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/library/camel-kamelets-utils/pom.xml b/library/camel-kamelets-utils/pom.xml
index 0749c1ac..05e29c67 100644
--- a/library/camel-kamelets-utils/pom.xml
+++ b/library/camel-kamelets-utils/pom.xml
@@ -94,14 +94,14 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>${junit.jupiter.version}</version>
+ <version>${junit-jupiter-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>${junit.jupiter.version}</version>
+ <version>${junit-jupiter-version}</version>
<scope>test</scope>
</dependency>
@@ -109,19 +109,19 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
+ <version>${log4j2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
+ <version>${log4j2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
- <version>${log4j.version}</version>
+ <version>${log4j2-version}</version>
<scope>test</scope>
</dependency>
[camel-kamelets] 01/02: Align jackson version with core camel project
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 64adc035a07118e4435afb378a52523db8f35496
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jun 5 11:25:05 2023 +0200
Align jackson version with core camel project
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
pom.xml | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 180e696a..47e0b7d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>26</version>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-dependencies</artifactId>
+ <version>4.0.0-M3</version>
</parent>
<groupId>org.apache.camel.kamelets</groupId>
@@ -61,13 +61,7 @@
<cyclonedx-maven-plugin-version>2.7.8</cyclonedx-maven-plugin-version>
<camel.version>4.0.0-M3</camel.version>
- <slf4j.version>2.0.6</slf4j.version>
- <log4j.version>2.20.0</log4j.version>
- <jackson.version>2.15.0</jackson.version>
<camel.k.extension.version>6.1.1</camel.k.extension.version>
- <commons.io.version>2.11.0</commons.io.version>
- <junit.jupiter.version>5.9.1</junit.jupiter.version>
- <classgraph.version>4.8.157</classgraph.version>
<!-- Versions used inside Kamelets (add them also to the dependencyManagement section and the groovy script below) -->
<!-- These properties must keep this same format "version.<groupId>.<artifactId>" -->