Merge pull request #121 from mcasperson/master

Merge Upstream Release 1.0.65

.travis.yml

@@ -16,7 +16,7 @@ env:
 - TEST_SUITE="{'browsers':['Opera'],'runNegTests':false,'runSimpleTests':false}"
 - TEST_SUITE="{'browsers':['BrowserStack'],'runNegTests':false,'runSimpleTests':false,'groupName':'Edge'}"
 - TEST_SUITE="{'browsers':['BrowserStack'],'runNegTests':false,'runSimpleTests':false,'groupName':'Safari'}"
-- TEST_SUITE="{'browsers':['BrowserStack'],'runNegTests':false,'runSimpleTests':false,'groupName':'IE'}"
+- TEST_SUITE="{'browsers':['BrowserStack'],'runNegTests':false,'runSimpleTests':false,'groupName':'IE','additionalTags':'~@iefail'}"
 - TEST_SUITE="{'browsers':['BrowserStack'],'runNegTests':false,'runSimpleTests':false,'groupName':'Android'}"
 before_install:
 # https://github.com/travis-ci/travis-ci/issues/8520

build.gradle

@@ -24,7 +24,7 @@ buildscript {
 }
 
 plugins {
-	id 'com.gradle.build-scan' version '1.11'
+	id 'com.gradle.build-scan' version '1.12.1'
 	id 'com.github.ben-manes.versions' version '0.17.0'
 }
 
@@ -138,9 +138,9 @@ sourceSets {
 }
 
 def mysqlDriverVersion = '5.1.45'
-def guavaVersion = '23.6-jre'
-def seleniumVersion = '3.8.1'
-def htmlUnitDriverVersion = '2.29.0'
+def guavaVersion = '24.0-jre'
+def seleniumVersion = '3.9.1'
+def htmlUnitDriverVersion = '2.29.2'
 def validationVersion = '2.0.1.Final'
 def cucumberVersion = '1.2.5'
 def logbackVersion = '1.2.3'
@@ -156,7 +156,7 @@ def monteRepackVersion = '1.0.1'
 def vavrVersion = '1.0.0-SNAPSHOT'
 def zapAPIVersion = '1.5.0'
 def browsermobVersion = '2.1.5'
-def compressCommonsVersion = '1.15'
+def compressCommonsVersion = '1.16.1'
 def xmlApisVersion = '1.4.01'
 def sysoutOverSLF4JVersion = '1.0.2'
 def cucumberSpringVersion = '1.2.5'
