Release 5.11.0

.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 11
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+
+      - 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: '[email protected]'
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build with Gradle
+        id: build
+        run: |
+          ./gradlew build

.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

.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.10.0
+  BOM_VERSION: 5.11.2
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+
+      - 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: '[email protected]'
+          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}}"

plugin/build.gradle → build.gradle

@@ -1,68 +1,61 @@
-import com.github.spotbugs.SpotBugsTask
-
 plugins {
     id "io.spring.dependency-management" version "1.0.9.RELEASE"
     id 'java'
-    id 'jacoco'
-    id 'com.github.johnrengelman.shadow' version '5.2.0'
-    id "com.github.spotbugs" version "3.0.0"
     id "com.moowork.node" version "1.3.1"
+    id 'nu.studer.jooq' version '3.0.3'
 }
 
+apply from: 'project-properties.gradle'
+apply from: 'jooq.gradle'
+apply from: 'ui.gradle'
 
-node {
-    version = '14.19.3'
-    npmVersion = '6.14.17'
-    download = true
-    workDir = file("${project.buildDir}/plugin/ui")
-    nodeModulesDir = file("${project.rootDir}/plugin/ui")
-}
-
-npm_run_build {
-    inputs.files fileTree("ui/src")
-    inputs.file 'ui/package.json'
-    inputs.file 'ui/package-lock.json'
-    outputs.dir 'ui/build'
-}
+def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/develop'
 
-apply from: 'project-properties.gradle'
+apply from: scriptsUrl + '/release-fat.gradle'
+apply from: scriptsUrl + '/signing.gradle'
+apply from: scriptsUrl + '/build-quality.gradle'
 
 repositories {
-    mavenCentral()
-    mavenLocal()
-    if (releaseMode) {
-        dependencyRepos.forEach { path ->
-            maven {
-                setUrl("https://maven.pkg.github.com/reportportal/${path}")
-                credentials {
-                    username = findProperty("githubUserName")
-                    password = findProperty("githubToken")
-                }
-            }
-        }
-    } else {
+    mavenCentral { url "https://repo1.maven.org/maven2" }
+
+    if (!releaseMode) {
         maven { url 'https://jitpack.io' }
     }
 }
 
+dependencyManagement {
+    imports {
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.11.2')
+    }
+}
+
 dependencies {
     if (releaseMode) {
         implementation 'com.epam.reportportal:plugin-api'
         annotationProcessor 'com.epam.reportportal:plugin-api'
     } else {
-        implementation 'com.github.reportportal:plugin-api:5.7.0'
-        annotationProcessor 'com.github.reportportal:plugin-api:5.7.0'
+        implementation 'com.epam.reportportal:plugin-api'
+        annotationProcessor 'com.epam.reportportal:plugin-api'
     }
+
+    implementation group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0'
+    testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'
+
+    testCompile 'org.hamcrest:hamcrest-all:1.3'
+
 }
 
-spotbugs {
-    sourceSets = [sourceSets.main]
-    reportLevel = "high"
+artifacts {
+    archives shadowJar
 }
-tasks.withType(SpotBugsTask) {
-    reports {
-        xml.enabled false
-        html.enabled true
+
+sourceSets {
+    main {
+        resources
+                {
+                    exclude '**'
+                }
     }
 }
 
@@ -78,20 +71,7 @@ test {
     }
 }
 
-build.dependsOn jacocoTestReport
-
-artifacts {
-    archives shadowJar
-}
-
-sourceSets {
-    main {
-        resources
-                {
-                    exclude '**'
-                }
-    }
-}
+generatePomFileForShadowPublication { pom.packaging = "jar" }
 
 jar {
     from("src/main/resources") {
@@ -106,7 +86,7 @@ jar {
                 "Plugin-Id": "${pluginId}",
                 "Plugin-Version": "${project.version}",
                 "Plugin-Provider": "Report Portal",
-                "Plugin-Class": "com.epam.reportportal.extension.template.TemplatePlugin",
+                "Plugin-Class": "com.epam.reportportal.extension.gitlab.GitlabPlugin",
                 "Plugin-Service": "api"
         )
     }
@@ -145,5 +125,4 @@ task assemblePlugins(type: Copy) {
     dependsOn subprojects.assemblePlugin
 }
 
-compileJava.dependsOn npm_run_build
-
+compileJava.dependsOn npm_run_build