Release version 2.4.0

Merged pull request #72 * #50 - Add support for JMeter remote testing (#52) ** Added `enableRemoteExecution` (-r) and `exitRemoteServers` (-X) properties * #48 - `jmeterGui` task fails when dependent task `setupJMeter` is skipped due to up-to-date check. * #51 - Add dependency check (#54) * Bump org.jetbrains.dokka from 1.5.0 to 1.7.10 (#58) * Bump io.gitlab.arturbosch.detekt from 1.18.0 to 1.21.0 (#59) * Bump kotest-assertions-core from 4.6.4 to 5.3.2 (#55) * Bump junit-bom from 5.7.2 to 5.8.2 (#57) * Bump com.gradle.plugin-publish from 0.15.0 to 1.0.0 (#56) * #60 update configuration and fix issues arose from version updates (#61) ** Updated detekt rules & fixed smells ** Fixed unit tests ** Fixed `publish-publish` issue and also added signin ** added owasp dependency check plugin & created check workflow * Bump org.jetbrains.changelog from 1.3.0 to 1.3.1 (#63) ** enhanced ODC-workflow for dependabot ** updated CHANGELOG missing #48 bug-fix * Bump jvm from 1.6.10 to 1.7.10 (#62) ** fixed snapshot-release signing issue ** simplified ODC workflow * #64 - Enable version updated checks for actions (#65) * Bump actions/checkout from 2 to 3 (#67) ** changed to use full qualified version tag * Bump actions/upload-artifact from 2 to 3 (#70) ** change to use full qualified version tag * Bump thomaseizinger/create-pull-request from 1.0.0 to 1.2.2 (#68) * Bump codecov/codecov-action from 2 to 3 (#66) ** change to use full qualified version tag ** Prepare release 2.4.0 * Fixed signing issue in publish step
qualersoft · Jul 24, 2022 · 47dafb3 · 47dafb3
1 parent 5b5980f
commit 47dafb3
Show file tree

Hide file tree

Showing 25 changed files with 739 additions and 417 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Check out sources"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
 
       - name: "Detekt"
         uses: burrunan/gradle-cache-action@v1
@@ -22,8 +22,16 @@ jobs:
           save-local-build-cache: false
           arguments: detekt
 
+      - name: "Upload sarif report"
+        uses: github/codeql-action/upload-sarif@v2
+        if: success() || failure()
+        with:
+          sarif_file: build/reports/detekt/detekt.sarif
+          category: detekt
+
       - name: "Upload detekt report"
-        uses: actions/upload-artifact@v2
+        uses: actions/[email protected]
+        if: success() || failure()
         with:
           name: detektReport
           path: build/reports/detekt
@@ -33,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Check out sources"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
 
       - name: "Fossa analyze"
         uses: fossas/fossa-action@v1
@@ -51,7 +59,7 @@ jobs:
     name: "Build artifact"
     steps:
       - name: "Check out sources"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
 
       - name: "Compile"
         uses: burrunan/gradle-cache-action@v1
@@ -64,7 +72,7 @@ jobs:
     needs: compile
     steps:
       - name: "Check out sources"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
 
       - name: "Validate plugin"
         uses: burrunan/gradle-cache-action@v1
@@ -77,7 +85,7 @@ jobs:
     needs: compile
     steps:
       - name: "Check out sources"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
 
       - name: "Unit test coverage cache"
         uses: actions/cache@v2
@@ -102,7 +110,7 @@ jobs:
           files: build/test-results/**/*.xml
 
       - name: "Upload unit test report"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3.0.0
         if: always()
         with:
           name: unitTestReport
@@ -113,7 +121,7 @@ jobs:
     needs: compile
     steps:
       - name: "Check out sources"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
 
       - name: "Functional test coverage cache"
         uses: actions/cache@v2
