diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..e89896f --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,40 @@ +name: Build + +on: + pull_request: + push: + branches: + - master + - develop + paths-ignore: + - '.github/**' + - README.md + - gradle.properties + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Set up JDK 21 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '21' + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Setup git credentials + uses: oleksiyrudenko/gha-git-credentials@v2 + with: + name: 'reportportal.io' + email: 'support@reportportal.io' + token: ${{ secrets.GITHUB_TOKEN }} + + - name: Build with Gradle + id: build + run: | + ./gradlew build diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml new file mode 100644 index 0000000..0e00468 --- /dev/null +++ b/.github/workflows/promote.yml @@ -0,0 +1,101 @@ +# Copyright 2022 EPAM Systems +# 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 +# +# http://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. + +name: Promote + +on: + workflow_dispatch: + inputs: + version: + description: 'Release version' + required: true + +env: + REPOSITORY_URL: 'https://maven.pkg.github.com' + UPSTREAM_REPOSITORY_URL: 'https://oss.sonatype.org' + PACKAGE_SUFFIXES: '-javadoc.jar,-javadoc.jar.asc,-sources.jar,-sources.jar.asc,.jar,.jar.asc,.pom,.pom.asc' + PACKAGE: 'com.epam.reportportal' + + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Get variables + run: | + echo "ARTIFACT=`echo ${{ github.repository }} | cut -d/ -f2- | awk '{print tolower($0)}'`" >> $GITHUB_ENV + echo "PACKAGE_PATH=`echo ${{ env.PACKAGE }} | sed 's/\./\//g'`" >> $GITHUB_ENV + - name: Upload package + run: | + IFS=',' read -a files <<< '${{ env.PACKAGE_SUFFIXES }}' + for f in ${files[@]}; do + export URL="${{ env.REPOSITORY_URL }}/${{ github.repository }}/${PACKAGE_PATH}/${ARTIFACT}/${{ github.event.inputs.version }}/${ARTIFACT}-${{ github.event.inputs.version }}${f}" + echo "Downloading artifact: ${URL}" + curl -f -u ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }} -s -O -L "${URL}" + done + files=($(ls)) + echo 'Files downloaded:' + echo "${files[@]}" + echo 'Bundle generation' + export BUNDLE_FILE="bundle.jar" + jar -cvf ${BUNDLE_FILE} "${files[@]}" + echo 'Bundle upload' + curl -f -u ${{ secrets.SONATYPE_USER }}:${{ secrets.SONATYPE_PASSWORD }} -L \ + --request POST '${{ env.UPSTREAM_REPOSITORY_URL }}/service/local/staging/bundle_upload' \ + --form "file=@${BUNDLE_FILE}" >response.json + response_type=`jq type response.json || echo ''` + if [ -z "$response_type" ]; then + echo 'ERROR: Response is not JSON!' 1>&2 + cat response.json 1>&2 + exit 1 + fi + repo=`jq -r '.repositoryUris[0]' response.json` + if [ -z "$repo" ]; then + echo 'Unable to upload bundle' 1>&2 + cat response.json 1>&2 + exit 1 + fi + echo "NEXUS_REPOSITORY=${repo}" >> $GITHUB_ENV + - name: Get repository variables + run: | + echo "NEXUS_REPOSITORY_NAME=`echo ${NEXUS_REPOSITORY} | sed -E 's/(.+)\/([^\/]+)$/\2/'`" >> $GITHUB_ENV + - name: Promote package + env: + ATTEMPTS: 60 + SLEEP_TIME: 10 + run: | + verified=false + for i in `seq 0 ${ATTEMPTS}`; do + sleep $SLEEP_TIME + curl -f -s -u ${{ secrets.SONATYPE_USER }}:${{ secrets.SONATYPE_PASSWORD }} -L \ + --header 'Accept: application/json' \ + ${{ env.UPSTREAM_REPOSITORY_URL }}/service/local/staging/repository/${NEXUS_REPOSITORY_NAME} >result.json + is_closed=`jq -r '.type' result.json` + is_transitioning=`jq -r '.transitioning' result.json` + echo "Current repository status: $is_closed; transitioning: $is_transitioning" + if [[ "$is_closed" == "closed" && "$is_transitioning" == "false" ]]; then + verified=true + break + fi + done + if $verified; then + echo "A bundle was verified, releasing" + curl -f -u ${{ secrets.SONATYPE_USER }}:${{ secrets.SONATYPE_PASSWORD }} -L \ + --header 'Content-Type: application/json' \ + --data-raw "{\"data\":{\"stagedRepositoryIds\":[\"${NEXUS_REPOSITORY_NAME}\"], \"description\":\"Releasing ${{ github.event.inputs.version }}\"}}" \ + --request POST ${{ env.UPSTREAM_REPOSITORY_URL }}/service/local/staging/bulk/promote + else + echo 'Verification failed, please check the bundle' 1>&2 + exit 1 + fi diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..9ad35cd --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,45 @@ +name: Release + +on: + push: + branches: + - master + paths-ignore: + - '.github/**' + - README.md + - gradle.properties + +env: + GH_USER_NAME: github.actor + SCRIPTS_VERSION: 5.12.0 + BOM_VERSION: 5.12.1 + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Set up JDK 21 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '21' + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Setup git credentials + uses: oleksiyrudenko/gha-git-credentials@v2 + with: + name: 'reportportal.io' + email: 'support@reportportal.io' + token: ${{ secrets.GITHUB_TOKEN }} + + - name: Release with Gradle + id: release + run: | + ./gradlew release -PreleaseMode -Pscripts.version=${{env.SCRIPTS_VERSION}} -Pbom.version=${{env.BOM_VERSION}} \ + -PgithubUserName=${{env.GH_USER_NAME}} -PgithubToken=${{secrets.GITHUB_TOKEN}} \ + -PgpgPassphrase=${{secrets.GPG_PASSPHRASE}} -PgpgPrivateKey="${{secrets.GPG_PRIVATE_KEY}}" diff --git a/gradle.properties b/gradle.properties index 547cf96..f09a245 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ name=plugin-import-robot -version=24.2-SNAPSHOT +version=1.0.0 description=Reinforce your ReportPortal instance with RobotFramework Import functionality and easily upload your log files right to ReportPortal. pluginId=RobotFramework lombokVersion=1.18.30 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cc4fdc2..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 51ef917..5c40527 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 5cde118..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -1,13 +1,13 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2022 EPAM Systems +# 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 +# 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, @@ -15,80 +15,116 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle 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 Gradle +# +# 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 GRADLE_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/platforms/jvm/plugins-application/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 -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# 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) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || 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/gradle/wrapper/gradle-wrapper.jar + # 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 @@ -97,87 +133,120 @@ 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 GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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 +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # 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=`expr $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 $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# 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 -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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 $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index edd8a06..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,5 +1,5 @@ @rem -@rem Copyright 2022 EPAM Systems +@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. @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,10 +27,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 GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -37,13 +43,13 @@ 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. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -51,48 +57,36 @@ 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% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 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%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :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 GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/plugin/build.gradle b/plugin-robot/build.gradle similarity index 71% rename from plugin/build.gradle rename to plugin-robot/build.gradle index a5a34d5..91113e8 100644 --- a/plugin/build.gradle +++ b/plugin-robot/build.gradle @@ -1,9 +1,8 @@ plugins { - id "io.spring.dependency-management" version "1.0.9.RELEASE" + id "io.spring.dependency-management" version "1.1.4" id 'java' id 'jacoco' - id 'com.github.johnrengelman.shadow' version '5.2.0' - id "com.moowork.node" version "1.3.1" + id "com.github.node-gradle.node" version "2.2.1" } @@ -23,6 +22,8 @@ npm_run_build { } apply from: 'project-properties.gradle' +apply from: scriptsUrl + '/release-fat.gradle' +apply from: scriptsUrl + '/signing.gradle' repositories { mavenLocal() @@ -32,19 +33,26 @@ repositories { } } +dependencyManagement { + imports { + mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + '5.12.1' : 'com.epam.reportportal:commons-bom:5.12.1') + } +} + dependencies { if (releaseMode) { implementation 'com.epam.reportportal:commons-dao' + implementation 'com.epam.reportportal:commons' implementation 'com.epam.reportportal:plugin-api' annotationProcessor 'com.epam.reportportal:plugin-api' } else { - implementation 'com.github.reportportal:commons-dao:28d0461' - implementation 'com.github.reportportal:commons:a30c7bb' - implementation 'com.github.reportportal:plugin-api:a9a8b73' - annotationProcessor 'com.github.reportportal:plugin-api:a9a8b73' + implementation 'com.github.reportportal:commons-dao:a98c172' + implementation 'com.github.reportportal:commons:develop-SNAPSHOT' + implementation 'com.github.reportportal:plugin-api:develop-SNAPSHOT' + annotationProcessor 'com.github.reportportal:plugin-api:develop-SNAPSHOT' } implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.7' - implementation 'org.hibernate:hibernate-core:5.4.18.Final' + implementation 'org.hibernate:hibernate-core:5.6.15.Final' // add lombok support compileOnly "org.projectlombok:lombok:${lombokVersion}" @@ -61,7 +69,7 @@ test { exceptionFormat = 'short' } reports { - junitXml.enabled = true + junitXml.required = true } } @@ -71,6 +79,8 @@ artifacts { archives shadowJar } +generatePomFileForShadowPublication { pom.packaging = "jar" } + sourceSets { main { resources @@ -89,7 +99,7 @@ jar { } manifest { attributes( - "Class-Path": configurations.compile.collect { it.getName() }.join(' '), + "Class-Path": configurations.compileClasspath.collect { it.getName() }.join(' '), "Plugin-Id": "${pluginId}", "Plugin-Version": "${project.version}", "Plugin-Provider": "Report Portal", @@ -106,7 +116,7 @@ shadowJar { from("ui/build") { into("/resources") } - configurations = [project.configurations.compile] + configurations = [project.configurations.compileClasspath] zip64 true dependencies { } @@ -118,9 +128,9 @@ task plugin(type: Jar) { with jar } into('lib') { - from configurations.compile + from configurations.compileClasspath } - extension('zip') + archiveExtension.set('zip') } task assemblePlugin(type: Copy) { diff --git a/plugin-robot/gradle.properties b/plugin-robot/gradle.properties new file mode 100644 index 0000000..f09a245 --- /dev/null +++ b/plugin-robot/gradle.properties @@ -0,0 +1,5 @@ +name=plugin-import-robot +version=1.0.0 +description=Reinforce your ReportPortal instance with RobotFramework Import functionality and easily upload your log files right to ReportPortal. +pluginId=RobotFramework +lombokVersion=1.18.30 diff --git a/plugin/project-properties.gradle b/plugin-robot/project-properties.gradle similarity index 66% rename from plugin/project-properties.gradle rename to plugin-robot/project-properties.gradle index 7a16848..d09cbd6 100644 --- a/plugin/project-properties.gradle +++ b/plugin-robot/project-properties.gradle @@ -1,9 +1,12 @@ -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 +java { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} def commonScriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' project.ext { + publishRepo = "https://maven.pkg.github.com/reportportal/plugin-import-robot" releaseMode = project.hasProperty("releaseMode") pluginsDir = "$buildDir/plugins" scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : 'develop') diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/RobotFrameworkPlugin.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/RobotFrameworkPlugin.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/RobotFrameworkPlugin.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/RobotFrameworkPlugin.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/RobotFrameworkPluginExtension.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/RobotFrameworkPluginExtension.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/RobotFrameworkPluginExtension.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/RobotFrameworkPluginExtension.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/command/RobotImportCommand.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/command/RobotImportCommand.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/command/RobotImportCommand.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/command/RobotImportCommand.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/event/EventHandlerFactory.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/event/EventHandlerFactory.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/event/EventHandlerFactory.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/event/EventHandlerFactory.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/event/handler/EventHandler.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/event/handler/EventHandler.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/event/handler/EventHandler.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/event/handler/EventHandler.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/event/handler/plugin/PluginLoadedEventHandler.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/event/handler/plugin/PluginLoadedEventHandler.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/event/handler/plugin/PluginLoadedEventHandler.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/event/handler/plugin/PluginLoadedEventHandler.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/event/plugin/PluginEventHandlerFactory.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/event/plugin/PluginEventHandlerFactory.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/event/plugin/PluginEventHandlerFactory.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/event/plugin/PluginEventHandlerFactory.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/event/plugin/PluginEventListener.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/event/plugin/PluginEventListener.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/event/plugin/PluginEventListener.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/event/plugin/PluginEventListener.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/model/ItemInfo.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/model/ItemInfo.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/model/ItemInfo.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/model/ItemInfo.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/model/LaunchImportCompletionRS.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/model/LaunchImportCompletionRS.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/model/LaunchImportCompletionRS.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/model/LaunchImportCompletionRS.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/model/LaunchImportData.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/model/LaunchImportData.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/model/LaunchImportData.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/model/LaunchImportData.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/model/LaunchImportRQ.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/model/LaunchImportRQ.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/model/LaunchImportRQ.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/model/LaunchImportRQ.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/service/AbstractImportStrategy.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/AbstractImportStrategy.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/service/AbstractImportStrategy.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/AbstractImportStrategy.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/service/FileExtensionConstant.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/FileExtensionConstant.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/service/FileExtensionConstant.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/FileExtensionConstant.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/service/ImportStrategy.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/ImportStrategy.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/service/ImportStrategy.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/ImportStrategy.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/service/ImportStrategyFactory.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/ImportStrategyFactory.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/service/ImportStrategyFactory.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/ImportStrategyFactory.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/service/RobotReportTag.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/RobotReportTag.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/service/RobotReportTag.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/RobotReportTag.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/service/RobotXmlParser.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/RobotXmlParser.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/service/RobotXmlParser.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/RobotXmlParser.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/service/XmlImportStrategy.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/XmlImportStrategy.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/service/XmlImportStrategy.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/XmlImportStrategy.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/service/ZipImportStrategy.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/ZipImportStrategy.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/service/ZipImportStrategy.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/service/ZipImportStrategy.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/utils/DateUtils.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/utils/DateUtils.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/utils/DateUtils.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/utils/DateUtils.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/utils/DocumentBuilderInitializer.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/utils/DocumentBuilderInitializer.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/utils/DocumentBuilderInitializer.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/utils/DocumentBuilderInitializer.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/utils/MemoizingSupplier.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/utils/MemoizingSupplier.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/utils/MemoizingSupplier.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/utils/MemoizingSupplier.java diff --git a/plugin/src/main/java/com/epam/reportportal/extension/robot/utils/RobotMapper.java b/plugin-robot/src/main/java/com/epam/reportportal/extension/robot/utils/RobotMapper.java similarity index 100% rename from plugin/src/main/java/com/epam/reportportal/extension/robot/utils/RobotMapper.java rename to plugin-robot/src/main/java/com/epam/reportportal/extension/robot/utils/RobotMapper.java diff --git a/plugin/src/main/resources/binary-data.properties b/plugin-robot/src/main/resources/binary-data.properties similarity index 100% rename from plugin/src/main/resources/binary-data.properties rename to plugin-robot/src/main/resources/binary-data.properties diff --git a/plugin/ui/.editorconfig b/plugin-robot/ui/.editorconfig similarity index 100% rename from plugin/ui/.editorconfig rename to plugin-robot/ui/.editorconfig diff --git a/plugin/ui/.eslintignore b/plugin-robot/ui/.eslintignore similarity index 100% rename from plugin/ui/.eslintignore rename to plugin-robot/ui/.eslintignore diff --git a/plugin/ui/.eslintrc b/plugin-robot/ui/.eslintrc similarity index 100% rename from plugin/ui/.eslintrc rename to plugin-robot/ui/.eslintrc diff --git a/plugin/ui/.gitignore b/plugin-robot/ui/.gitignore similarity index 100% rename from plugin/ui/.gitignore rename to plugin-robot/ui/.gitignore diff --git a/plugin/ui/.prettierrc b/plugin-robot/ui/.prettierrc similarity index 100% rename from plugin/ui/.prettierrc rename to plugin-robot/ui/.prettierrc diff --git a/plugin/ui/README.md b/plugin-robot/ui/README.md similarity index 100% rename from plugin/ui/README.md rename to plugin-robot/ui/README.md diff --git a/plugin/ui/devServer.js b/plugin-robot/ui/devServer.js similarity index 100% rename from plugin/ui/devServer.js rename to plugin-robot/ui/devServer.js diff --git a/plugin/ui/package-lock.json b/plugin-robot/ui/package-lock.json similarity index 100% rename from plugin/ui/package-lock.json rename to plugin-robot/ui/package-lock.json diff --git a/plugin/ui/package.json b/plugin-robot/ui/package.json similarity index 100% rename from plugin/ui/package.json rename to plugin-robot/ui/package.json diff --git a/plugin/ui/src/common/css/colors.scss b/plugin-robot/ui/src/common/css/colors.scss similarity index 100% rename from plugin/ui/src/common/css/colors.scss rename to plugin-robot/ui/src/common/css/colors.scss diff --git a/plugin/ui/src/common/css/fonts.scss b/plugin-robot/ui/src/common/css/fonts.scss similarity index 100% rename from plugin/ui/src/common/css/fonts.scss rename to plugin-robot/ui/src/common/css/fonts.scss diff --git a/plugin/ui/src/common/css/screen-size.scss b/plugin-robot/ui/src/common/css/screen-size.scss similarity index 100% rename from plugin/ui/src/common/css/screen-size.scss rename to plugin-robot/ui/src/common/css/screen-size.scss diff --git a/plugin/ui/src/common/css/z-index.scss b/plugin-robot/ui/src/common/css/z-index.scss similarity index 100% rename from plugin/ui/src/common/css/z-index.scss rename to plugin-robot/ui/src/common/css/z-index.scss diff --git a/plugin/ui/src/components/moduleName/index.ts b/plugin-robot/ui/src/components/moduleName/index.ts similarity index 100% rename from plugin/ui/src/components/moduleName/index.ts rename to plugin-robot/ui/src/components/moduleName/index.ts diff --git a/plugin/ui/src/components/moduleName/moduleName.tsx b/plugin-robot/ui/src/components/moduleName/moduleName.tsx similarity index 100% rename from plugin/ui/src/components/moduleName/moduleName.tsx rename to plugin-robot/ui/src/components/moduleName/moduleName.tsx diff --git a/plugin/ui/src/declarations.d.ts b/plugin-robot/ui/src/declarations.d.ts similarity index 100% rename from plugin/ui/src/declarations.d.ts rename to plugin-robot/ui/src/declarations.d.ts diff --git a/plugin/ui/src/index.ts b/plugin-robot/ui/src/index.ts similarity index 100% rename from plugin/ui/src/index.ts rename to plugin-robot/ui/src/index.ts diff --git a/plugin/ui/src/metadata.json b/plugin-robot/ui/src/metadata.json similarity index 100% rename from plugin/ui/src/metadata.json rename to plugin-robot/ui/src/metadata.json diff --git a/plugin/ui/src/plugin-icon.svg b/plugin-robot/ui/src/plugin-icon.svg similarity index 100% rename from plugin/ui/src/plugin-icon.svg rename to plugin-robot/ui/src/plugin-icon.svg diff --git a/plugin/ui/tsconfig.eslint.json b/plugin-robot/ui/tsconfig.eslint.json similarity index 100% rename from plugin/ui/tsconfig.eslint.json rename to plugin-robot/ui/tsconfig.eslint.json diff --git a/plugin/ui/tsconfig.json b/plugin-robot/ui/tsconfig.json similarity index 100% rename from plugin/ui/tsconfig.json rename to plugin-robot/ui/tsconfig.json diff --git a/plugin/ui/webpack.config.js b/plugin-robot/ui/webpack.config.js similarity index 100% rename from plugin/ui/webpack.config.js rename to plugin-robot/ui/webpack.config.js diff --git a/project-properties.gradle b/project-properties.gradle index 74e23b9..d7ec51d 100644 --- a/project-properties.gradle +++ b/project-properties.gradle @@ -1,6 +1,3 @@ -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 - project.ext { releaseMode = project.hasProperty("releaseMode") pluginsDir = "$buildDir/jars" @@ -8,5 +5,5 @@ project.ext { } wrapper { - gradleVersion = '6.0' + gradleVersion = '8.10.2' } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 8c6375a..bdb6234 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ rootProject.name = 'plugin-import-robot' -include 'plugin' +include 'plugin-robot'