diff --git a/cf-allure-commandline/dist/bin/allure b/cf-allure-commandline/dist/bin/allure index 725f929..ecbbf21 100755 --- a/cf-allure-commandline/dist/bin/allure +++ b/cf-allure-commandline/dist/bin/allure @@ -1,78 +1,127 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## allure start up script for UN*X -## +# +# allure start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh allure +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and ALLURE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/.." >/dev/null -export APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="allure" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and ALLURE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +export APP_HOME=$( cd "${APP_HOME:-./}.." > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/lib/allure-commandline-2.8-SNAPSHOT.jar:$APP_HOME/lib/allure-generator-2.8-SNAPSHOT.jar:$APP_HOME/lib/jcommander-1.72.jar:$APP_HOME/lib/jetty-server-9.4.11.v20180605.jar:$APP_HOME/lib/slf4j-log4j12-1.7.25.jar:$APP_HOME/lib/jackson-dataformat-xml-2.9.6.jar:$APP_HOME/lib/allure-plugin-api-2.8-SNAPSHOT.jar:$APP_HOME/lib/jackson-dataformat-yaml-2.9.6.jar:$APP_HOME/lib/commons-io-2.6.jar:$APP_HOME/lib/allure2-model-api-1.0.0.jar:$APP_HOME/lib/allure1-model-1.0.jar:$APP_HOME/lib/httpclient-4.5.6.jar:$APP_HOME/lib/allure2-model-jackson-1.0.0.jar:$APP_HOME/lib/allure2-model-pojo-1.0.0.jar:$APP_HOME/lib/tika-core-1.18.jar:$APP_HOME/lib/javax.servlet-api-3.1.0.jar:$APP_HOME/lib/jetty-http-9.4.11.v20180605.jar:$APP_HOME/lib/jetty-io-9.4.11.v20180605.jar:$APP_HOME/lib/slf4j-api-1.7.25.jar:$APP_HOME/lib/log4j-1.2.17.jar:$APP_HOME/lib/jackson-module-jaxb-annotations-2.9.6.jar:$APP_HOME/lib/jackson-databind-2.9.6.jar:$APP_HOME/lib/jackson-core-2.9.6.jar:$APP_HOME/lib/jackson-annotations-2.9.0.jar:$APP_HOME/lib/woodstox-core-5.0.3.jar:$APP_HOME/lib/stax2-api-3.1.4.jar:$APP_HOME/lib/opencsv-4.2.jar:$APP_HOME/lib/flexmark-0.34.8.jar:$APP_HOME/lib/jaxb-api-2.3.0.jar:$APP_HOME/lib/freemarker-2.3.28.jar:$APP_HOME/lib/snakeyaml-1.18.jar:$APP_HOME/lib/properties-2.0.RC5.jar:$APP_HOME/lib/jaxb-utils-1.0.jar:$APP_HOME/lib/httpcore-4.4.10.jar:$APP_HOME/lib/commons-beanutils-1.9.3.jar:$APP_HOME/lib/commons-logging-1.2.jar:$APP_HOME/lib/commons-codec-1.10.jar:$APP_HOME/lib/jetty-util-9.4.11.v20180605.jar:$APP_HOME/lib/commons-text-1.4.jar:$APP_HOME/lib/commons-lang3-3.7.jar:$APP_HOME/lib/commons-collections4-4.1.jar:$APP_HOME/lib/flexmark-util-0.34.8.jar:$APP_HOME/lib/commons-collections-3.2.2.jar:$APP_HOME/lib/config +CLASSPATH=$APP_HOME/lib/*:$APP_HOME/lib/config + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +130,119 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and ALLURE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $ALLURE_OPTS -classpath "\"$CLASSPATH\"" io.qameta.allure.CommandLine "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and ALLURE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + -classpath "$CLASSPATH" \ + io.qameta.allure.CommandLine \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $ALLURE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/cf-allure-commandline/dist/bin/allure.bat b/cf-allure-commandline/dist/bin/allure.bat index 5e0cdd8..b6ae123 100755 --- a/cf-allure-commandline/dist/bin/allure.bat +++ b/cf-allure-commandline/dist/bin/allure.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem allure startup script for Windows @@ -9,10 +25,14 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME%.. +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and ALLURE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS= @@ -21,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +55,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,38 +65,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\lib\allure-commandline-2.8-SNAPSHOT.jar;%APP_HOME%\lib\allure-generator-2.8-SNAPSHOT.jar;%APP_HOME%\lib\jcommander-1.72.jar;%APP_HOME%\lib\jetty-server-9.4.11.v20180605.jar;%APP_HOME%\lib\slf4j-log4j12-1.7.25.jar;%APP_HOME%\lib\jackson-dataformat-xml-2.9.6.jar;%APP_HOME%\lib\allure-plugin-api-2.8-SNAPSHOT.jar;%APP_HOME%\lib\jackson-dataformat-yaml-2.9.6.jar;%APP_HOME%\lib\commons-io-2.6.jar;%APP_HOME%\lib\allure2-model-api-1.0.0.jar;%APP_HOME%\lib\allure1-model-1.0.jar;%APP_HOME%\lib\httpclient-4.5.6.jar;%APP_HOME%\lib\allure2-model-jackson-1.0.0.jar;%APP_HOME%\lib\allure2-model-pojo-1.0.0.jar;%APP_HOME%\lib\tika-core-1.18.jar;%APP_HOME%\lib\javax.servlet-api-3.1.0.jar;%APP_HOME%\lib\jetty-http-9.4.11.v20180605.jar;%APP_HOME%\lib\jetty-io-9.4.11.v20180605.jar;%APP_HOME%\lib\slf4j-api-1.7.25.jar;%APP_HOME%\lib\log4j-1.2.17.jar;%APP_HOME%\lib\jackson-module-jaxb-annotations-2.9.6.jar;%APP_HOME%\lib\jackson-databind-2.9.6.jar;%APP_HOME%\lib\jackson-core-2.9.6.jar;%APP_HOME%\lib\jackson-annotations-2.9.0.jar;%APP_HOME%\lib\woodstox-core-5.0.3.jar;%APP_HOME%\lib\stax2-api-3.1.4.jar;%APP_HOME%\lib\opencsv-4.2.jar;%APP_HOME%\lib\flexmark-0.34.8.jar;%APP_HOME%\lib\jaxb-api-2.3.0.jar;%APP_HOME%\lib\freemarker-2.3.28.jar;%APP_HOME%\lib\snakeyaml-1.18.jar;%APP_HOME%\lib\properties-2.0.RC5.jar;%APP_HOME%\lib\jaxb-utils-1.0.jar;%APP_HOME%\lib\httpcore-4.4.10.jar;%APP_HOME%\lib\commons-beanutils-1.9.3.jar;%APP_HOME%\lib\commons-logging-1.2.jar;%APP_HOME%\lib\commons-codec-1.10.jar;%APP_HOME%\lib\jetty-util-9.4.11.v20180605.jar;%APP_HOME%\lib\commons-text-1.4.jar;%APP_HOME%\lib\commons-lang3-3.7.jar;%APP_HOME%\lib\commons-collections4-4.1.jar;%APP_HOME%\lib\flexmark-util-0.34.8.jar;%APP_HOME%\lib\commons-collections-3.2.2.jar;%APP_HOME%\lib\config +set CLASSPATH=%APP_HOME%\lib\*;%APP_HOME%\lib\config + @rem Execute allure -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %ALLURE_OPTS% -classpath "%CLASSPATH%" io.qameta.allure.CommandLine %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %ALLURE_OPTS% -classpath "%CLASSPATH%" io.qameta.allure.CommandLine %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable ALLURE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%ALLURE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%ALLURE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/cf-allure-commandline/dist/config/allure.yml b/cf-allure-commandline/dist/config/allure.yml index ad48b95..67f73be 100755 --- a/cf-allure-commandline/dist/config/allure.yml +++ b/cf-allure-commandline/dist/config/allure.yml @@ -6,3 +6,5 @@ plugins: - packages-plugin - screen-diff-plugin - xctest-plugin + - jira-plugin + - xray-plugin diff --git a/cf-allure-commandline/dist/lib/allure-commandline-2.34.1.jar b/cf-allure-commandline/dist/lib/allure-commandline-2.34.1.jar new file mode 100644 index 0000000..0059fab Binary files /dev/null and b/cf-allure-commandline/dist/lib/allure-commandline-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/lib/allure-commandline-2.8-SNAPSHOT.jar b/cf-allure-commandline/dist/lib/allure-commandline-2.8-SNAPSHOT.jar deleted file mode 100755 index 221f0d7..0000000 Binary files a/cf-allure-commandline/dist/lib/allure-commandline-2.8-SNAPSHOT.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/allure-generator-2.34.1.jar b/cf-allure-commandline/dist/lib/allure-generator-2.34.1.jar new file mode 100644 index 0000000..191500d Binary files /dev/null and b/cf-allure-commandline/dist/lib/allure-generator-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/lib/allure-generator-2.8-SNAPSHOT.jar b/cf-allure-commandline/dist/lib/allure-generator-2.8-SNAPSHOT.jar deleted file mode 100755 index c438489..0000000 Binary files a/cf-allure-commandline/dist/lib/allure-generator-2.8-SNAPSHOT.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/allure-model-2.29.1.jar b/cf-allure-commandline/dist/lib/allure-model-2.29.1.jar new file mode 100644 index 0000000..d00c322 Binary files /dev/null and b/cf-allure-commandline/dist/lib/allure-model-2.29.1.jar differ diff --git a/cf-allure-commandline/dist/lib/allure-plugin-api-2.34.1.jar b/cf-allure-commandline/dist/lib/allure-plugin-api-2.34.1.jar new file mode 100644 index 0000000..2cb0626 Binary files /dev/null and b/cf-allure-commandline/dist/lib/allure-plugin-api-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/lib/allure-plugin-api-2.8-SNAPSHOT.jar b/cf-allure-commandline/dist/lib/allure-plugin-api-2.8-SNAPSHOT.jar deleted file mode 100755 index 728a3d6..0000000 Binary files a/cf-allure-commandline/dist/lib/allure-plugin-api-2.8-SNAPSHOT.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/allure2-model-api-1.0.0.jar b/cf-allure-commandline/dist/lib/allure2-model-api-1.0.0.jar deleted file mode 100755 index 86a55b4..0000000 Binary files a/cf-allure-commandline/dist/lib/allure2-model-api-1.0.0.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/allure2-model-jackson-1.0.0.jar b/cf-allure-commandline/dist/lib/allure2-model-jackson-1.0.0.jar deleted file mode 100755 index 44ef2c2..0000000 Binary files a/cf-allure-commandline/dist/lib/allure2-model-jackson-1.0.0.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/allure2-model-pojo-1.0.0.jar b/cf-allure-commandline/dist/lib/allure2-model-pojo-1.0.0.jar deleted file mode 100755 index cf0230b..0000000 Binary files a/cf-allure-commandline/dist/lib/allure2-model-pojo-1.0.0.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/annotations-15.0.jar b/cf-allure-commandline/dist/lib/annotations-15.0.jar new file mode 100644 index 0000000..3f83832 Binary files /dev/null and b/cf-allure-commandline/dist/lib/annotations-15.0.jar differ diff --git a/cf-allure-commandline/dist/lib/commons-beanutils-1.11.0.jar b/cf-allure-commandline/dist/lib/commons-beanutils-1.11.0.jar new file mode 100644 index 0000000..6b7b993 Binary files /dev/null and b/cf-allure-commandline/dist/lib/commons-beanutils-1.11.0.jar differ diff --git a/cf-allure-commandline/dist/lib/commons-beanutils-1.9.3.jar b/cf-allure-commandline/dist/lib/commons-beanutils-1.9.3.jar deleted file mode 100755 index 6728154..0000000 Binary files a/cf-allure-commandline/dist/lib/commons-beanutils-1.9.3.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/commons-codec-1.10.jar b/cf-allure-commandline/dist/lib/commons-codec-1.10.jar deleted file mode 100755 index 1d7417c..0000000 Binary files a/cf-allure-commandline/dist/lib/commons-codec-1.10.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/commons-codec-1.11.jar b/cf-allure-commandline/dist/lib/commons-codec-1.11.jar new file mode 100644 index 0000000..2245120 Binary files /dev/null and b/cf-allure-commandline/dist/lib/commons-codec-1.11.jar differ diff --git a/cf-allure-commandline/dist/lib/commons-collections4-4.1.jar b/cf-allure-commandline/dist/lib/commons-collections4-4.1.jar deleted file mode 100755 index 43a9413..0000000 Binary files a/cf-allure-commandline/dist/lib/commons-collections4-4.1.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/commons-collections4-4.5.0.jar b/cf-allure-commandline/dist/lib/commons-collections4-4.5.0.jar new file mode 100644 index 0000000..aa1c4ef Binary files /dev/null and b/cf-allure-commandline/dist/lib/commons-collections4-4.5.0.jar differ diff --git a/cf-allure-commandline/dist/lib/commons-io-2.19.0.jar b/cf-allure-commandline/dist/lib/commons-io-2.19.0.jar new file mode 100644 index 0000000..38e7fd2 Binary files /dev/null and b/cf-allure-commandline/dist/lib/commons-io-2.19.0.jar differ diff --git a/cf-allure-commandline/dist/lib/commons-io-2.6.jar b/cf-allure-commandline/dist/lib/commons-io-2.6.jar deleted file mode 100755 index 00556b1..0000000 Binary files a/cf-allure-commandline/dist/lib/commons-io-2.6.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/commons-lang3-3.17.0.jar b/cf-allure-commandline/dist/lib/commons-lang3-3.17.0.jar new file mode 100644 index 0000000..f6486b4 Binary files /dev/null and b/cf-allure-commandline/dist/lib/commons-lang3-3.17.0.jar differ diff --git a/cf-allure-commandline/dist/lib/commons-lang3-3.7.jar b/cf-allure-commandline/dist/lib/commons-lang3-3.7.jar deleted file mode 100755 index f37ded6..0000000 Binary files a/cf-allure-commandline/dist/lib/commons-lang3-3.7.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/commons-logging-1.2.jar b/cf-allure-commandline/dist/lib/commons-logging-1.2.jar deleted file mode 100755 index 93a3b9f..0000000 Binary files a/cf-allure-commandline/dist/lib/commons-logging-1.2.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/commons-logging-1.3.5.jar b/cf-allure-commandline/dist/lib/commons-logging-1.3.5.jar new file mode 100644 index 0000000..75d93a1 Binary files /dev/null and b/cf-allure-commandline/dist/lib/commons-logging-1.3.5.jar differ diff --git a/cf-allure-commandline/dist/lib/commons-text-1.11.0.jar b/cf-allure-commandline/dist/lib/commons-text-1.11.0.jar new file mode 100644 index 0000000..7815497 Binary files /dev/null and b/cf-allure-commandline/dist/lib/commons-text-1.11.0.jar differ diff --git a/cf-allure-commandline/dist/lib/commons-text-1.4.jar b/cf-allure-commandline/dist/lib/commons-text-1.4.jar deleted file mode 100755 index 3e81a79..0000000 Binary files a/cf-allure-commandline/dist/lib/commons-text-1.4.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/config/log4j.properties b/cf-allure-commandline/dist/lib/config/log4j.properties deleted file mode 100755 index 9d478f8..0000000 --- a/cf-allure-commandline/dist/lib/config/log4j.properties +++ /dev/null @@ -1,8 +0,0 @@ -log4j.rootLogger=INFO, stdout - -log4j.appender.stdout = org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%m%n - -log4j.logger.org.mortbay.log = INFO \ No newline at end of file diff --git a/cf-allure-commandline/dist/lib/config/logback.xml b/cf-allure-commandline/dist/lib/config/logback.xml new file mode 100644 index 0000000..09b68b0 --- /dev/null +++ b/cf-allure-commandline/dist/lib/config/logback.xml @@ -0,0 +1,12 @@ + + + + + %msg%n + + + + + + + diff --git a/cf-allure-commandline/dist/lib/flexmark-0.34.8.jar b/cf-allure-commandline/dist/lib/flexmark-0.34.8.jar deleted file mode 100755 index d5b67d5..0000000 Binary files a/cf-allure-commandline/dist/lib/flexmark-0.34.8.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/flexmark-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-0.62.2.jar new file mode 100644 index 0000000..948349a Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-ext-tables-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-ext-tables-0.62.2.jar new file mode 100644 index 0000000..07193be Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-ext-tables-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-0.34.8.jar b/cf-allure-commandline/dist/lib/flexmark-util-0.34.8.jar deleted file mode 100755 index 95b5dfc..0000000 Binary files a/cf-allure-commandline/dist/lib/flexmark-util-0.34.8.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-util-0.62.2.jar new file mode 100644 index 0000000..43e0c2f Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-util-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-ast-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-util-ast-0.62.2.jar new file mode 100644 index 0000000..f0e1d44 Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-util-ast-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-builder-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-util-builder-0.62.2.jar new file mode 100644 index 0000000..d1409f8 Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-util-builder-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-collection-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-util-collection-0.62.2.jar new file mode 100644 index 0000000..34860df Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-util-collection-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-data-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-util-data-0.62.2.jar new file mode 100644 index 0000000..78fc503 Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-util-data-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-dependency-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-util-dependency-0.62.2.jar new file mode 100644 index 0000000..559ca26 Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-util-dependency-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-format-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-util-format-0.62.2.jar new file mode 100644 index 0000000..325df93 Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-util-format-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-html-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-util-html-0.62.2.jar new file mode 100644 index 0000000..d09c241 Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-util-html-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-misc-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-util-misc-0.62.2.jar new file mode 100644 index 0000000..eece2d7 Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-util-misc-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-options-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-util-options-0.62.2.jar new file mode 100644 index 0000000..d79534b Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-util-options-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-sequence-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-util-sequence-0.62.2.jar new file mode 100644 index 0000000..590be16 Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-util-sequence-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/flexmark-util-visitor-0.62.2.jar b/cf-allure-commandline/dist/lib/flexmark-util-visitor-0.62.2.jar new file mode 100644 index 0000000..efc2552 Binary files /dev/null and b/cf-allure-commandline/dist/lib/flexmark-util-visitor-0.62.2.jar differ diff --git a/cf-allure-commandline/dist/lib/freemarker-2.3.28.jar b/cf-allure-commandline/dist/lib/freemarker-2.3.28.jar deleted file mode 100755 index 75edf6c..0000000 Binary files a/cf-allure-commandline/dist/lib/freemarker-2.3.28.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/freemarker-2.3.34.jar b/cf-allure-commandline/dist/lib/freemarker-2.3.34.jar new file mode 100644 index 0000000..0c32491 Binary files /dev/null and b/cf-allure-commandline/dist/lib/freemarker-2.3.34.jar differ diff --git a/cf-allure-commandline/dist/lib/httpclient-4.5.14.jar b/cf-allure-commandline/dist/lib/httpclient-4.5.14.jar new file mode 100644 index 0000000..2bb7c07 Binary files /dev/null and b/cf-allure-commandline/dist/lib/httpclient-4.5.14.jar differ diff --git a/cf-allure-commandline/dist/lib/httpclient-4.5.6.jar b/cf-allure-commandline/dist/lib/httpclient-4.5.6.jar deleted file mode 100755 index 56231de..0000000 Binary files a/cf-allure-commandline/dist/lib/httpclient-4.5.6.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/httpcore-4.4.10.jar b/cf-allure-commandline/dist/lib/httpcore-4.4.10.jar deleted file mode 100755 index dc510f8..0000000 Binary files a/cf-allure-commandline/dist/lib/httpcore-4.4.10.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/httpcore-4.4.16.jar b/cf-allure-commandline/dist/lib/httpcore-4.4.16.jar new file mode 100644 index 0000000..f0bdebe Binary files /dev/null and b/cf-allure-commandline/dist/lib/httpcore-4.4.16.jar differ diff --git a/cf-allure-commandline/dist/lib/jackson-annotations-2.19.1.jar b/cf-allure-commandline/dist/lib/jackson-annotations-2.19.1.jar new file mode 100644 index 0000000..3ec711b Binary files /dev/null and b/cf-allure-commandline/dist/lib/jackson-annotations-2.19.1.jar differ diff --git a/cf-allure-commandline/dist/lib/jackson-annotations-2.9.0.jar b/cf-allure-commandline/dist/lib/jackson-annotations-2.9.0.jar deleted file mode 100755 index c602d75..0000000 Binary files a/cf-allure-commandline/dist/lib/jackson-annotations-2.9.0.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/jackson-core-2.19.1.jar b/cf-allure-commandline/dist/lib/jackson-core-2.19.1.jar new file mode 100644 index 0000000..aee4e1b Binary files /dev/null and b/cf-allure-commandline/dist/lib/jackson-core-2.19.1.jar differ diff --git a/cf-allure-commandline/dist/lib/jackson-core-2.9.6.jar b/cf-allure-commandline/dist/lib/jackson-core-2.9.6.jar deleted file mode 100755 index 09e7dd2..0000000 Binary files a/cf-allure-commandline/dist/lib/jackson-core-2.9.6.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/jackson-databind-2.19.1.jar b/cf-allure-commandline/dist/lib/jackson-databind-2.19.1.jar new file mode 100644 index 0000000..95de60b Binary files /dev/null and b/cf-allure-commandline/dist/lib/jackson-databind-2.19.1.jar differ diff --git a/cf-allure-commandline/dist/lib/jackson-databind-2.9.6.jar b/cf-allure-commandline/dist/lib/jackson-databind-2.9.6.jar deleted file mode 100755 index e8eb658..0000000 Binary files a/cf-allure-commandline/dist/lib/jackson-databind-2.9.6.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/jackson-dataformat-xml-2.19.1.jar b/cf-allure-commandline/dist/lib/jackson-dataformat-xml-2.19.1.jar new file mode 100644 index 0000000..ce0f1ac Binary files /dev/null and b/cf-allure-commandline/dist/lib/jackson-dataformat-xml-2.19.1.jar differ diff --git a/cf-allure-commandline/dist/lib/jackson-dataformat-xml-2.9.6.jar b/cf-allure-commandline/dist/lib/jackson-dataformat-xml-2.9.6.jar deleted file mode 100755 index 5574b60..0000000 Binary files a/cf-allure-commandline/dist/lib/jackson-dataformat-xml-2.9.6.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/jackson-dataformat-yaml-2.19.1.jar b/cf-allure-commandline/dist/lib/jackson-dataformat-yaml-2.19.1.jar new file mode 100644 index 0000000..b277085 Binary files /dev/null and b/cf-allure-commandline/dist/lib/jackson-dataformat-yaml-2.19.1.jar differ diff --git a/cf-allure-commandline/dist/lib/jackson-dataformat-yaml-2.9.6.jar b/cf-allure-commandline/dist/lib/jackson-dataformat-yaml-2.9.6.jar deleted file mode 100755 index 49d5fb5..0000000 Binary files a/cf-allure-commandline/dist/lib/jackson-dataformat-yaml-2.9.6.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/jackson-module-jaxb-annotations-2.19.1.jar b/cf-allure-commandline/dist/lib/jackson-module-jaxb-annotations-2.19.1.jar new file mode 100644 index 0000000..0043f38 Binary files /dev/null and b/cf-allure-commandline/dist/lib/jackson-module-jaxb-annotations-2.19.1.jar differ diff --git a/cf-allure-commandline/dist/lib/jackson-module-jaxb-annotations-2.9.6.jar b/cf-allure-commandline/dist/lib/jackson-module-jaxb-annotations-2.9.6.jar deleted file mode 100755 index c138925..0000000 Binary files a/cf-allure-commandline/dist/lib/jackson-module-jaxb-annotations-2.9.6.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/jakarta.activation-api-1.2.2.jar b/cf-allure-commandline/dist/lib/jakarta.activation-api-1.2.2.jar new file mode 100644 index 0000000..3cc969d Binary files /dev/null and b/cf-allure-commandline/dist/lib/jakarta.activation-api-1.2.2.jar differ diff --git a/cf-allure-commandline/dist/lib/javax.activation-api-1.2.0.jar b/cf-allure-commandline/dist/lib/javax.activation-api-1.2.0.jar new file mode 100644 index 0000000..986c365 Binary files /dev/null and b/cf-allure-commandline/dist/lib/javax.activation-api-1.2.0.jar differ diff --git a/cf-allure-commandline/dist/lib/javax.servlet-api-3.1.0.jar b/cf-allure-commandline/dist/lib/javax.servlet-api-3.1.0.jar deleted file mode 100755 index 6b14c3d..0000000 Binary files a/cf-allure-commandline/dist/lib/javax.servlet-api-3.1.0.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/jaxb-api-2.3.0.jar b/cf-allure-commandline/dist/lib/jaxb-api-2.3.0.jar deleted file mode 100755 index 0817c08..0000000 Binary files a/cf-allure-commandline/dist/lib/jaxb-api-2.3.0.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/jaxb-api-2.3.1.jar b/cf-allure-commandline/dist/lib/jaxb-api-2.3.1.jar new file mode 100644 index 0000000..4565865 Binary files /dev/null and b/cf-allure-commandline/dist/lib/jaxb-api-2.3.1.jar differ diff --git a/cf-allure-commandline/dist/lib/jcommander-1.72.jar b/cf-allure-commandline/dist/lib/jcommander-1.72.jar deleted file mode 100755 index acb8e60..0000000 Binary files a/cf-allure-commandline/dist/lib/jcommander-1.72.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/jcommander-1.82.jar b/cf-allure-commandline/dist/lib/jcommander-1.82.jar new file mode 100644 index 0000000..90f4424 Binary files /dev/null and b/cf-allure-commandline/dist/lib/jcommander-1.82.jar differ diff --git a/cf-allure-commandline/dist/lib/jetty-http-9.4.11.v20180605.jar b/cf-allure-commandline/dist/lib/jetty-http-9.4.11.v20180605.jar deleted file mode 100755 index 8d50fc2..0000000 Binary files a/cf-allure-commandline/dist/lib/jetty-http-9.4.11.v20180605.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/jetty-io-9.4.11.v20180605.jar b/cf-allure-commandline/dist/lib/jetty-io-9.4.11.v20180605.jar deleted file mode 100755 index 9e6d05f..0000000 Binary files a/cf-allure-commandline/dist/lib/jetty-io-9.4.11.v20180605.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/jetty-server-9.4.11.v20180605.jar b/cf-allure-commandline/dist/lib/jetty-server-9.4.11.v20180605.jar deleted file mode 100755 index e6c8973..0000000 Binary files a/cf-allure-commandline/dist/lib/jetty-server-9.4.11.v20180605.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/jetty-util-9.4.11.v20180605.jar b/cf-allure-commandline/dist/lib/jetty-util-9.4.11.v20180605.jar deleted file mode 100755 index f02e959..0000000 Binary files a/cf-allure-commandline/dist/lib/jetty-util-9.4.11.v20180605.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/log4j-1.2.17.jar b/cf-allure-commandline/dist/lib/log4j-1.2.17.jar deleted file mode 100755 index 1d425cf..0000000 Binary files a/cf-allure-commandline/dist/lib/log4j-1.2.17.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/logback-classic-1.3.15.jar b/cf-allure-commandline/dist/lib/logback-classic-1.3.15.jar new file mode 100644 index 0000000..9ec674a Binary files /dev/null and b/cf-allure-commandline/dist/lib/logback-classic-1.3.15.jar differ diff --git a/cf-allure-commandline/dist/lib/logback-core-1.3.15.jar b/cf-allure-commandline/dist/lib/logback-core-1.3.15.jar new file mode 100644 index 0000000..c3d738e Binary files /dev/null and b/cf-allure-commandline/dist/lib/logback-core-1.3.15.jar differ diff --git a/cf-allure-commandline/dist/lib/opencsv-4.2.jar b/cf-allure-commandline/dist/lib/opencsv-4.2.jar deleted file mode 100755 index 344de3f..0000000 Binary files a/cf-allure-commandline/dist/lib/opencsv-4.2.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/opencsv-5.9.jar b/cf-allure-commandline/dist/lib/opencsv-5.9.jar new file mode 100644 index 0000000..de5fe04 Binary files /dev/null and b/cf-allure-commandline/dist/lib/opencsv-5.9.jar differ diff --git a/cf-allure-commandline/dist/lib/slf4j-api-1.7.25.jar b/cf-allure-commandline/dist/lib/slf4j-api-1.7.25.jar deleted file mode 100755 index 0143c09..0000000 Binary files a/cf-allure-commandline/dist/lib/slf4j-api-1.7.25.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/slf4j-api-2.0.17.jar b/cf-allure-commandline/dist/lib/slf4j-api-2.0.17.jar new file mode 100644 index 0000000..26b1545 Binary files /dev/null and b/cf-allure-commandline/dist/lib/slf4j-api-2.0.17.jar differ diff --git a/cf-allure-commandline/dist/lib/slf4j-log4j12-1.7.25.jar b/cf-allure-commandline/dist/lib/slf4j-log4j12-1.7.25.jar deleted file mode 100755 index 7d88a6e..0000000 Binary files a/cf-allure-commandline/dist/lib/slf4j-log4j12-1.7.25.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/snakeyaml-1.18.jar b/cf-allure-commandline/dist/lib/snakeyaml-1.18.jar deleted file mode 100755 index e3fac8e..0000000 Binary files a/cf-allure-commandline/dist/lib/snakeyaml-1.18.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/snakeyaml-2.4.jar b/cf-allure-commandline/dist/lib/snakeyaml-2.4.jar new file mode 100644 index 0000000..697acde Binary files /dev/null and b/cf-allure-commandline/dist/lib/snakeyaml-2.4.jar differ diff --git a/cf-allure-commandline/dist/lib/stax2-api-3.1.4.jar b/cf-allure-commandline/dist/lib/stax2-api-3.1.4.jar deleted file mode 100755 index dded036..0000000 Binary files a/cf-allure-commandline/dist/lib/stax2-api-3.1.4.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/stax2-api-4.2.2.jar b/cf-allure-commandline/dist/lib/stax2-api-4.2.2.jar new file mode 100644 index 0000000..cc5844f Binary files /dev/null and b/cf-allure-commandline/dist/lib/stax2-api-4.2.2.jar differ diff --git a/cf-allure-commandline/dist/lib/tika-core-1.18.jar b/cf-allure-commandline/dist/lib/tika-core-1.18.jar deleted file mode 100755 index 13211fe..0000000 Binary files a/cf-allure-commandline/dist/lib/tika-core-1.18.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/tika-core-2.9.4.jar b/cf-allure-commandline/dist/lib/tika-core-2.9.4.jar new file mode 100644 index 0000000..adf4cf2 Binary files /dev/null and b/cf-allure-commandline/dist/lib/tika-core-2.9.4.jar differ diff --git a/cf-allure-commandline/dist/lib/woodstox-core-5.0.3.jar b/cf-allure-commandline/dist/lib/woodstox-core-5.0.3.jar deleted file mode 100755 index 1c26864..0000000 Binary files a/cf-allure-commandline/dist/lib/woodstox-core-5.0.3.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/lib/woodstox-core-7.1.1.jar b/cf-allure-commandline/dist/lib/woodstox-core-7.1.1.jar new file mode 100644 index 0000000..92c1631 Binary files /dev/null and b/cf-allure-commandline/dist/lib/woodstox-core-7.1.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/behaviors-plugin/behaviors-plugin-2.34.1.jar b/cf-allure-commandline/dist/plugins/behaviors-plugin/behaviors-plugin-2.34.1.jar new file mode 100644 index 0000000..75aa25e Binary files /dev/null and b/cf-allure-commandline/dist/plugins/behaviors-plugin/behaviors-plugin-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/behaviors-plugin/plugin.jar b/cf-allure-commandline/dist/plugins/behaviors-plugin/plugin.jar deleted file mode 100755 index 325caa6..0000000 Binary files a/cf-allure-commandline/dist/plugins/behaviors-plugin/plugin.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/plugins/behaviors-plugin/static/index.js b/cf-allure-commandline/dist/plugins/behaviors-plugin/static/index.js index 620a095..5ff173c 100755 --- a/cf-allure-commandline/dist/plugins/behaviors-plugin/static/index.js +++ b/cf-allure-commandline/dist/plugins/behaviors-plugin/static/index.js @@ -56,6 +56,20 @@ allure.api.addTranslation('de', { } }); +allure.api.addTranslation('nl', { + tab: { + behaviors: { + name: 'Functionaliteit' + } + }, + widget: { + behaviors: { + name: 'Features en story’s', + showAll: 'Toon alle' + } + } +}); + allure.api.addTranslation('he', { tab: { behaviors: { @@ -75,15 +89,169 @@ allure.api.addTranslation('br', { behaviors: { name: 'Comportamentos' } - }, + }, widget: { behaviors: { - name: 'Funcionalidades por história', + name: 'Funcionalidades por história', showAll: 'Mostrar tudo' } } }); +allure.api.addTranslation('ja', { + tab: { + behaviors: { + name: '振る舞い' + } + }, + widget: { + behaviors: { + name: 'ストーリー別の機能', + showAll: '全て表示' + } + } +}); + +allure.api.addTranslation('es', { + tab: { + behaviors: { + name: 'Funcionalidades' + } + }, + widget: { + behaviors: { + name: 'Funcionalidades por Historias de Usuario', + showAll: 'mostrar todo' + } + } +}); + +allure.api.addTranslation('kr', { + tab: { + behaviors: { + name: '동작' + } + }, + widget: { + behaviors: { + name: '스토리별 기능', + showAll: '전체 보기' + } + } +}); + +allure.api.addTranslation('fr', { + tab: { + behaviors: { + name: 'Comportements' + } + }, + widget: { + behaviors: { + name: 'Thèmes par histoires', + showAll: 'Montrer tout' + } + } +}); + +allure.api.addTranslation('pl', { + tab: { + behaviors: { + name: 'Zachowania' + } + }, + widget: { + behaviors: { + name: 'Funkcje według historii', + showAll: 'pokaż wszystko' + } + } +}); + +allure.api.addTranslation('am', { + tab: { + behaviors: { + name: 'Վարքագծեր' + } + }, + widget: { + behaviors: { + name: 'Ֆիչրները ըստ պատմությունների', + showAll: 'ցույց տալ բոլորը' + } + } +}); + +allure.api.addTranslation('az', { + tab: { + behaviors: { + name: 'Davranışlar' + } + }, + widget: { + behaviors: { + name: 'Hekayələr üzrə xüsusiyyətlər', + showAll: 'hamısını göstər' + } + } +}); + +allure.api.addTranslation('sv', { + tab: { + behaviors: { + name: 'Beteenden' + } + }, + widget: { + behaviors: { + name: 'Funktioner efter user stories', + showAll: 'visa allt' + } + } +}); + +allure.api.addTranslation('isv', { + tab: { + behaviors: { + name: 'Funkcionalnost', + } + }, + widget: { + behaviors: { + name: 'Funkcionalnost', + showAll: 'pokaži vsěčto', + } + } +}); + +allure.api.addTranslation('ka', { + tab: { + behaviors: { + name: 'ფუნქციონალი', + } + }, + widget: { + behaviors: { + name: 'ფუნქციონალი', + showAll: 'ყველას ჩვენება', + } + } +}); + +allure.api.addTranslation('it', { + tab: { + behaviors: { + name: 'Comportamenti' + } + }, + widget: { + behaviors: { + name: 'Funzionalità per storie', + showAll: 'Mostra tutto' + } + } +}); + allure.api.addTab('behaviors', { title: 'tab.behaviors.name', icon: 'fa fa-list', route: 'behaviors(/)(:testGroup)(/)(:testResult)(/)(:testResultTab)(/)', @@ -105,4 +273,4 @@ allure.api.addWidget('widgets', 'behaviors', allure.components.WidgetStatusView. title: 'widget.behaviors.name', baseUrl: 'behaviors', showLinks: true -})); \ No newline at end of file +})); diff --git a/cf-allure-commandline/dist/plugins/custom-logo-plugin/custom-logo-plugin-2.34.1.jar b/cf-allure-commandline/dist/plugins/custom-logo-plugin/custom-logo-plugin-2.34.1.jar new file mode 100644 index 0000000..08debd9 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/custom-logo-plugin/custom-logo-plugin-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/custom-logo-plugin/static/styles.css b/cf-allure-commandline/dist/plugins/custom-logo-plugin/static/styles.css index 74717c1..62168d5 100755 --- a/cf-allure-commandline/dist/plugins/custom-logo-plugin/static/styles.css +++ b/cf-allure-commandline/dist/plugins/custom-logo-plugin/static/styles.css @@ -1,4 +1,4 @@ .side-nav__brand { - background: url('custom-logo.svg') no-repeat left center; + background: url('custom-logo.svg') no-repeat left center !important; margin-left: 10px; } \ No newline at end of file diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/allure-plugin.yml b/cf-allure-commandline/dist/plugins/jira-plugin/allure-plugin.yml new file mode 100644 index 0000000..c36b0bb --- /dev/null +++ b/cf-allure-commandline/dist/plugins/jira-plugin/allure-plugin.yml @@ -0,0 +1,5 @@ +id: jira +name: Jira Plugin +description: The plugin that adds support for Jira integration. +extensions: + - io.qameta.allure.jira.JiraExportPlugin diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/jira-plugin-2.34.1.jar b/cf-allure-commandline/dist/plugins/jira-plugin/jira-plugin-2.34.1.jar new file mode 100644 index 0000000..e405e0d Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/jira-plugin-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/lib/allure-jira-commons-2.34.1.jar b/cf-allure-commandline/dist/plugins/jira-plugin/lib/allure-jira-commons-2.34.1.jar new file mode 100644 index 0000000..15e61a1 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/lib/allure-jira-commons-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/lib/annotations-13.0.jar b/cf-allure-commandline/dist/plugins/jira-plugin/lib/annotations-13.0.jar new file mode 100644 index 0000000..fb794be Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/lib/annotations-13.0.jar differ diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/lib/converter-jackson-3.0.0.jar b/cf-allure-commandline/dist/plugins/jira-plugin/lib/converter-jackson-3.0.0.jar new file mode 100644 index 0000000..b0ed20d Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/lib/converter-jackson-3.0.0.jar differ diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/lib/jackson-annotations-2.19.1.jar b/cf-allure-commandline/dist/plugins/jira-plugin/lib/jackson-annotations-2.19.1.jar new file mode 100644 index 0000000..3ec711b Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/lib/jackson-annotations-2.19.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/lib/jackson-core-2.19.1.jar b/cf-allure-commandline/dist/plugins/jira-plugin/lib/jackson-core-2.19.1.jar new file mode 100644 index 0000000..aee4e1b Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/lib/jackson-core-2.19.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/lib/jackson-databind-2.19.1.jar b/cf-allure-commandline/dist/plugins/jira-plugin/lib/jackson-databind-2.19.1.jar new file mode 100644 index 0000000..95de60b Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/lib/jackson-databind-2.19.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/lib/kotlin-stdlib-2.1.21.jar b/cf-allure-commandline/dist/plugins/jira-plugin/lib/kotlin-stdlib-2.1.21.jar new file mode 100644 index 0000000..c144752 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/lib/kotlin-stdlib-2.1.21.jar differ diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/lib/kotlin-stdlib-jdk7-1.9.10.jar b/cf-allure-commandline/dist/plugins/jira-plugin/lib/kotlin-stdlib-jdk7-1.9.10.jar new file mode 100644 index 0000000..ff0bce5 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/lib/kotlin-stdlib-jdk7-1.9.10.jar differ diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/lib/kotlin-stdlib-jdk8-1.9.10.jar b/cf-allure-commandline/dist/plugins/jira-plugin/lib/kotlin-stdlib-jdk8-1.9.10.jar new file mode 100644 index 0000000..5fa6ce9 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/lib/kotlin-stdlib-jdk8-1.9.10.jar differ diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/lib/okhttp-4.12.0.jar b/cf-allure-commandline/dist/plugins/jira-plugin/lib/okhttp-4.12.0.jar new file mode 100644 index 0000000..faf3fa8 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/lib/okhttp-4.12.0.jar differ diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/lib/okio-jvm-3.6.0.jar b/cf-allure-commandline/dist/plugins/jira-plugin/lib/okio-jvm-3.6.0.jar new file mode 100644 index 0000000..ec8ad90 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/lib/okio-jvm-3.6.0.jar differ diff --git a/cf-allure-commandline/dist/plugins/jira-plugin/lib/retrofit-3.0.0.jar b/cf-allure-commandline/dist/plugins/jira-plugin/lib/retrofit-3.0.0.jar new file mode 100644 index 0000000..0c9bd8e Binary files /dev/null and b/cf-allure-commandline/dist/plugins/jira-plugin/lib/retrofit-3.0.0.jar differ diff --git a/cf-allure-commandline/dist/plugins/junit-xml-plugin/junit-xml-plugin-2.34.1.jar b/cf-allure-commandline/dist/plugins/junit-xml-plugin/junit-xml-plugin-2.34.1.jar new file mode 100644 index 0000000..bbcbdd8 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/junit-xml-plugin/junit-xml-plugin-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/junit-xml-plugin/junit-xml-plugin-2.8-SNAPSHOT.jar b/cf-allure-commandline/dist/plugins/junit-xml-plugin/junit-xml-plugin-2.8-SNAPSHOT.jar deleted file mode 100755 index 65dd07b..0000000 Binary files a/cf-allure-commandline/dist/plugins/junit-xml-plugin/junit-xml-plugin-2.8-SNAPSHOT.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/plugins/packages-plugin/packages-plugin-2.34.1.jar b/cf-allure-commandline/dist/plugins/packages-plugin/packages-plugin-2.34.1.jar new file mode 100644 index 0000000..1c1063b Binary files /dev/null and b/cf-allure-commandline/dist/plugins/packages-plugin/packages-plugin-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/packages-plugin/plugin.jar b/cf-allure-commandline/dist/plugins/packages-plugin/plugin.jar deleted file mode 100755 index 06ed4cf..0000000 Binary files a/cf-allure-commandline/dist/plugins/packages-plugin/plugin.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/plugins/packages-plugin/static/index.js b/cf-allure-commandline/dist/plugins/packages-plugin/static/index.js index 0fe6d91..b71233a 100755 --- a/cf-allure-commandline/dist/plugins/packages-plugin/static/index.js +++ b/cf-allure-commandline/dist/plugins/packages-plugin/static/index.js @@ -32,6 +32,14 @@ allure.api.addTranslation('de', { } }); +allure.api.addTranslation('nl', { + tab: { + packages: { + name: 'Packages' + } + } +}); + allure.api.addTranslation('he', { tab: { packages: { @@ -48,6 +56,94 @@ allure.api.addTranslation('br', { } }); +allure.api.addTranslation('ja', { + tab: { + packages: { + name: 'パッケージ' + } + } +}); + +allure.api.addTranslation('es', { + tab: { + packages: { + name: 'Paquetes' + } + } +}); + +allure.api.addTranslation('kr', { + tab: { + packages: { + name: '패키지' + } + } +}); + +allure.api.addTranslation('fr', { + tab: { + packages: { + name: 'Paquets' + } + } +}); + +allure.api.addTranslation('pl', { + tab: { + packages: { + name: 'Pakiety' + } + } +}); + +allure.api.addTranslation('am', { + tab: { + packages: { + name: 'Փաթեթներ' + } + } +}); + +allure.api.addTranslation('az', { + tab: { + packages: { + name: 'Paketlər' + } + } +}); + +allure.api.addTranslation('sv', { + tab: { + packages: { + name: 'Paket' + } + } +}); + +allure.api.addTranslation('isv', { + tab: { + packages: { + name: 'Pakety' + } + } +}); + +allure.api.addTranslation('ka', { + tab: { + packages: { + name: 'პაკეტები' + } + } +}); + +allure.api.addTranslation('it', { + tab: { + packages: { + name: 'Pacchetti' + } + } +}); + allure.api.addTab('packages', { title: 'tab.packages.name', icon: 'fa fa-align-left', route: 'packages(/)(:testGroup)(/)(:testResult)(/)(:testResultTab)(/)', diff --git a/cf-allure-commandline/dist/plugins/screen-diff-plugin/screen-diff-plugin-2.34.1.jar b/cf-allure-commandline/dist/plugins/screen-diff-plugin/screen-diff-plugin-2.34.1.jar new file mode 100644 index 0000000..6e28d67 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/screen-diff-plugin/screen-diff-plugin-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/screen-diff-plugin/static/index.js b/cf-allure-commandline/dist/plugins/screen-diff-plugin/static/index.js index 01f1eb7..3774f88 100755 --- a/cf-allure-commandline/dist/plugins/screen-diff-plugin/static/index.js +++ b/cf-allure-commandline/dist/plugins/screen-diff-plugin/static/index.js @@ -1,74 +1,170 @@ (function () { - var settings = allure.getPluginSettings('screen-diff', {diffType: 'diff'}); + var settings = allure.getPluginSettings('screen-diff', { diffType: 'diff' }); function renderImage(src) { - return '
' + - '' + - '
'; + return ( + '
' + + '' + + '
' + ); } - function renderDiffContent(type, data) { - function findImage(name) { - if (data.testStage && data.testStage.attachments) { - return data.testStage.attachments.filter(function (attachment) { - return attachment.name === name; - })[0]; + function findImage(data, name) { + if (data.testStage && data.testStage.attachments) { + var matchedImage = data.testStage.attachments.filter(function (attachment) { + return attachment.name === name; + })[0]; + if (matchedImage) { + return 'data/attachments/' + matchedImage.source; } - return null; - } - - var diffImage = findImage('diff'); - var actualImage = findImage('actual'); - var expectedImage = findImage('expected'); - - if (!diffImage && !actualImage && !expectedImage) { - return 'Diff, actual and expected image have not been provided.'; } + return null; + } + function renderDiffContent(type, diffImage, actualImage, expectedImage) { if (type === 'diff') { - if (!diffImage) { - return renderImage(actualImage.source); + if (diffImage) { + return renderImage(diffImage); } - return renderImage(diffImage.source); } - if (type === 'overlay') { - return '
' + - '' + + if (type === 'overlay' && expectedImage) { + return ( + '
' + + '' + '
' + - '' + + '' + '
' + - '
'; + '
' + ); } + if (actualImage) { + return renderImage(actualImage); + } + return 'No diff data provided'; } + var TestResultView = Backbone.Marionette.View.extend({ + regions: { + subView: '.screen-diff-view', + }, + template: function () { + return '
'; + }, + onRender: function () { + var data = this.model.toJSON(); + var testType = data.labels.filter(function (label) { + return label.name === 'testType'; + })[0]; + var diffImage = findImage(data, 'diff'); + var actualImage = findImage(data, 'actual'); + var expectedImage = findImage(data, 'expected'); + if (!testType || testType.value !== 'screenshotDiff') { + return; + } + this.showChildView( + 'subView', + new ScreenDiffView({ + diffImage: diffImage, + actualImage: actualImage, + expectedImage: expectedImage, + }), + ); + }, + }); + var ErrorView = Backbone.Marionette.View.extend({ + templateContext: function () { + return this.options; + }, + template: function (data) { + return '
' + data.error + '
'; + }, + }); + var AttachmentView = Backbone.Marionette.View.extend({ + regions: { + subView: '.screen-diff-view', + }, + template: function () { + return '
'; + }, + onRender: function () { + jQuery + .getJSON(this.options.sourceUrl) + .then(this.renderScreenDiffView.bind(this), this.renderErrorView.bind(this)); + }, + renderErrorView: function (error) { + console.log(error); + this.showChildView( + 'subView', + new ErrorView({ + error: error.statusText, + }), + ); + }, + renderScreenDiffView: function (data) { + this.showChildView( + 'subView', + new ScreenDiffView({ + diffImage: data.diff, + actualImage: data.actual, + expectedImage: data.expected, + }), + ); + }, + }); + var ScreenDiffView = Backbone.Marionette.View.extend({ className: 'pane__section', - events: { - 'click [name="screen-diff-type"]': 'onDiffTypeChange', - 'mousemove .screen-diff__overlay': 'onOverlayMove' + events: function () { + return { + ['click [name="screen-diff-type-' + this.cid + '"]']: 'onDiffTypeChange', + 'mousemove .screen-diff__overlay': 'onOverlayMove', + }; + }, + initialize: function (options) { + this.diffImage = options.diffImage; + this.actualImage = options.actualImage; + this.expectedImage = options.expectedImage; + this.radioName = 'screen-diff-type-' + this.cid; }, templateContext: function () { return { - diffType: settings.get('diffType') - } + diffType: settings.get('diffType'), + diffImage: this.diffImage, + actualImage: this.actualImage, + expectedImage: this.expectedImage, + radioName: this.radioName, + }; }, template: function (data) { - var testType = data.labels.filter(function (label) { - return label.name === 'testType' - })[0]; - - if (!testType || testType.value !== 'screenshotDiff') { + if (!data.diffImage && !data.actualImage && !data.expectedImage) { return ''; } - return '

