From 571cf9038c263bdcbf0810ce342af048d7c6d007 Mon Sep 17 00:00:00 2001
From: riccardomodanese <riccardo.modanese@eurotech.com>
Date: Wed, 20 Nov 2024 10:58:56 +0100
Subject: [PATCH] :feat: update Camel/Spring
Signed-off-by: riccardomodanese <riccardo.modanese@eurotech.com>
---
consumer/lifecycle-app/pom.xml | 15 ++++++++-------
consumer/telemetry-app/pom.xml | 15 ++++++++-------
pom.xml | 6 +++---
service/authentication-app/pom.xml | 15 ++++++++-------
4 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/consumer/lifecycle-app/pom.xml b/consumer/lifecycle-app/pom.xml
index 4318a93f7f3..017a07fbc0f 100644
--- a/consumer/lifecycle-app/pom.xml
+++ b/consumer/lifecycle-app/pom.xml
@@ -469,13 +469,6 @@
</filter>
</filters>
<transformers>
- <!-- added by 2.7 -->
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports</resource>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports</resource>
- </transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
<resource>META-INF/persistence.xml</resource>
</transformer>
@@ -507,6 +500,14 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/org.eclipse.kapua.translator.Translator</resource>
</transformer>
+
+ <!-- add by 2.7 -->
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports</resource>
+ </transformer>
<!--
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.handlers</resource>
diff --git a/consumer/telemetry-app/pom.xml b/consumer/telemetry-app/pom.xml
index 8e4c240d396..c2c247e8dce 100644
--- a/consumer/telemetry-app/pom.xml
+++ b/consumer/telemetry-app/pom.xml
@@ -421,13 +421,6 @@
</filter>
</filters>
<transformers>
- <!-- added by 2.7 -->
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports</resource>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports</resource>
- </transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
<resource>META-INF/persistence.xml</resource>
</transformer>
@@ -459,6 +452,14 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/org.eclipse.kapua.translator.Translator</resource>
</transformer>
+
+ <!-- add by 2.7 -->
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports</resource>
+ </transformer>
</transformers>
<artifactSet/>
<outputFile>${project.build.directory}/kapua-consumer-telemetry-${project.version}-app.jar</outputFile>
diff --git a/pom.xml b/pom.xml
index 86ab486bca2..5f2c0c56321 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,9 +47,9 @@
<console.maven.toolchain.jdk.version>8</console.maven.toolchain.jdk.version>
<!-- Dependencies versions -->
- <camel.version>3.21.0</camel.version> <!-- latest 3.11.0 -->
- <spring.version>5.3.23</spring.version> <!-- latest 5.3.8 -->
- <spring-security.version>5.7.5</spring-security.version> <!-- latest 5.5.1 -->
+ <camel.version>3.22.2</camel.version>
+ <spring.version>5.3.39</spring.version>
+ <spring-security.version>5.8.16</spring-security.version>
<spring-boot.version>2.7.18</spring-boot.version>
<aopalliance.version>1.0</aopalliance.version>
diff --git a/service/authentication-app/pom.xml b/service/authentication-app/pom.xml
index 0644d72f988..61961c6a479 100644
--- a/service/authentication-app/pom.xml
+++ b/service/authentication-app/pom.xml
@@ -337,13 +337,6 @@
</filter>
</filters>
<transformers>
- <!-- added by 2.7 -->
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports</resource>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports</resource>
- </transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
<resource>META-INF/persistence.xml</resource>
</transformer>
@@ -375,6 +368,14 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/org.eclipse.kapua.translator.Translator</resource>
</transformer>
+
+ <!-- add by 2.7 -->
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports</resource>
+ </transformer>
</transformers>
<outputFile>${project.build.directory}/kapua-service-authentication-${project.version}-app.jar</outputFile>
</configuration>