Skip to content

Commit d5908f2

Browse files
Merge pull request #312 from abstracta/Upgrade_JMeter
Upgrade jmeter
2 parents f802165 + 899e336 commit d5908f2

File tree

26 files changed

+53
-46
lines changed

26 files changed

+53
-46
lines changed

jmeter-java-dsl-azure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>us.abstracta.jmeter</groupId>
88
<artifactId>jmeter-java-dsl-parent</artifactId>
9-
<version>1.31-SNAPSHOT</version>
9+
<version>2.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<artifactId>jmeter-java-dsl-azure</artifactId>

jmeter-java-dsl-base-remote-engine/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>us.abstracta.jmeter</groupId>
88
<artifactId>jmeter-java-dsl-parent</artifactId>
9-
<version>1.31-SNAPSHOT</version>
9+
<version>2.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<artifactId>jmeter-java-dsl-base-remote-engine</artifactId>

jmeter-java-dsl-blazemeter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>us.abstracta.jmeter</groupId>
99
<artifactId>jmeter-java-dsl-parent</artifactId>
10-
<version>1.31-SNAPSHOT</version>
10+
<version>2.0-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<artifactId>jmeter-java-dsl-blazemeter</artifactId>

jmeter-java-dsl-bridge/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>jmeter-java-dsl-parent</artifactId>
99
<groupId>us.abstracta.jmeter</groupId>
10-
<version>1.31-SNAPSHOT</version>
10+
<version>2.0-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<artifactId>jmeter-java-dsl-bridge</artifactId>

jmeter-java-dsl-cli/pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>jmeter-java-dsl-parent</artifactId>
88
<groupId>us.abstracta.jmeter</groupId>
9-
<version>1.31-SNAPSHOT</version>
9+
<version>2.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<artifactId>jmeter-java-dsl-cli</artifactId>
@@ -201,6 +201,13 @@
201201
<include>org.apache-extras.beanshell:bsh</include>
202202
<!-- required for converting jsonpath -->
203203
<include>com.jayway.jsonpath:json-path</include>
204+
<!-- required for kotlin support in JMeter 5.6.3+ -->
205+
<include>org.jetbrains.kotlin:kotlin-stdlib</include>
206+
<include>org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm</include>
207+
<include>org.jetbrains.kotlinx:kotlinx-coroutines-swing</include>
208+
<include>com.github.ben-manes.caffeine:caffeine</include>
209+
<include>org.jetbrains:annotations</include>
210+
<include>org.checkerframework:checker-qual</include>
204211
</includes>
205212
</artifactSet>
206213
<filters>

jmeter-java-dsl-dashboard/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>us.abstracta.jmeter</groupId>
99
<artifactId>jmeter-java-dsl-parent</artifactId>
10-
<version>1.31-SNAPSHOT</version>
10+
<version>2.0-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<artifactId>jmeter-java-dsl-dashboard</artifactId>

jmeter-java-dsl-datadog/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>us.abstracta.jmeter</groupId>
88
<artifactId>jmeter-java-dsl-parent</artifactId>
9-
<version>1.31-SNAPSHOT</version>
9+
<version>2.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<artifactId>jmeter-java-dsl-datadog</artifactId>

jmeter-java-dsl-elasticsearch-listener/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>us.abstracta.jmeter</groupId>
99
<artifactId>jmeter-java-dsl-parent</artifactId>
10-
<version>1.31-SNAPSHOT</version>
10+
<version>2.0-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<artifactId>jmeter-java-dsl-elasticsearch-listener</artifactId>

jmeter-java-dsl-graphql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>jmeter-java-dsl-parent</artifactId>
88
<groupId>us.abstracta.jmeter</groupId>
9-
<version>1.31-SNAPSHOT</version>
9+
<version>2.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

jmeter-java-dsl-jdbc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>jmeter-java-dsl-parent</artifactId>
88
<groupId>us.abstracta.jmeter</groupId>
9-
<version>1.31-SNAPSHOT</version>
9+
<version>2.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

0 commit comments

Comments
 (0)