Merge branch 'master' into selenium-upgrade

# Conflicts (resolved): # core/worker/src/main/java/com/cognifide/aet/worker/drivers/FirefoxWebDriverFactory.java
wttech · Jan 27, 2018 · 4f4b7cb · 4f4b7cb
2 parents e20525b + 23ac541
commit 4f4b7cb
Show file tree

Hide file tree

Showing 32 changed files with 36 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ All notable changes to AET will be documented in this file.
 
 ## Unreleased
 **List of changes that are finished but not yet released in any final version.**
+
+## Version 2.1.4
 - [PR-184](https://github.com/Cognifide/aet/pull/184) Fixed xUnit generation NPE when stepResult is missing
 - [PR-183](https://github.com/Cognifide/aet/pull/183) Fixed ambiguous messages from AET API ([#161](https://github.com/Cognifide/aet/issues/161) and [#165](https://github.com/Cognifide/aet/issues/161))
 - [PR-202](https://github.com/Cognifide/aet/pull/202) VirtualBox version update required for Windows 10

diff --git a/api/communication-api/pom.xml b/api/communication-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>api</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>communication-api</artifactId>

diff --git a/api/datastorage-api/pom.xml b/api/datastorage-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>api</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>datastorage-api</artifactId>

diff --git a/api/jobs-api/pom.xml b/api/jobs-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>api</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>jobs-api</artifactId>

diff --git a/api/pom.xml b/api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>api</artifactId>

diff --git a/api/validation-api/pom.xml b/api/validation-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>api</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>validation-api</artifactId>

diff --git a/client/aet-maven-plugin/pom.xml b/client/aet-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>client</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>aet-maven-plugin</artifactId>

diff --git a/client/client-core/pom.xml b/client/client-core/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>client</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>client-core</artifactId>

diff --git a/client/pom.xml b/client/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>client</artifactId>

diff --git a/core/cleaner/pom.xml b/core/cleaner/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>cleaner</artifactId>

diff --git a/core/communication/pom.xml b/core/communication/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>communication</artifactId>

diff --git a/core/datastorage/pom.xml b/core/datastorage/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>datastorage</artifactId>

diff --git a/core/jobs/pom.xml b/core/jobs/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>jobs</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>core</artifactId>

diff --git a/core/runner/pom.xml b/core/runner/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>runner</artifactId>

diff --git a/core/validation/pom.xml b/core/validation/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>validation</artifactId>

diff --git a/core/worker/pom.xml b/core/worker/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>worker</artifactId>

diff --git a/core/worker/src/main/java/com/cognifide/aet/worker/drivers/FirefoxWebDriverFactory.java b/core/worker/src/main/java/com/cognifide/aet/worker/drivers/FirefoxWebDriverFactory.java
@@ -50,7 +50,7 @@ public class FirefoxWebDriverFactory implements WebDriverFactory {
 
   private static final String DEFAULT_FIREFOX_BINARY_PATH = "/usr/bin/firefox";
 
-  private static final String DEFAULT_FIREFOX_ERROR_LOG_FILE_PATH = "/content/logs/firefox/stderr.log";
+  private static final String DEFAULT_FIREFOX_ERROR_LOG_FILE_PATH = "/opt/aet/firefox/log/stderr.log";
 
   private static final String LOG_FILE_PATH = "logFilePath";
 
@@ -84,6 +84,7 @@ public WebCommunicationWrapper createWebDriver(ProxyServerWrapper proxyServer)
       DesiredCapabilities capabilities = new DesiredCapabilities();
       capabilities.setCapability(CapabilityType.PROXY, proxy);
       capabilities.setCapability(CapabilityType.ACCEPT_SSL_CERTS, true);
+
       FirefoxProfile fp = getFirefoxProfile();
       fp.setAcceptUntrustedCertificates(true);
       fp.setAssumeUntrustedCertificateIssuer(false);
@@ -101,6 +102,7 @@ public WebCommunicationWrapper createWebDriver(ProxyServerWrapper proxyServer)
   public WebCommunicationWrapper createWebDriver() throws WorkerException {
     try {
       DesiredCapabilities capabilities = new DesiredCapabilities();
+
       FirefoxProfile fp = getFirefoxProfile();
       setCommonCapabilities(capabilities, fp);
 
@@ -135,8 +137,7 @@ private void setCommonCapabilities(DesiredCapabilities capabilities, FirefoxProf
     capabilities.setCapability("firefox_binary", new File(path).getAbsolutePath());
   }
 
-  private WebDriver getFirefoxDriver(DesiredCapabilities capabilities)
-      throws IOException {
+  private WebDriver getFirefoxDriver(DesiredCapabilities capabilities) {
     WebDriver driver = new FirefoxDriver(capabilities);
     driver.manage().timeouts().pageLoadTimeout(5L, TimeUnit.MINUTES);
     return driver;

diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>documentation</artifactId>

diff --git a/integration-tests/sample-site/pom.xml b/integration-tests/sample-site/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 

diff --git a/integration-tests/test-suite/pom.xml b/integration-tests/test-suite/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 

diff --git a/osgi-dependencies/configs/pom.xml b/osgi-dependencies/configs/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>osgi-dependencies</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>configs</artifactId>

diff --git a/osgi-dependencies/pom.xml b/osgi-dependencies/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>osgi-dependencies</artifactId>

diff --git a/osgi-dependencies/proxy/pom.xml b/osgi-dependencies/proxy/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>osgi-dependencies</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>proxy</artifactId>

diff --git a/osgi-dependencies/selenium/pom.xml b/osgi-dependencies/selenium/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>osgi-dependencies</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>selenium</artifactId>

diff --git a/osgi-dependencies/w3chtml5validator/pom.xml b/osgi-dependencies/w3chtml5validator/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>osgi-dependencies</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>w3chtml5validator</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
 
   <groupId>com.cognifide.aet</groupId>
   <artifactId>aet-root</artifactId>
-  <version>2.1.4-SNAPSHOT</version>
+  <version>2.1.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>AET</name>

diff --git a/report/pom.xml b/report/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>report</artifactId>

diff --git a/rest-endpoint/pom.xml b/rest-endpoint/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>rest-endpoint</artifactId>

diff --git a/test-executor/pom.xml b/test-executor/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>test-executor</artifactId>

diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
@@ -24,7 +24,7 @@
 ENV["GEM_PATH"] = nil
 ENV["GEM_HOME"] = nil
 
-AET_VERSION = '2.1.4-RC1'
+AET_VERSION = '2.1.4'
 
 VAGRANTFILE_API_VERSION = '2'
 
@@ -85,7 +85,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         }
       },
       "aet" => {
-        "base_link" => "https://www.kubiczak.pl/aet",
         "karaf" => {
           "java_max_mem" => "3072M",
           "enable_debug" => true

diff --git a/zip/pom.xml b/zip/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>aet-root</artifactId>
     <groupId>com.cognifide.aet</groupId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>zip</artifactId>