Screen Diff

' + + return ( + '

Screen Diff

' + '
' + '
' + - '' + - '' + + '' + + '' + '
' + - renderDiffContent(data.diffType, data) + - '
'; + renderDiffContent( + data.diffType, + data.diffImage, + data.actualImage, + data.expectedImage, + ) + + '' + ); }, adjustImageSize: function (event) { var overImage = this.$(event.target); @@ -76,7 +172,10 @@ }, onRender: function () { const diffType = settings.get('diffType'); - this.$('[name="screen-diff-type"][value="' + diffType + '"]').prop('checked', true); + this.$('[name="' + this.radioName + '"][value="' + diffType + '"]').prop( + 'checked', + true, + ); if (diffType === 'overlay') { this.$('.screen-diff__image-over img').on('load', this.adjustImageSize.bind(this)); } @@ -91,7 +190,11 @@ onDiffTypeChange: function (event) { settings.save('diffType', event.target.value); this.render(); - } + }, + }); + allure.api.addTestResultBlock(TestResultView, { position: 'before' }); + allure.api.addAttachmentViewer('application/vnd.allure.image.diff', { + View: AttachmentView, + icon: 'fa fa-exchange', }); - allure.api.addTestResultBlock(ScreenDiffView, {position: 'before'}); })(); diff --git a/cf-allure-commandline/dist/plugins/screen-diff-plugin/static/styles.css b/cf-allure-commandline/dist/plugins/screen-diff-plugin/static/styles.css index 43a83e2..6cf2219 100755 --- a/cf-allure-commandline/dist/plugins/screen-diff-plugin/static/styles.css +++ b/cf-allure-commandline/dist/plugins/screen-diff-plugin/static/styles.css @@ -24,3 +24,7 @@ overflow: hidden; box-shadow: 2px 0 1px -1px #aaa; } + +.screen-diff-error { + color: #fd5a3e; +} diff --git a/cf-allure-commandline/dist/plugins/trx-plugin/trx-plugin-2.34.1.jar b/cf-allure-commandline/dist/plugins/trx-plugin/trx-plugin-2.34.1.jar new file mode 100644 index 0000000..e9991b6 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/trx-plugin/trx-plugin-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/trx-plugin/trx-plugin-2.8-SNAPSHOT.jar b/cf-allure-commandline/dist/plugins/trx-plugin/trx-plugin-2.8-SNAPSHOT.jar deleted file mode 100755 index 77096ed..0000000 Binary files a/cf-allure-commandline/dist/plugins/trx-plugin/trx-plugin-2.8-SNAPSHOT.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/plugins/xctest-plugin/xctest-plugin-2.34.1.jar b/cf-allure-commandline/dist/plugins/xctest-plugin/xctest-plugin-2.34.1.jar new file mode 100644 index 0000000..78276cd Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xctest-plugin/xctest-plugin-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/xctest-plugin/xctest-plugin-2.8-SNAPSHOT.jar b/cf-allure-commandline/dist/plugins/xctest-plugin/xctest-plugin-2.8-SNAPSHOT.jar deleted file mode 100755 index 31be134..0000000 Binary files a/cf-allure-commandline/dist/plugins/xctest-plugin/xctest-plugin-2.8-SNAPSHOT.jar and /dev/null differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/allure-plugin.yml b/cf-allure-commandline/dist/plugins/xray-plugin/allure-plugin.yml new file mode 100644 index 0000000..231ce80 --- /dev/null +++ b/cf-allure-commandline/dist/plugins/xray-plugin/allure-plugin.yml @@ -0,0 +1,5 @@ +id: xray +name: Xray Plugin +description: The plugin that adds support for Xray integration. +extensions: + - io.qameta.allure.xray.XrayTestRunExportPlugin diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/lib/allure-jira-commons-2.34.1.jar b/cf-allure-commandline/dist/plugins/xray-plugin/lib/allure-jira-commons-2.34.1.jar new file mode 100644 index 0000000..15e61a1 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/lib/allure-jira-commons-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/lib/annotations-13.0.jar b/cf-allure-commandline/dist/plugins/xray-plugin/lib/annotations-13.0.jar new file mode 100644 index 0000000..fb794be Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/lib/annotations-13.0.jar differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/lib/converter-jackson-3.0.0.jar b/cf-allure-commandline/dist/plugins/xray-plugin/lib/converter-jackson-3.0.0.jar new file mode 100644 index 0000000..b0ed20d Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/lib/converter-jackson-3.0.0.jar differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/lib/jackson-annotations-2.19.1.jar b/cf-allure-commandline/dist/plugins/xray-plugin/lib/jackson-annotations-2.19.1.jar new file mode 100644 index 0000000..3ec711b Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/lib/jackson-annotations-2.19.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/lib/jackson-core-2.19.1.jar b/cf-allure-commandline/dist/plugins/xray-plugin/lib/jackson-core-2.19.1.jar new file mode 100644 index 0000000..aee4e1b Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/lib/jackson-core-2.19.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/lib/jackson-databind-2.19.1.jar b/cf-allure-commandline/dist/plugins/xray-plugin/lib/jackson-databind-2.19.1.jar new file mode 100644 index 0000000..95de60b Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/lib/jackson-databind-2.19.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/lib/kotlin-stdlib-2.1.21.jar b/cf-allure-commandline/dist/plugins/xray-plugin/lib/kotlin-stdlib-2.1.21.jar new file mode 100644 index 0000000..c144752 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/lib/kotlin-stdlib-2.1.21.jar differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/lib/kotlin-stdlib-jdk7-1.9.10.jar b/cf-allure-commandline/dist/plugins/xray-plugin/lib/kotlin-stdlib-jdk7-1.9.10.jar new file mode 100644 index 0000000..ff0bce5 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/lib/kotlin-stdlib-jdk7-1.9.10.jar differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/lib/kotlin-stdlib-jdk8-1.9.10.jar b/cf-allure-commandline/dist/plugins/xray-plugin/lib/kotlin-stdlib-jdk8-1.9.10.jar new file mode 100644 index 0000000..5fa6ce9 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/lib/kotlin-stdlib-jdk8-1.9.10.jar differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/lib/okhttp-4.12.0.jar b/cf-allure-commandline/dist/plugins/xray-plugin/lib/okhttp-4.12.0.jar new file mode 100644 index 0000000..faf3fa8 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/lib/okhttp-4.12.0.jar differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/lib/okio-jvm-3.6.0.jar b/cf-allure-commandline/dist/plugins/xray-plugin/lib/okio-jvm-3.6.0.jar new file mode 100644 index 0000000..ec8ad90 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/lib/okio-jvm-3.6.0.jar differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/lib/retrofit-3.0.0.jar b/cf-allure-commandline/dist/plugins/xray-plugin/lib/retrofit-3.0.0.jar new file mode 100644 index 0000000..0c9bd8e Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/lib/retrofit-3.0.0.jar differ diff --git a/cf-allure-commandline/dist/plugins/xray-plugin/xray-plugin-2.34.1.jar b/cf-allure-commandline/dist/plugins/xray-plugin/xray-plugin-2.34.1.jar new file mode 100644 index 0000000..b73243d Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xray-plugin/xray-plugin-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/xunit-xml-plugin/xunit-xml-plugin-2.34.1.jar b/cf-allure-commandline/dist/plugins/xunit-xml-plugin/xunit-xml-plugin-2.34.1.jar new file mode 100644 index 0000000..ff167b0 Binary files /dev/null and b/cf-allure-commandline/dist/plugins/xunit-xml-plugin/xunit-xml-plugin-2.34.1.jar differ diff --git a/cf-allure-commandline/dist/plugins/xunit-xml-plugin/xunit-xml-plugin-2.8-SNAPSHOT.jar b/cf-allure-commandline/dist/plugins/xunit-xml-plugin/xunit-xml-plugin-2.8-SNAPSHOT.jar deleted file mode 100755 index aaddcdc..0000000 Binary files a/cf-allure-commandline/dist/plugins/xunit-xml-plugin/xunit-xml-plugin-2.8-SNAPSHOT.jar and /dev/null differ diff --git a/cf-allure-commandline/package.json b/cf-allure-commandline/package.json index ab6034e..b2979a8 100755 --- a/cf-allure-commandline/package.json +++ b/cf-allure-commandline/package.json @@ -1,6 +1,6 @@ { - "_from": "allure-commandline@^2.7.0", - "_id": "allure-commandline@2.7.0", + "_from": "allure-commandline@^2.34.1", + "_id": "allure-commandline@2.34.1", "_inBundle": false, "_integrity": "sha512-tahwh3dQcDolb97C1GjnxjrGY6WhezaJ1E+TdluDVn74GzOGsskW3fhtaJC4Iji17x2Wm6Xjv0wrOkH8kk20xA==", "_location": "/allure-commandline", @@ -8,19 +8,19 @@ "_requested": { "type": "range", "registry": true, - "raw": "allure-commandline@^2.7.0", + "raw": "allure-commandline@^2.34.1", "name": "allure-commandline", "escapedName": "allure-commandline", - "rawSpec": "^2.7.0", + "rawSpec": "^2.34.1", "saveSpec": null, - "fetchSpec": "^2.7.0" + "fetchSpec": "^2.34.1" }, "_requiredBy": [ "/" ], - "_resolved": "https://registry.npmjs.org/allure-commandline/-/allure-commandline-2.7.0.tgz", - "_shasum": "8ee67f1f0d6649a7fc30be639b9c3c5ea412c170", - "_spec": "allure-commandline@^2.7.0", + "_resolved": "https://registry.npmjs.org/allure-commandline/-/allure-commandline-2.34.1.tgz", + "_shasum": "8ee67f1f0d649a7fc30be639b9c3c5ea412c170", + "_spec": "allure-commandline@^2.34.1", "_where": "/home/denys/Documents/cf-docker-test-reporting", "bin": { "allure": "bin/allure" @@ -47,5 +47,5 @@ "scripts": { "test": "./bin/allure --version" }, - "version": "2.7.0" + "version": "2.34.1" }