From 53da007ac688b6c50b633d423966b4a26adba72b Mon Sep 17 00:00:00 2001 From: Wiiitek Date: Tue, 23 Jan 2018 13:19:04 +0100 Subject: [PATCH 1/4] prepare CHANGLOG.md & Vagrantfile for new version --- CHANGELOG.md | 2 ++ vagrant/Vagrantfile | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ff6306d9..fd99ec0b1 100644 --- 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/vagrant/Vagrantfile b/vagrant/Vagrantfile index 328f006cb..647422d06 100644 --- 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 From 6a11b64be9a406a963acf091e145675261f158dc Mon Sep 17 00:00:00 2001 From: Wiiitek Date: Tue, 23 Jan 2018 13:25:42 +0100 Subject: [PATCH 2/4] [maven-release-plugin] prepare release 2.1.4 --- api/communication-api/pom.xml | 2 +- api/datastorage-api/pom.xml | 2 +- api/jobs-api/pom.xml | 2 +- api/pom.xml | 2 +- api/validation-api/pom.xml | 2 +- client/aet-maven-plugin/pom.xml | 2 +- client/client-core/pom.xml | 2 +- client/pom.xml | 2 +- core/cleaner/pom.xml | 2 +- core/communication/pom.xml | 2 +- core/datastorage/pom.xml | 2 +- core/jobs/pom.xml | 2 +- core/pom.xml | 2 +- core/runner/pom.xml | 2 +- core/validation/pom.xml | 2 +- core/worker/pom.xml | 2 +- documentation/pom.xml | 2 +- integration-tests/sample-site/pom.xml | 2 +- integration-tests/test-suite/pom.xml | 2 +- osgi-dependencies/configs/pom.xml | 2 +- osgi-dependencies/pom.xml | 2 +- osgi-dependencies/proxy/pom.xml | 2 +- osgi-dependencies/selenium/pom.xml | 2 +- osgi-dependencies/w3chtml5validator/pom.xml | 2 +- pom.xml | 4 ++-- report/pom.xml | 2 +- rest-endpoint/pom.xml | 2 +- test-executor/pom.xml | 2 +- zip/pom.xml | 2 +- 29 files changed, 30 insertions(+), 30 deletions(-) diff --git a/api/communication-api/pom.xml b/api/communication-api/pom.xml index 16e2925ab..c8f5c8025 100644 --- a/api/communication-api/pom.xml +++ b/api/communication-api/pom.xml @@ -24,7 +24,7 @@ api com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 communication-api diff --git a/api/datastorage-api/pom.xml b/api/datastorage-api/pom.xml index 35c166fab..ede97223a 100644 --- a/api/datastorage-api/pom.xml +++ b/api/datastorage-api/pom.xml @@ -24,7 +24,7 @@ api com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 datastorage-api diff --git a/api/jobs-api/pom.xml b/api/jobs-api/pom.xml index 0e6d4ef73..380bce600 100644 --- a/api/jobs-api/pom.xml +++ b/api/jobs-api/pom.xml @@ -24,7 +24,7 @@ api com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 jobs-api diff --git a/api/pom.xml b/api/pom.xml index 43edcb173..316c2df8d 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 api diff --git a/api/validation-api/pom.xml b/api/validation-api/pom.xml index 09a0a069c..08d5bf30c 100644 --- a/api/validation-api/pom.xml +++ b/api/validation-api/pom.xml @@ -24,7 +24,7 @@ api com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 validation-api diff --git a/client/aet-maven-plugin/pom.xml b/client/aet-maven-plugin/pom.xml index aa7cd020a..b9ec4c445 100644 --- a/client/aet-maven-plugin/pom.xml +++ b/client/aet-maven-plugin/pom.xml @@ -24,7 +24,7 @@ client com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 aet-maven-plugin diff --git a/client/client-core/pom.xml b/client/client-core/pom.xml index 3102476b4..fa95bfbac 100644 --- a/client/client-core/pom.xml +++ b/client/client-core/pom.xml @@ -24,7 +24,7 @@ client com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 client-core diff --git a/client/pom.xml b/client/pom.xml index c0b05862e..845f427d6 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 client diff --git a/core/cleaner/pom.xml b/core/cleaner/pom.xml index afbbf1ebb..7e76a746f 100644 --- a/core/cleaner/pom.xml +++ b/core/cleaner/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 cleaner diff --git a/core/communication/pom.xml b/core/communication/pom.xml index 041250a08..76ff2423e 100644 --- a/core/communication/pom.xml +++ b/core/communication/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 communication diff --git a/core/datastorage/pom.xml b/core/datastorage/pom.xml index 9b583c936..146e4ca72 100644 --- a/core/datastorage/pom.xml +++ b/core/datastorage/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 datastorage diff --git a/core/jobs/pom.xml b/core/jobs/pom.xml index c407762e9..0fddb2ae2 100644 --- a/core/jobs/pom.xml +++ b/core/jobs/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 jobs diff --git a/core/pom.xml b/core/pom.xml index fbe5bc26b..23194b439 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 core diff --git a/core/runner/pom.xml b/core/runner/pom.xml index 6c123bdec..e74e84d28 100644 --- a/core/runner/pom.xml +++ b/core/runner/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 runner diff --git a/core/validation/pom.xml b/core/validation/pom.xml index 502aa3775..db6a025c3 100644 --- a/core/validation/pom.xml +++ b/core/validation/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 validation diff --git a/core/worker/pom.xml b/core/worker/pom.xml index 68bd24338..5962f8dec 100644 --- a/core/worker/pom.xml +++ b/core/worker/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 worker diff --git a/documentation/pom.xml b/documentation/pom.xml index e671f0474..78fd799dc 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 documentation diff --git a/integration-tests/sample-site/pom.xml b/integration-tests/sample-site/pom.xml index ce8b831fc..57b5af763 100644 --- a/integration-tests/sample-site/pom.xml +++ b/integration-tests/sample-site/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 ../.. diff --git a/integration-tests/test-suite/pom.xml b/integration-tests/test-suite/pom.xml index a30a46ee0..0ca73f9c9 100644 --- a/integration-tests/test-suite/pom.xml +++ b/integration-tests/test-suite/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 ../.. diff --git a/osgi-dependencies/configs/pom.xml b/osgi-dependencies/configs/pom.xml index c75c2dbf1..4e7a8a259 100644 --- a/osgi-dependencies/configs/pom.xml +++ b/osgi-dependencies/configs/pom.xml @@ -24,7 +24,7 @@ osgi-dependencies com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 configs diff --git a/osgi-dependencies/pom.xml b/osgi-dependencies/pom.xml index f35e7b9fe..4fd4099e1 100644 --- a/osgi-dependencies/pom.xml +++ b/osgi-dependencies/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 osgi-dependencies diff --git a/osgi-dependencies/proxy/pom.xml b/osgi-dependencies/proxy/pom.xml index 63a993907..7d5be2d41 100644 --- a/osgi-dependencies/proxy/pom.xml +++ b/osgi-dependencies/proxy/pom.xml @@ -24,7 +24,7 @@ osgi-dependencies com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 proxy diff --git a/osgi-dependencies/selenium/pom.xml b/osgi-dependencies/selenium/pom.xml index 7611eaf52..2b485657e 100644 --- a/osgi-dependencies/selenium/pom.xml +++ b/osgi-dependencies/selenium/pom.xml @@ -24,7 +24,7 @@ osgi-dependencies com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 selenium diff --git a/osgi-dependencies/w3chtml5validator/pom.xml b/osgi-dependencies/w3chtml5validator/pom.xml index 39298ba01..225003aa9 100644 --- a/osgi-dependencies/w3chtml5validator/pom.xml +++ b/osgi-dependencies/w3chtml5validator/pom.xml @@ -24,7 +24,7 @@ osgi-dependencies com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 w3chtml5validator diff --git a/pom.xml b/pom.xml index 094299adc..0bc69b407 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.cognifide.aet aet-root - 2.1.4-SNAPSHOT + 2.1.4 pom AET @@ -86,7 +86,7 @@ scm:git:https://github.com/Cognifide/aet.git scm:git:https://github.com/Cognifide/aet.git - HEAD + 2.1.4 https://github.com/Cognifide/aet diff --git a/report/pom.xml b/report/pom.xml index ca5228e5d..b6e455ad0 100644 --- a/report/pom.xml +++ b/report/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 report diff --git a/rest-endpoint/pom.xml b/rest-endpoint/pom.xml index cb9ea473a..ebe5edc46 100644 --- a/rest-endpoint/pom.xml +++ b/rest-endpoint/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 rest-endpoint diff --git a/test-executor/pom.xml b/test-executor/pom.xml index 0e509495f..c12ab36f7 100644 --- a/test-executor/pom.xml +++ b/test-executor/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 test-executor diff --git a/zip/pom.xml b/zip/pom.xml index 9c7d2d97f..f08e93a94 100644 --- a/zip/pom.xml +++ b/zip/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4-SNAPSHOT + 2.1.4 zip From 09659d8e6aff0f1f00bec22e23a5d6b50a5a348c Mon Sep 17 00:00:00 2001 From: Wiiitek Date: Tue, 23 Jan 2018 13:25:49 +0100 Subject: [PATCH 3/4] [maven-release-plugin] prepare for next development iteration --- api/communication-api/pom.xml | 2 +- api/datastorage-api/pom.xml | 2 +- api/jobs-api/pom.xml | 2 +- api/pom.xml | 2 +- api/validation-api/pom.xml | 2 +- client/aet-maven-plugin/pom.xml | 2 +- client/client-core/pom.xml | 2 +- client/pom.xml | 2 +- core/cleaner/pom.xml | 2 +- core/communication/pom.xml | 2 +- core/datastorage/pom.xml | 2 +- core/jobs/pom.xml | 2 +- core/pom.xml | 2 +- core/runner/pom.xml | 2 +- core/validation/pom.xml | 2 +- core/worker/pom.xml | 2 +- documentation/pom.xml | 2 +- integration-tests/sample-site/pom.xml | 2 +- integration-tests/test-suite/pom.xml | 2 +- osgi-dependencies/configs/pom.xml | 2 +- osgi-dependencies/pom.xml | 2 +- osgi-dependencies/proxy/pom.xml | 2 +- osgi-dependencies/selenium/pom.xml | 2 +- osgi-dependencies/w3chtml5validator/pom.xml | 2 +- pom.xml | 4 ++-- report/pom.xml | 2 +- rest-endpoint/pom.xml | 2 +- test-executor/pom.xml | 2 +- zip/pom.xml | 2 +- 29 files changed, 30 insertions(+), 30 deletions(-) diff --git a/api/communication-api/pom.xml b/api/communication-api/pom.xml index c8f5c8025..beb0b60c1 100644 --- a/api/communication-api/pom.xml +++ b/api/communication-api/pom.xml @@ -24,7 +24,7 @@ api com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT communication-api diff --git a/api/datastorage-api/pom.xml b/api/datastorage-api/pom.xml index ede97223a..68b764f7b 100644 --- a/api/datastorage-api/pom.xml +++ b/api/datastorage-api/pom.xml @@ -24,7 +24,7 @@ api com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT datastorage-api diff --git a/api/jobs-api/pom.xml b/api/jobs-api/pom.xml index 380bce600..8115971d4 100644 --- a/api/jobs-api/pom.xml +++ b/api/jobs-api/pom.xml @@ -24,7 +24,7 @@ api com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT jobs-api diff --git a/api/pom.xml b/api/pom.xml index 316c2df8d..e5f825461 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT api diff --git a/api/validation-api/pom.xml b/api/validation-api/pom.xml index 08d5bf30c..63c1eb26b 100644 --- a/api/validation-api/pom.xml +++ b/api/validation-api/pom.xml @@ -24,7 +24,7 @@ api com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT validation-api diff --git a/client/aet-maven-plugin/pom.xml b/client/aet-maven-plugin/pom.xml index b9ec4c445..f439c9b60 100644 --- a/client/aet-maven-plugin/pom.xml +++ b/client/aet-maven-plugin/pom.xml @@ -24,7 +24,7 @@ client com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT aet-maven-plugin diff --git a/client/client-core/pom.xml b/client/client-core/pom.xml index fa95bfbac..7840538d3 100644 --- a/client/client-core/pom.xml +++ b/client/client-core/pom.xml @@ -24,7 +24,7 @@ client com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT client-core diff --git a/client/pom.xml b/client/pom.xml index 845f427d6..f1a2cbed0 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT client diff --git a/core/cleaner/pom.xml b/core/cleaner/pom.xml index 7e76a746f..356ffad3c 100644 --- a/core/cleaner/pom.xml +++ b/core/cleaner/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT cleaner diff --git a/core/communication/pom.xml b/core/communication/pom.xml index 76ff2423e..4fccab978 100644 --- a/core/communication/pom.xml +++ b/core/communication/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT communication diff --git a/core/datastorage/pom.xml b/core/datastorage/pom.xml index 146e4ca72..57ca45c55 100644 --- a/core/datastorage/pom.xml +++ b/core/datastorage/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT datastorage diff --git a/core/jobs/pom.xml b/core/jobs/pom.xml index 0fddb2ae2..6dde66314 100644 --- a/core/jobs/pom.xml +++ b/core/jobs/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT jobs diff --git a/core/pom.xml b/core/pom.xml index 23194b439..e48a43d0f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT core diff --git a/core/runner/pom.xml b/core/runner/pom.xml index e74e84d28..ade4f4363 100644 --- a/core/runner/pom.xml +++ b/core/runner/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT runner diff --git a/core/validation/pom.xml b/core/validation/pom.xml index db6a025c3..aa3a394be 100644 --- a/core/validation/pom.xml +++ b/core/validation/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT validation diff --git a/core/worker/pom.xml b/core/worker/pom.xml index 5962f8dec..ae040c775 100644 --- a/core/worker/pom.xml +++ b/core/worker/pom.xml @@ -24,7 +24,7 @@ core com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT worker diff --git a/documentation/pom.xml b/documentation/pom.xml index 78fd799dc..7ad6cf054 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT documentation diff --git a/integration-tests/sample-site/pom.xml b/integration-tests/sample-site/pom.xml index 57b5af763..0d1a1bdca 100644 --- a/integration-tests/sample-site/pom.xml +++ b/integration-tests/sample-site/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT ../.. diff --git a/integration-tests/test-suite/pom.xml b/integration-tests/test-suite/pom.xml index 0ca73f9c9..aab805cac 100644 --- a/integration-tests/test-suite/pom.xml +++ b/integration-tests/test-suite/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT ../.. diff --git a/osgi-dependencies/configs/pom.xml b/osgi-dependencies/configs/pom.xml index 4e7a8a259..9f38a44d2 100644 --- a/osgi-dependencies/configs/pom.xml +++ b/osgi-dependencies/configs/pom.xml @@ -24,7 +24,7 @@ osgi-dependencies com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT configs diff --git a/osgi-dependencies/pom.xml b/osgi-dependencies/pom.xml index 4fd4099e1..70f198822 100644 --- a/osgi-dependencies/pom.xml +++ b/osgi-dependencies/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT osgi-dependencies diff --git a/osgi-dependencies/proxy/pom.xml b/osgi-dependencies/proxy/pom.xml index 7d5be2d41..66a9944b0 100644 --- a/osgi-dependencies/proxy/pom.xml +++ b/osgi-dependencies/proxy/pom.xml @@ -24,7 +24,7 @@ osgi-dependencies com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT proxy diff --git a/osgi-dependencies/selenium/pom.xml b/osgi-dependencies/selenium/pom.xml index 2b485657e..1d2031a9e 100644 --- a/osgi-dependencies/selenium/pom.xml +++ b/osgi-dependencies/selenium/pom.xml @@ -24,7 +24,7 @@ osgi-dependencies com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT selenium diff --git a/osgi-dependencies/w3chtml5validator/pom.xml b/osgi-dependencies/w3chtml5validator/pom.xml index 225003aa9..b64f0f27d 100644 --- a/osgi-dependencies/w3chtml5validator/pom.xml +++ b/osgi-dependencies/w3chtml5validator/pom.xml @@ -24,7 +24,7 @@ osgi-dependencies com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT w3chtml5validator diff --git a/pom.xml b/pom.xml index 0bc69b407..709a919cc 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.cognifide.aet aet-root - 2.1.4 + 2.1.5-SNAPSHOT pom AET @@ -86,7 +86,7 @@ scm:git:https://github.com/Cognifide/aet.git scm:git:https://github.com/Cognifide/aet.git - 2.1.4 + HEAD https://github.com/Cognifide/aet diff --git a/report/pom.xml b/report/pom.xml index b6e455ad0..a40ef0286 100644 --- a/report/pom.xml +++ b/report/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT report diff --git a/rest-endpoint/pom.xml b/rest-endpoint/pom.xml index ebe5edc46..dbc387826 100644 --- a/rest-endpoint/pom.xml +++ b/rest-endpoint/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT rest-endpoint diff --git a/test-executor/pom.xml b/test-executor/pom.xml index c12ab36f7..5368b6e8b 100644 --- a/test-executor/pom.xml +++ b/test-executor/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT test-executor diff --git a/zip/pom.xml b/zip/pom.xml index f08e93a94..c86d7099e 100644 --- a/zip/pom.xml +++ b/zip/pom.xml @@ -24,7 +24,7 @@ aet-root com.cognifide.aet - 2.1.4 + 2.1.5-SNAPSHOT zip From 23ac541f1ea0d97dbef37fbb137284386010da6f Mon Sep 17 00:00:00 2001 From: joannajasnowska Date: Sat, 27 Jan 2018 21:13:08 +0100 Subject: [PATCH 4/4] default firefox logfile path changed to /opt/aet/firefox/log/stderr.log (#211) * default firefox logfile path changed to /opt/aet/firefox/log/stderr.log * refactor --- .../cognifide/aet/worker/drivers/FirefoxWebDriverFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 6d5c90689..ba9fd7782 100644 --- 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 @@ -48,7 +48,7 @@ @Properties({@Property(name = Constants.SERVICE_VENDOR, value = "Cognifide Ltd")}) public class FirefoxWebDriverFactory implements WebDriverFactory { - 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"; @@ -63,7 +63,7 @@ public class FirefoxWebDriverFactory implements WebDriverFactory { @Property(name = PATH, label = "Custom path to Firefox binary") private String path; - @Property(name = LOG_FILE_PATH, label = "Path to firefox error log", value = "/content/logs/firefox/stderr.log") + @Property(name = LOG_FILE_PATH, label = "Path to firefox error log", value = DEFAULT_FIREFOX_ERROR_LOG_FILE_PATH) private String logFilePath; @Override