Skip to content

Commit

Permalink
Merge pull request #609 from baulea/maven_dependencies
Browse files Browse the repository at this point in the history
PR - Maven dependencies to latest
  • Loading branch information
authorjapps authored Feb 25, 2024
2 parents 1122880 + a485ce0 commit 61e8752
Show file tree
Hide file tree
Showing 6 changed files with 108 additions and 89 deletions.
30 changes: 5 additions & 25 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<properties>
<!-- This project properties -->
<junit.version>4.12</junit.version>
<version.gson>2.6.2</version.gson>
</properties>

<repositories>
Expand Down Expand Up @@ -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>
Expand All @@ -127,6 +122,7 @@
<dependency>
<groupId>org.jukito</groupId>
<artifactId>jukito</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -201,11 +196,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java-compiler-source.version}</source>
<target>${java-compiler-target.version}</target>
</configuration>
</plugin>
</plugins>
</build>
Expand All @@ -218,20 +208,13 @@
</activation>
<build>
<plugins>
<!-- oss-parent has got all these below, but little outdated. Hence overwritten. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java-compiler-source.version}</source>
<target>${java-compiler-target.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -244,7 +227,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<!--<version>2.9.1</version>-->
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -257,7 +239,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -283,7 +264,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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();

Expand Down Expand Up @@ -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;
}


Expand Down Expand Up @@ -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();
}

}
5 changes: 0 additions & 5 deletions http-testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<includes>
<include>org.jsmart.zerocode.testhelp.tests.MockServerTest</include>
Expand Down
5 changes: 0 additions & 5 deletions junit5-testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<configuration>
<!--<junitPlatformArtifactName>com.github.junit-team.junit5:junit-platform-engine</junitPlatformArtifactName>-->
<!--<properties>-->
Expand Down
14 changes: 0 additions & 14 deletions kafka-testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -44,27 +40,17 @@
<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>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<includes>
<include>org.jsmart.zerocode.integration.tests.kafka.KafkaSuite</include>
Expand Down
Loading

0 comments on commit 61e8752

Please sign in to comment.