You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/11/09 14:22:24 UTC

[jmeter] branch master updated (026bc91 -> 02d7700)

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.


    from 026bc91  ApacheJMeter_config.jar: Restore bin folder and add missing files
     new 04aab12  Fix config/build.gradle.kts formatting
     new 02d7700  Add Travis job that executes jmeter-maven-plugin tests

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml                 | 8 ++++++++
 src/config/build.gradle.kts | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)


[jmeter] 01/02: Fix config/build.gradle.kts formatting

Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 04aab12c68af8c57258c5ae905bd8b7ab0a2dd9f
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Nov 9 17:21:33 2019 +0300

    Fix config/build.gradle.kts formatting
---
 src/config/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/build.gradle.kts b/src/config/build.gradle.kts
index 0abf6fc..3ac54e6 100644
--- a/src/config/build.gradle.kts
+++ b/src/config/build.gradle.kts
@@ -38,7 +38,7 @@ tasks.named<Jar>(JavaPlugin.JAR_TASK_NAME) {
             from(files(srcLicense))
         }
     }
-into("bin") {
+    into("bin") {
         filteringCharset = "UTF-8"
         CrLfSpec(LineEndings.LF).run {
             textFrom("$rootDir/bin") {


[jmeter] 02/02: Add Travis job that executes jmeter-maven-plugin tests

Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 02d770027892fd86aa90cc43e6dfebf801e147d4
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Nov 9 17:04:56 2019 +0300

    Add Travis job that executes jmeter-maven-plugin tests
---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8618c1e..f962c6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,3 +55,11 @@ matrix:
       script:
         # Spotless, Checksyle, and JaCoCo are verified here to ensure they all work with the latest supported Java
         - xvfb-run ./gradlew build jacocoReport -Duser.language=fr -Duser.country=FR $SKIP_TAR
+    - name: jmeter-maven-plugin tests
+      jdk: openjdk8
+      script:
+        - ./gradlew publishToMavenLocal -Pjmeter.version=42.0
+        - cd ..
+        - git clone --depth 100 https://github.com/jmeter-maven-plugin/jmeter-maven-plugin.git
+        - cd jmeter-maven-plugin
+        - mvn verify -Djmeter.version=42.0-SNAPSHOT