@@ -217,7 +217,7 @@ dependencies {
 	compile group: 'uk.org.lidalia', name: 'sysout-over-slf4j', version: sysoutOverSLF4JVersion
 	compile group: 'org.springframework.retry', name: 'spring-retry', version: springRetryVersion
 	compile group: 'org.apache.httpcomponents', name: 'fluent-hc', version: '4.5.5'
-	compile group: 'org.json', name: 'json', version: '20171018'
+	compile group: 'org.json', name: 'json', version: '20180130'
 	compile group: 'cglib', name: 'cglib', version: cgLibVersion
 	compile group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.2.0'
 	// Fixes an issue in java 9 where these classes are no longer included
@@ -230,7 +230,7 @@ dependencies {
 	compile group: 'edu.stanford.ejalbert', name: 'BrowserLauncher2', version: '1.3'
 	compile group: 'org.owasp.jbrofuzz', name: 'jbrofuzz', version: '2.5.1'
 	compile group: 'org.owasp.jbrofuzz', name: 'jbrofuzz-encoder', version: '2.5.1'
-	compile group: 'org.apache.ant', name: 'ant', version: '1.10.1'
+	compile group: 'org.apache.ant', name: 'ant', version: '1.10.2'
 	compile group: 'org.bouncycastle', name: 'bcmail-jdk15on', version: '1.59'
 	compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.59'
 	compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.59'

src/main/java/au/com/agic/apptesting/aspects/EarlyExitAspect.java

@@ -2,7 +2,6 @@
 
 import au.com.agic.apptesting.State;
 import au.com.agic.apptesting.utils.FeatureState;
-
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

src/main/java/au/com/agic/apptesting/junit/Testsuite.java

@@ -1,10 +1,9 @@
 package au.com.agic.apptesting.junit;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Represents a test suite from a jUnit result xml

src/main/java/au/com/agic/apptesting/lambda/LambdaEntry.java

@@ -4,8 +4,6 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 
 /**

src/main/java/au/com/agic/apptesting/profiles/configuration/Configuration.java

@@ -1,10 +1,9 @@
 package au.com.agic.apptesting.profiles.configuration;
 
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
+import java.util.List;
 
 /**
  * Represents a {@code <profile>} element

src/main/java/au/com/agic/apptesting/profiles/configuration/DesiredCapabilities.java

@@ -1,10 +1,9 @@
 package au.com.agic.apptesting.profiles.configuration;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Represents a {@code <desiredCapabilities>} element

src/main/java/au/com/agic/apptesting/profiles/configuration/FeatureGroup.java

@@ -1,10 +1,9 @@
 package au.com.agic.apptesting.profiles.configuration;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Represents a {@code <featureGroup>} element

src/main/java/au/com/agic/apptesting/profiles/configuration/Settings.java

@@ -1,10 +1,9 @@
 package au.com.agic.apptesting.profiles.configuration;
 
+import javax.xml.bind.annotation.XmlElement;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-
 /**
  * Represents a {@code <settings>} element
  */

src/main/java/au/com/agic/apptesting/profiles/configuration/URLMappings.java

@@ -1,10 +1,9 @@
 package au.com.agic.apptesting.profiles.configuration;
 
+import javax.xml.bind.annotation.XmlElement;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-
 /**
  * Represents a collection of URL Mappings
  */

src/main/java/au/com/agic/apptesting/profiles/configuration/Url.java

@@ -1,13 +1,13 @@
 package au.com.agic.apptesting.profiles.configuration;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlValue;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 /**
  * Represents a {@code <url>} element
  */

src/main/java/au/com/agic/apptesting/profiles/configuration/UrlMapping.java

@@ -1,18 +1,16 @@
 package au.com.agic.apptesting.profiles.configuration;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 import au.com.agic.apptesting.constants.Defaults;
-
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkArgument;
 
 /**
  * Represents a {@code <urlMapping>} element

src/main/java/au/com/agic/apptesting/profiles/dataset/CommonDataSet.java

@@ -1,10 +1,9 @@
 package au.com.agic.apptesting.profiles.dataset;
 
+import javax.xml.bind.annotation.XmlElement;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-
 /**
  * Represents a {@code <commonDataSet>} element
  */

src/main/java/au/com/agic/apptesting/profiles/dataset/DataSet.java

@@ -1,10 +1,9 @@
 package au.com.agic.apptesting.profiles.dataset;
 
+import javax.xml.bind.annotation.XmlElement;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-
 /**
  * Represents a {@code <dataset>} element
  */

src/main/java/au/com/agic/apptesting/profiles/dataset/DataSets.java

@@ -1,10 +1,9 @@
 package au.com.agic.apptesting.profiles.dataset;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Represents a {@code <dataSets>} element

src/main/java/au/com/agic/apptesting/steps/AGStepDefinitions.java

@@ -5,23 +5,16 @@
 import au.com.agic.apptesting.utils.AutoAliasUtils;
 import au.com.agic.apptesting.utils.GetBy;
 import au.com.agic.apptesting.utils.SleepUtils;
-
+import cucumber.api.java.en.When;
 import org.apache.commons.lang3.StringUtils;
-import org.openqa.selenium.By;
-import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.TimeoutException;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
+import org.openqa.selenium.*;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDate;
 
-import cucumber.api.java.en.When;
-
 /**
  * Steps that are specific to Auto and General web apps
  */