Skip to content

Commit

Permalink
updated pom
Browse files Browse the repository at this point in the history
  • Loading branch information
@cjayswal
cjayswal committed Jun 9, 2024
1 parent 13e905b commit e78ed80
Show file tree
Hide file tree
Showing 10 changed files with 106 additions and 97 deletions.
1 change: 0 additions & 1 deletion .project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.whitesource.eclipse.plugin.WSNature</nature>
</natures>
</projectDescription>
116 changes: 32 additions & 84 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.qmetry</groupId>
<artifactId>qaf-parent</artifactId>
<version>${version-num}</version>
<version>${revision}</version>
<packaging>pom</packaging>
<name>qaf-parent</name>
<url>https://github.com/qmetry/qaf</url>
Expand Down Expand Up @@ -41,7 +41,9 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<version-num>4.0.0-SNAPSHOT</version-num>
<revision>4.0.0-SNAPSHOT</revision>
<selenium.version>4.0.0</selenium.version>
<aspectj.version>1.9.5</aspectj.version>
<skip.it>true</skip.it>
</properties>

Expand Down Expand Up @@ -113,19 +115,19 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.9.5</version>
<version>${aspectj.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.5</version>
<version>${aspectj.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<version>1.9.5</version>
<version>${aspectj.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -134,30 +136,7 @@
<version>2.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-lite</artifactId>
<version>5.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.0.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand Down Expand Up @@ -188,18 +167,6 @@
<version>32.1.2-jre</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.10</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>2.0b5</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
Expand All @@ -218,48 +185,12 @@
<version>1.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
<version>4.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>4.0.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>com.codeborne</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-leg-rc</artifactId>
<version>4.0.0</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.testng</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.1.9</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
<version>1.2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
Expand All @@ -278,12 +209,6 @@
<version>3.2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.github.bonigarcia</groupId>
<artifactId>webdrivermanager</artifactId>
<version>5.6.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
Expand All @@ -308,8 +233,31 @@
<version>1.25.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-api</artifactId>
<version>${selenium.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-leg-rc</artifactId>
<version>${selenium.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.10</version>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
27 changes: 25 additions & 2 deletions qaf-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.qmetry</groupId>
<artifactId>qaf-parent</artifactId>
<version>${version-num}</version>
<version>${revision}</version>
</parent>
<artifactId>qaf-core</artifactId>
<description>Functional test automation framework for web, mobile-web, mobile native and web-service</description>
Expand All @@ -22,7 +22,6 @@
</properties>

<dependencies>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand All @@ -38,5 +37,29 @@
<artifactId>jaxb-impl</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-lite</artifactId>
<version>5.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.0.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
2 changes: 0 additions & 2 deletions qaf-core/src/main/java/com/qmetry/qaf/automation/data/DataProviderException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
******************************************************************************/
package com.qmetry.qaf.automation.data;

import org.testng.SkipException;

import com.qmetry.qaf.automation.core.AutomationError;

/**
Expand Down
3 changes: 2 additions & 1 deletion qaf-core/src/main/java/com/qmetry/qaf/automation/ui/util/DynamicWait.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ private Throwable propagateIfNotIgnored(Throwable e) {
return e;
}
}
throw Throwables.propagate(e);
Throwables.throwIfUnchecked(e);
throw new RuntimeException(e);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion qaf-playwright/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.qmetry</groupId>
<artifactId>qaf-parent</artifactId>
<version>${version-num}</version>
<version>${revision}</version>
</parent>
<artifactId>qaf-playwright</artifactId>
<properties>
Expand Down
27 changes: 25 additions & 2 deletions qaf-selenium/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.qmetry</groupId>
<artifactId>qaf-parent</artifactId>
<version>${version-num}</version>
<version>${revision}</version>
</parent>
<artifactId>qaf-selenium</artifactId>
<properties>
Expand All @@ -15,6 +15,29 @@
<artifactId>qaf-core</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
<version>${selenium.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>${selenium.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>com.codeborne</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.github.bonigarcia</groupId>
<artifactId>webdrivermanager</artifactId>
<version>5.6.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
21 changes: 19 additions & 2 deletions qaf-testng/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.qmetry</groupId>
<artifactId>qaf-parent</artifactId>
<version>${version-num}</version>
<version>${revision}</version>
</parent>
<artifactId>qaf-testng</artifactId>
<properties>
Expand All @@ -28,7 +28,6 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand All @@ -44,5 +43,23 @@
<artifactId>jaxb-impl</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.10</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>2.0b5</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
<version>1.2.4</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion qaf-ws/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.qmetry</groupId>
<artifactId>qaf-parent</artifactId>
<version>${version-num}</version>
<version>${revision}</version>
</parent>
<artifactId>qaf-ws</artifactId>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion qaf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.qmetry</groupId>
<artifactId>qaf-parent</artifactId>
<version>${version-num}</version>
<version>${revision}</version>
</parent>
<artifactId>qaf</artifactId>
<packaging>pom</packaging>
Expand Down

0 comments on commit e78ed80

Please sign in to comment.