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 11:42:57 UTC
[camel-k-runtime] 02/02: chore(deps): remove duplication
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.17.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit fc3d7d627f79a22df1abd6c259406fe4dbe1255a
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 1c36a0dc..6a86f50f 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.14.2</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 dd41d176..b2072c4a 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>