From 1633e740059effbdc7e6b8c913bf8f78749e2a97 Mon Sep 17 00:00:00 2001
From: Baule A <65255151+baulea@users.noreply.github.com>
Date: Sun, 29 Oct 2023 15:24:49 +0100
Subject: [PATCH] upgrade multiple dependencies

upgrade dependencies in pom.xml:
- upgrade org.jukito:jukito from 1.4.1 to 1.5
- upgrade commons-io:commons-io:2.4 to 2.15.0
- upgrade com.aventstack:extentreports:4.0.9 to 5.0.9
- upgrade com.google.code.gson:gson:2.6.2 to 2.10.1
- upgrade com.google.protobuf:protobuf-java:3.13.0 to 3.24.4

with upgrade com.aventstack:extentreports:4.0.9 to 5.0.9 replace ExtentHtmlReporter with ExtentSparkReporter in ExtentReportsFactory.java

change in core/pom.xml:
- set test scope for org.jukito:jukito
- remove unused dependency com.fasterxml.jackson.datatype:jackson-datatype-jdk8
- remove direct dependency ch.qos.logback:logback-core, because it is a direct dependency from ch.qos.logback:logback-classic
- add direct dependency org.apache.httpcomponents:httpmime:4.5.12

change in kafka-testing/pom.xml:
- remove com.google.protobuf:protobuf-java-util
- remove dependency for com.github.os72:protoc-jar
---
 core/pom.xml                                  | 15 +++++--------
 .../domain/builders/ExtentReportsFactory.java | 21 ++++++++++---------
 kafka-testing/pom.xml                         |  9 --------
 pom.xml                                       | 21 ++++++++++---------
 4 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 8f0d66fb4..3aa0f7158 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -50,7 +50,6 @@
     <properties>
         <!-- This project properties -->
         <junit.version>4.12</junit.version>
-        <version.gson>2.6.2</version.gson>
     </properties>
 
     <repositories>
@@ -103,10 +102,6 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -127,6 +122,7 @@
         <dependency>
             <groupId>org.jukito</groupId>
             <artifactId>jukito</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
@@ -152,10 +148,6 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jdk8</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -164,7 +156,10 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jsmart</groupId>
diff --git a/core/src/main/java/org/jsmart/zerocode/core/domain/builders/ExtentReportsFactory.java b/core/src/main/java/org/jsmart/zerocode/core/domain/builders/ExtentReportsFactory.java
index 929e85092..434cf5590 100644
--- a/core/src/main/java/org/jsmart/zerocode/core/domain/builders/ExtentReportsFactory.java
+++ b/core/src/main/java/org/jsmart/zerocode/core/domain/builders/ExtentReportsFactory.java
@@ -1,7 +1,8 @@
 package org.jsmart.zerocode.core.domain.builders;
 
 import com.aventstack.extentreports.ExtentReports;