@@ -136,7 +144,7 @@ jobs:
           files: build/test-results/functionalTest/*.xml
 
       - name: "Upload functional test report"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3.0.0
         if: always()
         with:
          name: functionalTestReport
@@ -149,7 +157,7 @@ jobs:
       - functionalTest
     steps:
       - name: "Check out sources"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
 
       - name: "Load unit test coverage cache"
         uses: actions/cache@v2
@@ -171,7 +179,7 @@ jobs:
           arguments: jacocoTestReport
 
       - name: "Publish Report"
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3.0.0
 
   publishSnapshot:
     runs-on: ubuntu-latest
@@ -181,19 +189,21 @@ jobs:
       - licenceCheck
     steps:
       - name: "Check out sources"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
 
       - name: "Load compile cache"
         uses: actions/cache@v2
         with:
           path: ${{ github.workspace }}/build/**
           key: ${{ runner.os }}-compile-${{ github.run_id }}
 
-      - name: "Publish snapshot"
+      - name: "Publish snapshot to github"
         uses: burrunan/gradle-cache-action@v1
         env:
           USERNAME: ${{ github.actor }}
           TOKEN: ${{ github.token }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MVN_CNTRL_SECRET_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MVN_CNTRL_SECRET_KEY_PASS }}
         with:
           remote-build-cache-proxy-enabled: false
           save-local-build-cache: false

diff --git a/.github/workflows/craft_new_release.yml b/.github/workflows/craft_new_release.yml
@@ -18,7 +18,7 @@ jobs:
     name: "Craft a new release"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.0.2
 
       - name: "Get next version"
         id: nextVersion
@@ -53,7 +53,7 @@ jobs:
           git push origin release/${{ steps.nextVersion.outputs.version }}
 
       - name: Create pull request
-        uses: thomaseizinger/create-pull-request@1.0.0
+        uses: thomaseizinger/create-pull-request@1.2.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/.github/workflows/publish_new_release.yml b/.github/workflows/publish_new_release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true #only merged pull requests must trigger this job
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.0.2
 
       - name: Extract version from branch name (for release branches)
         if: startsWith(github.event.pull_request.head.ref, 'release/')
@@ -55,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: release
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.0.2
         with:
           ref: main
 
@@ -64,6 +64,8 @@ jobs:
         env:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
           USERNAME: ${{ github.actor }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MVN_CNTRL_SECRET_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MVN_CNTRL_SECRET_KEY_PASS }}
         with:
           remote-build-cache-proxy-enabled: false
           save-local-build-cache: false
@@ -74,6 +76,8 @@ jobs:
         env:
           GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
           GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MVN_CNTRL_SECRET_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MVN_CNTRL_SECRET_KEY_PASS }}
         with:
           remote-build-cache-proxy-enabled: false
           save-local-build-cache: false

diff --git a/.github/workflows/vulnerabilityScan.yml b/.github/workflows/vulnerabilityScan.yml
@@ -0,0 +1,43 @@
+name: "ODC-Scan for vulnerabilities"
+
+on:
+  schedule:
+    # on a weekly basis for new identified issues
+    - cron: '0 16 * * 5' # 16 o'clock UTC every friday
+  push:
+    paths:
+      # if build script changes which may introduce new issues
+      - build.gradle.kts
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+    steps:
+      - uses: actions/[email protected]
+
+      - name: "Run owasp check"
+        uses: burrunan/gradle-cache-action@v1
+        with:
+          remote-build-cache-proxy-enabled: false
+          arguments: dependencyCheckAnalyze
+
+      - name: "Upload sarif report"
+        uses: github/codeql-action/upload-sarif@v2
+        if: always()
+        with:
+          sarif_file: build/reports/dependency-check-report.sarif
+          category: 'owasp dependency check'
+
+      - name: 'pack reports'
+        uses: edgarrc/action-7z@v1
+        with:
+          args: 7z a -t7z dependency-check-report ./build/reports/dependency-c*.*
+
+      - name: "Upload report"
+        uses: actions/[email protected]
+        if: always()
+        with:
+          name: owaspCheckReport
+          path: dependency-check-report.*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,13 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ## [Unreleased]
 ### Added
+- added support for properties `-r` and `-X` for remote test execution (#50)
+
+### Fixed
+- Fixed issue with UP-TO-DATE check which let tasks fail after SetupTask was executed once (#48)
+
+## [2.3.0]
+### Added
 - Added additional cli-arguments for proxy-settings (#40)
 
 ### Fixed

diff --git a/README.adoc b/README.adoc
@@ -9,9 +9,12 @@ endif::[]
 ifndef::env-github[]
 :icons: font
 endif::[]
-:jm_tm:     https://jmeter.apache.org/[JMeter(TM),window=_blank]
-:jm_cli:    https://jmeter.apache.org/usermanual/get-started.html#override
-:gh_rp:     https://github.com/qualersoft/jmeter-gradle-plugin
+:jm_base:       https://jmeter.apache.org
+:jm_tm:         {jm_base}/[JMeter(TM),window=_blank]
+:jm_doc_base:   {jm_base}/usermanual
+:jm_remoteing:  {jm_doc_base}/remote-test.html
+:jm_cli:        {jm_doc_base}/get-started.html#override
+:gh_rp:         https://github.com/qualersoft/jmeter-gradle-plugin
 :toc: preamble
 
 [cols="1,~", frame=none, grid=none]
@@ -86,6 +89,9 @@ jmeter {
   reportDir // <.>
   maxHeap // <.>
   jvmArgs //<.>
+
+  enableRemoteExecution // <.>
+  exitRemoteServers // <.>
 }
 ----
 [%collapsible]
@@ -114,6 +120,10 @@ Defaults to <buildDir>/test-results/jmeter
 Defaults to <buildDir>/reports/jmeter
 <.> [Optional] Specifies the maximum heap size the JVM process will start with.
 <.> [Optional] additional JVM arguments that will be passed to the jvm directly.
+<.> [Optional] tells {jm_tm} to run the tests on the configured remote-servers (see {jm_remoteing}[remoting]) +
+Defaults to `false`.
+<.> [Optional] Flag to exit remote servers at the end of the test. Only effective iff `enableRemoteExecution` is `true`. +
+Defaults to `false`.
 ====
 These configurations will be applied to all tasks (where appropriate) and can be overridden or extended on a per task base.