From 3e9334e0f75bb42d237960dcb82eaf669473d678 Mon Sep 17 00:00:00 2001 From: ruswerner Date: Tue, 2 Dec 2014 08:46:36 +1300 Subject: [PATCH 1/5] update jmeter version to 2.12 (Apache pulled the 2.11 published archive) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2281dd..7960b60 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,6 @@ "LICENSE" ], "jmeterVersions": { - "jmeter": "2.11" + "jmeter": "2.12" } } From cef43eb386db1674f89d0fbdad29b120be038eec Mon Sep 17 00:00:00 2001 From: ruswerner Date: Tue, 2 Dec 2014 11:00:37 +1300 Subject: [PATCH 2/5] remove jmeter binary from package.json (this never existed and throws an npm error during install) --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 7960b60..9313bf1 100644 --- a/package.json +++ b/package.json @@ -35,8 +35,7 @@ "gruntplugin" ], "bin": { - "jmeter-manager": "bin/jmeter-manager", - "jmeter": "bin/jmeter" + "jmeter-manager": "bin/jmeter-manager" }, "files": [ "bin", From 2ffcf8cf5ba4439ac58efdeddc9a8a6d83c83526 Mon Sep 17 00:00:00 2001 From: ruswerner Date: Tue, 2 Dec 2014 15:36:43 +1300 Subject: [PATCH 3/5] revert commits on master; moving to branch --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9313bf1..a2281dd 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,8 @@ "gruntplugin" ], "bin": { - "jmeter-manager": "bin/jmeter-manager" + "jmeter-manager": "bin/jmeter-manager", + "jmeter": "bin/jmeter" }, "files": [ "bin", @@ -44,6 +45,6 @@ "LICENSE" ], "jmeterVersions": { - "jmeter": "2.12" + "jmeter": "2.11" } } From 54b7c43a7a90357385dec93b26f8c57b17e287b1 Mon Sep 17 00:00:00 2001 From: ruswerner Date: Tue, 2 Dec 2014 15:38:14 +1300 Subject: [PATCH 4/5] update jmeter version to 2.12 (Apache pulled the 2.11 published archive); remove reference to missing binary "jmeter" --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a2281dd..9313bf1 100644 --- a/package.json +++ b/package.json @@ -35,8 +35,7 @@ "gruntplugin" ], "bin": { - "jmeter-manager": "bin/jmeter-manager", - "jmeter": "bin/jmeter" + "jmeter-manager": "bin/jmeter-manager" }, "files": [ "bin", @@ -45,6 +44,6 @@ "LICENSE" ], "jmeterVersions": { - "jmeter": "2.11" + "jmeter": "2.12" } } From 6ae84c24e9ee86cd41fef182871ba68ac30d9712 Mon Sep 17 00:00:00 2001 From: ruswerner Date: Wed, 3 Dec 2014 09:32:58 +1300 Subject: [PATCH 5/5] increment package version to 0.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9313bf1..299c5f3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "grunt-jmeter", "description": "Run jmeter tests with grunt.", - "version": "0.0.2", + "version": "0.0.3", "homepage": "https://github.com/pcw216/grunt-jmeter", "author": { "name": "Patrick Winters",