-import com.aventstack.extentreports.reporter.ExtentHtmlReporter;
+import com.aventstack.extentreports.reporter.ExtentSparkReporter;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -14,14 +15,14 @@
 public class ExtentReportsFactory {
     private static final org.slf4j.Logger LOGGER = getLogger(ExtentReportsFactory.class);
 
-    private static ExtentHtmlReporter extentHtmlReporter;
+    private static ExtentSparkReporter extentSparkReporter;
 
     private static ExtentReports extentReports;
 
     private static Map<Object, String> systemProperties = new HashMap<>();
 
     public static ExtentReports createReportTheme(String reportFileName) {
-        ExtentHtmlReporter extentHtmlReporter = createExtentHtmlReporter(reportFileName);
+        ExtentSparkReporter extentHtmlReporter = createExtentHtmlReporter(reportFileName);
 
         extentReports = new ExtentReports();
 
@@ -52,14 +53,14 @@ public static void attachSystemInfo() {
         extentReports.setSystemInfo("Java Vendor : ", javaVendor);
     }
 
-    public static ExtentHtmlReporter createExtentHtmlReporter(String reportFileName) {
-        extentHtmlReporter = new ExtentHtmlReporter(reportFileName);
+    public static ExtentSparkReporter createExtentHtmlReporter(String reportFileName) {
+        extentSparkReporter = new ExtentSparkReporter(reportFileName);
 
 
-        extentHtmlReporter.config().setDocumentTitle(REPORT_TITLE_DEFAULT);
-        extentHtmlReporter.config().setReportName(REPORT_DISPLAY_NAME_DEFAULT);
+        extentSparkReporter.config().setDocumentTitle(REPORT_TITLE_DEFAULT);
+        extentSparkReporter.config().setReportName(REPORT_DISPLAY_NAME_DEFAULT);
 
-        return extentHtmlReporter;
+        return extentSparkReporter;
     }
 
 
@@ -88,11 +89,11 @@ public static Map<Object, String> getSystemProperties() {
     }
 
     public static void reportName(String reportName) {
-        extentHtmlReporter.config().setReportName(reportName);
+        extentSparkReporter.config().setReportName(reportName);
     }
 
     public static String getReportName() {
-        return extentHtmlReporter.config().getReportName();
+        return extentSparkReporter.config().getReportName();
     }
 
 }
diff --git a/kafka-testing/pom.xml b/kafka-testing/pom.xml
index 3d34893d1..db278f9fe 100644
--- a/kafka-testing/pom.xml
+++ b/kafka-testing/pom.xml
@@ -31,10 +31,6 @@
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.google.protobuf</groupId>
-			<artifactId>protobuf-java-util</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.kafka</groupId>
 			<artifactId>kafka-clients</artifactId>
@@ -44,11 +40,6 @@
 			<artifactId>kafka-avro-serializer</artifactId>
 			<version>5.1.0</version>
 		</dependency>
-		<dependency>
-			<groupId>com.github.os72</groupId>
-			<artifactId>protoc-jar</artifactId>
-			<version>3.11.4</version>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/pom.xml b/pom.xml
index ad246b382..ec48bdc66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
         <guava.version>23.0</guava.version>
         <jsonassert.version>1.5.0</jsonassert.version>
         <classpath-explorer.version>1.0</classpath-explorer.version>
-        <jukito.version>1.4.1</jukito.version>
+        <jukito.version>1.5</jukito.version>
         <guice.version>4.0</guice.version>
         <commons-lang.version>2.6</commons-lang.version>
         <jayway-version>2.2.0</jayway-version>
@@ -77,13 +77,14 @@
         <wiremock.version>2.19.0</wiremock.version>
         <velocity.version>1.7</velocity.version>
         <jackson-dataformat-csv.version>2.9.8</jackson-dataformat-csv.version>
-        <commons-io.version>2.4</commons-io.version>
+        <commons-io.version>2.15.0</commons-io.version>
         <micro-simulator.version>1.1.10</micro-simulator.version>
         <httpclient.version>4.5</httpclient.version>
+        <httpmime.version>4.5.12</httpmime.version>
         <h2.db.version>1.4.191</h2.db.version>
-        <extentreports.version>4.0.9</extentreports.version>
+        <extentreports.version>5.0.9</extentreports.version>
         <version.kafka-clients>3.3.1</version.kafka-clients>
-        <version.gson>2.6.2</version.gson>
+        <version.gson>2.10.1</version.gson>
         <version.univocity-parsers>2.8.2</version.univocity-parsers>
 
         <!-- Maven plugins, build properties  -->
@@ -100,7 +101,7 @@
 
         <!-- Release Build will not fail if error occurs during javadoc generation -->
         <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
-        <google.protobuf.version>3.13.0</google.protobuf.version>
+        <google.protobuf.version>3.24.4</google.protobuf.version>
         <version.snappy-java>1.1.8.4</version.snappy-java>
     </properties>
 
@@ -176,11 +177,6 @@
                 <artifactId>logback-classic</artifactId>
                 <version>${logback.version}</version>
             </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-core</artifactId>
-                <version>${logback.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
@@ -253,6 +249,11 @@
                 <artifactId>httpclient</artifactId>
                 <version>${httpclient.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpmime</artifactId>
+                <version>${httpmime.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jsmart</groupId>
                 <artifactId>micro-simulator</artifactId>