Support Apache JMeter 4.0

This closes #272
jmeter-maven-plugin · Feb 11, 2018 · 632ca43 · 632ca43
1 parent 0229970
commit 632ca43
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <required.maven.version>3.1.1</required.maven.version>
         <supported.java.version>1.8</supported.java.version>
-        <supported.jmeter.version>3.3</supported.jmeter.version>
+        <supported.jmeter.version>4.0</supported.jmeter.version>
 
         <!--Dependency versions-->
         <aether.version>1.1.0</aether.version>

diff --git a/src/it/remote-test/pom.xml b/src/it/remote-test/pom.xml
@@ -11,6 +11,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <jmeter.version>4.0</jmeter.version>
     </properties>
 
     <repositories>
@@ -28,7 +29,7 @@
         <dependency>
             <groupId>org.apache.jmeter</groupId>
             <artifactId>ApacheJMeter_core</artifactId>
-            <version>3.3</version>
+            <version>${jmeter.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.tika</groupId>
@@ -39,7 +40,7 @@
         <dependency>
             <groupId>org.apache.jmeter</groupId>
             <artifactId>ApacheJMeter_java</artifactId>
-            <version>3.3</version>
+            <version>${jmeter.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.tika</groupId>

diff --git a/src/it/remote-test/src/test/conf/rmi_keystore.jks b/src/it/remote-test/src/test/conf/rmi_keystore.jks
diff --git a/src/it/test-plugins/pom.xml b/src/it/test-plugins/pom.xml
@@ -11,6 +11,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <jmeter.version>4.0</jmeter.version>
     </properties>
 
     <repositories>
@@ -28,7 +29,7 @@
         <dependency>
             <groupId>org.apache.jmeter</groupId>
             <artifactId>ApacheJMeter_core</artifactId>
-            <version>3.3</version>
+            <version>${jmeter.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.tika</groupId>
@@ -39,7 +40,7 @@
         <dependency>
             <groupId>org.apache.jmeter</groupId>
             <artifactId>ApacheJMeter_java</artifactId>
-            <version>3.3</version>
+            <version>${jmeter.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.tika</groupId>

diff --git a/src/main/java/com/lazerycode/jmeter/mojo/ConfigureJMeterMojo.java b/src/main/java/com/lazerycode/jmeter/mojo/ConfigureJMeterMojo.java
@@ -93,7 +93,7 @@ public class ConfigureJMeterMojo extends AbstractJMeterMojo {
 	 * if you change this version number the list of artifacts required to run JMeter may change.
 	 * If this happens you will need to override the &lt;jmeterArtifacts&gt; element.
 	 */
-	@Parameter(defaultValue = "3.3")
+	@Parameter(defaultValue = "4.0")
 	private String jmeterVersion;
 
 	/**