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 2023/03/24 13:59:13 UTC
[camel-k-runtime] branch release-1.15.x updated (91bf1946 -> 1f2e5884)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch release-1.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
from 91bf1946 fix(ci): publish distro within the rest of modules
new 1a26f2b1 feat(ci): add a check to avoid duplicate dependencies
new 2824005b chore(deps): remove duplication
new 1f2e5884 chore(deps): align Quarkus
The 3 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:
pom.xml | 3 +-
support/camel-k-maven-logging/pom.xml | 64 +++++++++++------------------------
support/camel-k-test/pom.xml | 4 +++
3 files changed, 26 insertions(+), 45 deletions(-)
[camel-k-runtime] 03/03: chore(deps): align Quarkus
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.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 1f2e588405eeb2b584c5a25dbc8491f9a09b4b4c
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Mar 24 13:29:08 2023 +0100
chore(deps): align Quarkus
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index efe55b97..36b7aee4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<!-- quarkus -->
<camel-quarkus-version>2.13.1</camel-quarkus-version>
- <quarkus-version>2.13.3.Final</quarkus-version>
+ <quarkus-version>2.13.4.Final</quarkus-version>
<quarkus-platform-version>2.13.4.Final</quarkus-platform-version>
<!-- The quarkus camel bom may differ from quarkus platfom -->
<quarkus-camel-bom-version>2.13.4.Final</quarkus-camel-bom-version>
[camel-k-runtime] 01/03: feat(ci): add a check to avoid duplicate dependencies
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.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 1a26f2b1bc384e8ed5454fd48d9b6a34d2736d68
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Mar 24 11:45:59 2023 +0100
feat(ci): add a check to avoid duplicate dependencies
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 50dde6a3..efe55b97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,7 @@
<requireMavenVersion>
<version>${maven-version}</version>
</requireMavenVersion>
+ <dependencyConvergence/>
</rules>
</configuration>
</execution>
[camel-k-runtime] 02/03: chore(deps): remove duplication
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.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 2824005b43f4fec9ccd114285308c996f8c82fd5
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Mar 24 11:46:15 2023 +0100
chore(deps): remove duplication
---
support/camel-k-maven-logging/pom.xml | 64 +++++++++++------------------------
support/camel-k-test/pom.xml | 4 +++
2 files changed, 24 insertions(+), 44 deletions(-)
diff --git a/support/camel-k-maven-logging/pom.xml b/support/camel-k-maven-logging/pom.xml
index 65191287..a715f8d1 100644
--- a/support/camel-k-maven-logging/pom.xml
+++ b/support/camel-k-maven-logging/pom.xml
@@ -28,49 +28,6 @@
<description>Set of dependencies used for structural logging of Maven output</description>
<packaging>pom</packaging>
- <properties>
- <!-- Maven structural logging -->
- <logback-version>1.2.11</logback-version>
- <logstash-logback-version>7.2</logstash-logback-version>
- <jackson-version>2.13.4</jackson-version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <!-- structural Maven logging -->
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${logback-version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
- </dependency>
- <dependency>
- <groupId>net.logstash.logback</groupId>
- <artifactId>logstash-logback-encoder</artifactId>
- <version>${logstash-logback-version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson-version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson-version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson-version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<defaultGoal>generate-resources</defaultGoal>
<plugins>
@@ -117,30 +74,49 @@
</build>
<dependencies>
- <!-- structural logging -->
+ <!-- structural logging: we only need this dependencies to be part of the overlay package, reason why are marked as provided -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
+ <version>${logback-version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <version>${logback-version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
+ <version>7.3</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
diff --git a/support/camel-k-test/pom.xml b/support/camel-k-test/pom.xml
index 447feffc..ef3a5aa7 100644
--- a/support/camel-k-test/pom.xml
+++ b/support/camel-k-test/pom.xml
@@ -52,6 +52,10 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ </exclusion>
</exclusions>
</dependency>