Skip to content
This repository was archived by the owner on Nov 7, 2023. It is now read-only.

Cutting-edge fixes #3

Open
mizhka wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Cutting-edge fixes #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3336188
Added multiple file pattern
jkirchberg Jan 21, 2014
6a9b52d
pom and mojo extended to support CSV targets
cboris Mar 10, 2014
47ea2fa
(feature) add several new options - granulation, prevent-outlines and…
May 6, 2014
54c5bbd
(enhancement) add skip option
May 6, 2014
a58df87
added includeLabels and excludeLabels graph properties
Jun 13, 2014
dea6699
support includeLabels, excludeLabels tags
Jul 30, 2014
f5255b9
(feature) add weight of line
Oct 14, 2014
28e0fdc
(cosmetic) increase version of JMeter plugins up to 1.2.0
Oct 14, 2014
797c6c3
add relativeTimes tag to graph block
Apr 25, 2015
6b6385b
Remove log file as command-line argument
Oct 6, 2015
5bc5f4e
Remove comment
Oct 6, 2015
c92922c
add default width = 800, height = 600
Dec 21, 2015
59d8013
(cosmetic) fix typo
Jan 19, 2016
9d653ec
Fixed conflicts
Jan 19, 2016
1a548b6
merge pull request to Remove Dlog_file
Jan 19, 2016
7531e7a
seems like jmeter dependencies are not wanted here
srdkr Jan 20, 2016
d177df4
(merge) merge community improvements
Jan 22, 2016
b2e501a
(cosmetic) add contributor list into pom.xml
Jan 22, 2016
3f61d80
(merge) merge pull request #1 from srdkr
Jan 22, 2016
a48b8e0
(cosmetic) correct list of contributor - final commit to fix branch
Jan 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
.idea
*.iml
target
target
/bin
/.classpath
/.project
/.settings/org.eclipse.core.resources.prefs
/.settings/org.eclipse.jdt.core.prefs
/.settings/org.eclipse.m2e.core.prefs
/mvn.log
/.settings/
69 changes: 49 additions & 20 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
to create nice graphs from jmeter result files.
</description>
<url>https://github.com/codecentric/jmeter-graph-maven-plugin</url>

<licenses>
<license>
<name>MIT</name>
Expand All @@ -32,12 +31,33 @@
<id>mlex</id>
<name>Michael Lex</name>
<roles>
<role>Comitter</role>
<role>Committer</role>
</roles>
</developer>
</developers>

<contributors>
<contributor>
<name>jkirchberg</name>
</contributor>
<contributor>
<name>Boris Petrovic</name>
</contributor>
<contributor>
<name>Marcelo Gore</name>
</contributor>
<contributor>
<name>Paul Steinbach</name>
</contributor>
<contributor>
<name>Philip Taferner</name>
</contributor>
<contributor>
<name>Michael Zhilin</name>
</contributor>
<contributor>
<name>srdkr</name>
</contributor>
</contributors>

<issueManagement>
Expand Down Expand Up @@ -75,8 +95,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jmeter.version>2.10</jmeter.version>
<jmeter.plugins.version>1.0.0</jmeter.plugins.version>
<jmeter.version>2.13</jmeter.version>
<jmeter.plugins.version>1.3.1</jmeter.plugins.version>
</properties>

<dependencies>
Expand All @@ -103,26 +123,35 @@
<artifactId>mojo-executor</artifactId>
<version>2.1.0</version>
</dependency>

<!-- JMeter dependencies -->
<dependency>
<groupId>org.apache.jmeter</groupId>
<artifactId>ApacheJMeter</artifactId>
<version>${jmeter.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jmeter</groupId>
<artifactId>ApacheJMeter_core</artifactId>
<version>${jmeter.version}</version>
</dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.0.3.RELEASE</version>
</dependency>

<dependency>
<groupId>org.apache.jmeter</groupId>
<artifactId>ApacheJMeter_config</artifactId>
<version>${jmeter.version}</version>
<groupId>kg.apc</groupId>
<artifactId>jmeter-plugins-standard</artifactId>
<version>${jmeter.plugins.version}</version>
<exclusions>
<!-- Those are not available in mvncentral -->
<exclusion>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</exclusion>
<exclusion>
<groupId>kg.apc</groupId>
<artifactId>perfmon</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>kg.apc</groupId>
<artifactId>jmeter-plugins</artifactId>
<artifactId>jmeter-plugins-extras</artifactId>
<version>${jmeter.plugins.version}</version>
<exclusions>
<!-- Those are not available in mvncentral -->
Expand Down Expand Up @@ -217,7 +246,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.4.2</version>
<version>2.4.2</version><!--$NO-MVN-MAN-VER$-->
</plugin>
</plugins>
</build>
Expand Down
Loading