Skip to content

Commit f581d1d

Browse files
AnEmortalKidAnEmortalKid
authored
Merge pull request #15 from cchesser/GatlingPom
Moved plugins and dependency declarations into parent pom
2 parents e02cb43 + 7dcea73 commit f581d1d

3 files changed

Lines changed: 60 additions & 44 deletions

File tree

‎java-perf-workshop-tester/pom.xml‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,6 @@
1616
<encoding>UTF-8</encoding>
1717
</properties>
1818

19-
<dependencyManagement>
20-
<dependencies>
21-
<dependency>
22-
<groupId>io.gatling</groupId>
23-
<artifactId>gatling-app</artifactId>
24-
<version>${gatling.version}</version>
25-
</dependency>
26-
<dependency>
27-
<groupId>io.gatling</groupId>
28-
<artifactId>gatling-recorder</artifactId>
29-
<version>${gatling.version}</version>
30-
</dependency>
31-
<dependency>
32-
<groupId>io.gatling.highcharts</groupId>
33-
<artifactId>gatling-charts-highcharts</artifactId>
34-
<version>${gatling.version}</version>
35-
</dependency>
36-
<dependency>
37-
<groupId>org.scala-lang</groupId>
38-
<artifactId>scala-library</artifactId>
39-
<version>${scala.version}</version>
40-
</dependency>
41-
</dependencies>
42-
</dependencyManagement>
43-
4419
<dependencies>
4520
<dependency>
4621
<groupId>io.gatling.highcharts</groupId>
@@ -62,20 +37,6 @@
6237

6338
<build>
6439
<testSourceDirectory>src/test/scala</testSourceDirectory>
65-
<pluginManagement>
66-
<plugins>
67-
<plugin>
68-
<groupId>net.alchim31.maven</groupId>
69-
<artifactId>scala-maven-plugin</artifactId>
70-
<version>${scala-maven-plugin.version}</version>
71-
</plugin>
72-
<plugin>
73-
<groupId>io.gatling</groupId>
74-
<artifactId>gatling-maven-plugin</artifactId>
75-
<version>${gatling-maven-plugin.version}</version>
76-
</plugin>
77-
</plugins>
78-
</pluginManagement>
7940
<plugins>
8041
<plugin>
8142
<groupId>net.alchim31.maven</groupId>

‎part_2/README.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,17 @@ loadtest -n 1000 -c 15 "http://localhost:8080/search?q=a"
127127

128128
Alternatively, you can use [gatling](https://gatling.io/) (a performance library with a scala dsl ).
129129

130-
Navigate to the `java-perf-workshop-tester` directory and run `mvn gatling:test`. This should launch the `WorkshopSimulation`.
130+
:warning: **This should be run from the `java-perf-workshop-tester` directory**
131+
132+
This should launch the `WorkshopSimulation`.
133+
134+
```bash
135+
mvn gatling:test
136+
```
131137

132138
Sample output while running:
133139
```bash
134-
$ mvn gatling:test
140+
[~/java-perf-workshop/java-perf-workshop-tester]$ mvn gatling:test
135141
[INFO] Scanning for projects...
136142
[INFO]
137143
[INFO] ------------------------------------------------------------------------

‎pom.xml‎

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@
2323

2424
<!-- tester dependencies -->
2525
<gatling.version>2.3.0</gatling.version>
26+
<scala.version>2.12.3</scala.version>
27+
28+
<!-- plugin versions -->
2629
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
2730
<gatling-maven-plugin.version>2.2.4</gatling-maven-plugin.version>
28-
<scala.version>2.12.3</scala.version>
2931
</properties>
3032
<scm>
3133
<connection>${scm.connection}</connection>
@@ -44,6 +46,15 @@
4446
</roles>
4547
<timezone>-6</timezone>
4648
</developer>
49+
<developer>
50+
<id>AnEmortalKid</id>
51+
<name>Jan Monterrubio</name>
52+
<email>janmonterrubio@gmail.com</email>
53+
<url>http://github.com/anemortalkid</url>
54+
<roles>
55+
<role>developer</role>
56+
</roles>
57+
</developer>
4758
</developers>
4859
<modules>
4960
<module>java-perf-workshop-server</module>
@@ -106,14 +117,52 @@
106117
<artifactId>junit-dep</artifactId>
107118
<version>4.10</version>
108119
</dependency>
120+
<dependency>
121+
<groupId>io.gatling</groupId>
122+
<artifactId>gatling-app</artifactId>
123+
<version>${gatling.version}</version>
124+
</dependency>
125+
<dependency>
126+
<groupId>io.gatling</groupId>
127+
<artifactId>gatling-recorder</artifactId>
128+
<version>${gatling.version}</version>
129+
</dependency>
130+
<dependency>
131+
<groupId>io.gatling.highcharts</groupId>
132+
<artifactId>gatling-charts-highcharts</artifactId>
133+
<version>${gatling.version}</version>
134+
</dependency>
135+
<dependency>
136+
<groupId>org.scala-lang</groupId>
137+
<artifactId>scala-library</artifactId>
138+
<version>${scala.version}</version>
139+
</dependency>
109140
</dependencies>
110141
</dependencyManagement>
111142
<build>
143+
<pluginManagement>
144+
<plugins>
145+
<plugin>
146+
<groupId>org.apache.maven.plugins</groupId>
147+
<artifactId>maven-compiler-plugin</artifactId>
148+
<version>2.3.2</version>
149+
</plugin>
150+
<plugin>
151+
<groupId>io.gatling</groupId>
152+
<artifactId>gatling-maven-plugin</artifactId>
153+
<version>${gatling-maven-plugin.version}</version>
154+
</plugin>
155+
<plugin>
156+
<groupId>net.alchim31.maven</groupId>
157+
<artifactId>scala-maven-plugin</artifactId>
158+
<version>${scala-maven-plugin.version}</version>
159+
</plugin>
160+
</plugins>
161+
</pluginManagement>
112162
<plugins>
113163
<plugin>
114164
<groupId>org.apache.maven.plugins</groupId>
115165
<artifactId>maven-compiler-plugin</artifactId>
116-
<version>2.3.2</version>
117166
<configuration>
118167
<showDeprecation>true</showDeprecation>
119168
<showWarnings>true</showWarnings>
@@ -123,4 +172,4 @@
123172
</plugin>
124173
</plugins>
125174
</build>
126-
</project>
175+
</project>

0 commit comments

Comments
 (0)