updated spring boot version to 3.3.6. snyk reported security vulnerab…

…ilities in spring boot versions
harshaghanta · Dec 11, 2024 · b136dca · b136dca
1 parent f5375f5
commit b136dca
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 27 deletions.
diff --git a/src/BuildingBlocks/EventBus/eventbus/pom.xml b/src/BuildingBlocks/EventBus/eventbus/pom.xml
@@ -7,7 +7,7 @@
   <parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.0</version>
+		<version>3.3.6</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
   <properties>

diff --git a/src/Services/Ordering/orderapi/pom.xml b/src/Services/Ordering/orderapi/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.1</version>
+		<version>3.3.6</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.eshoponcontainers</groupId>

diff --git a/src/Services/Ordering/ordering-backgroundtasks/pom.xml b/src/Services/Ordering/ordering-backgroundtasks/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.9</version>
+		<version>3.3.6</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.eshoponcontainers</groupId>
@@ -58,7 +58,7 @@
 		<dependency>
 			<groupId>io.opentelemetry.javaagent</groupId>
 			<artifactId>opentelemetry-javaagent</artifactId>
-			<version>1.24.0</version>
+			<version>2.10.0</version>
 		</dependency>
 
 	</dependencies>

diff --git a/src/Services/Ordering/ordering-infrastructure/pom.xml b/src/Services/Ordering/ordering-infrastructure/pom.xml
@@ -18,7 +18,7 @@
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
 
-    <spring.version>5.3.31</spring.version>
+    <spring.version>6.1.15</spring.version>
     <hibernate.version>6.3.0.Final</hibernate.version>
   </properties>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>6.1.2</version>
+      <version>${spring.version}</version>
     </dependency>
 
     <dependency>

diff --git a/src/Services/Ordering/ordering-notification/pom.xml b/src/Services/Ordering/ordering-notification/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.3</version>
+		<version>3.3.6</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.eshoponcontainers</groupId>

diff --git a/src/Services/Payment/paymentapi/pom.xml b/src/Services/Payment/paymentapi/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.9</version>
+		<version>3.3.6</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.eshoponcontainers</groupId>
@@ -52,7 +52,7 @@
 		<dependency>
 			<groupId>io.opentelemetry.javaagent</groupId>
 			<artifactId>opentelemetry-javaagent</artifactId>
-			<version>1.24.0</version>
+			<version>2.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>

diff --git a/src/Services/Webhooks/webhooks-api/pom.xml b/src/Services/Webhooks/webhooks-api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.9</version>
+		<version>3.3.6</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.eshoponcontainers</groupId>

diff --git a/src/Services/Webhooks/webhooks-client/pom.xml b/src/Services/Webhooks/webhooks-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.3</version>
+		<version>3.3.6</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.eshoponcontainers</groupId>
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>io.opentelemetry.javaagent</groupId>
 			<artifactId>opentelemetry-javaagent</artifactId>
-			<version>1.24.0</version>
+			<version>2.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/src/Services/basketapi/pom.xml b/src/Services/basketapi/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>io.opentelemetry.javaagent</groupId>
 			<artifactId>opentelemetry-javaagent</artifactId>
-			<version>1.24.0</version>
+			<version>2.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>

diff --git a/src/Services/catalogapi/pom.xml b/src/Services/catalogapi/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.0</version>
+		<version>3.3.6</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.eshoponcontainers</groupId>
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>io.opentelemetry.javaagent</groupId>
 			<artifactId>opentelemetry-javaagent</artifactId>
-			<version>1.24.0</version>
+			<version>2.10.0</version>
 		</dependency>
 
 		<!-- add actuator -->
@@ -76,7 +76,7 @@
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-			<version>2.2.0</version>
+			<version>2.7.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -102,11 +102,11 @@
 		</dependency>
 
 
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-io</artifactId>
 			<version>1.3.2</version>
-		</dependency>
+		</dependency> -->
 
 
 		<dependency>

diff --git a/.../catalogapi/src/main/java/com/eshoponcontainers/catalogapi/controllers/PicController.java b/.../catalogapi/src/main/java/com/eshoponcontainers/catalogapi/controllers/PicController.java
@@ -4,11 +4,6 @@
 import java.io.InputStream;
 import java.util.Optional;
 
-import com.eshoponcontainers.catalogapi.entities.CatalogItem;
-import com.eshoponcontainers.catalogapi.repositories.CatalogItemRepository;
-
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -18,6 +13,9 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.eshoponcontainers.catalogapi.entities.CatalogItem;
+import com.eshoponcontainers.catalogapi.repositories.CatalogItemRepository;
+
 import lombok.extern.slf4j.Slf4j;
 
 @RestController
@@ -41,8 +39,8 @@ public ResponseEntity<?> getItemPic(@PathVariable("id") Integer id) throws IOExc
             ResponseEntity<byte[]> responseEntity;
             final HttpHeaders headers = new HttpHeaders();
 
-            byte[] media = IOUtils.toByteArray(picStream);
-            String extension = FilenameUtils.getExtension(pictureFileName);
+            byte[] media = picStream.readAllBytes();
+            String extension = pictureFileName.substring(pictureFileName.lastIndexOf('.') + 1);
             MediaType mediaType = getMediaTypeByExtension(extension);
             headers.setContentType(mediaType);
             responseEntity = new ResponseEntity<>(media, headers, HttpStatus.OK);

diff --git a/src/Web/WebSpa/server/pom.xml b/src/Web/WebSpa/server/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.2</version>
+		<version>3.3.6</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.eshoponcontainers</groupId>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>io.opentelemetry.javaagent</groupId>
 			<artifactId>opentelemetry-javaagent</artifactId>
-			<version>1.24.0</version>
+			<version>2.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>