From cb97a30f196423dbce92d679c4ad5054b1e098c7 Mon Sep 17 00:00:00 2001
From: Chris Kozak <ckozak@gmail.com>
Date: Thu, 4 Oct 2012 10:40:52 -0500
Subject: [PATCH 1/2] Doesn't compile. Revert "add I18N UI and french L10N"

This reverts commit c74935ee9cbbf659276f36cf4f2b9dbcdaf16f53.
---
 pom.xml                                               |  2 +-
 .../jenkins/CucumberReportPublisher.java              |  2 +-
 .../jenkins/CucumberReportPublisher/config.jelly      | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0cb4d3d..24b223e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>net.masterthought.jenkins</groupId>
     <artifactId>cucumber-reports</artifactId>
-    <version>0.0.15</version>
+    <version>0.0.14</version>
     <packaging>hpi</packaging>
 
     <scm>
diff --git a/src/main/java/net/masterthought/jenkins/CucumberReportPublisher.java b/src/main/java/net/masterthought/jenkins/CucumberReportPublisher.java
index b4e6c81..4817ee7 100644
--- a/src/main/java/net/masterthought/jenkins/CucumberReportPublisher.java
+++ b/src/main/java/net/masterthought/jenkins/CucumberReportPublisher.java
@@ -128,7 +128,7 @@ public class CucumberReportPublisher extends Recorder {
     public static class DescriptorImpl extends BuildStepDescriptor<Publisher> {
         @Override
         public String getDisplayName() {
-			return Messages.CucumberReportPublisher_DisplayName();
+            return "Publish cucumber results as a report";
         }
 
 
diff --git a/src/main/resources/net/masterthought/jenkins/CucumberReportPublisher/config.jelly b/src/main/resources/net/masterthought/jenkins/CucumberReportPublisher/config.jelly
index e95e4ed..64b5351 100644
--- a/src/main/resources/net/masterthought/jenkins/CucumberReportPublisher/config.jelly
+++ b/src/main/resources/net/masterthought/jenkins/CucumberReportPublisher/config.jelly
@@ -10,21 +10,22 @@
     When submitted, it will be passed to the corresponding constructor parameter.
   -->
   <f:advanced>
-  <f:entry title="${%JsonReportsPath}" field="jsonReportDirectory" description="${%JsonReportsPathDescription}">
+  <f:entry title="Json Reports Path" field="jsonReportDirectory" description="The path relative to the workspace of the json reports generated by cucumber-jvm e.g. target - leave empty to let the plugin find them automagically">
     <f:textbox />
      </f:entry>
 
-    <f:entry title="${%PluginUrlPath}" field="pluginUrlPath" description="${%PluginUrlPathDescription}">
+    <f:entry title="Plugin Url Path" field="pluginUrlPath" description="The path to the jenkins user content url e.g. http://host:port[/jenkins/]plugin - leave empty if jenkins url root is host:port">
         <f:textbox />
   </f:entry>
-  <f:entry title="${%SkippedStepsFailTheBuild}" field="skippedFails" description="${%SkippedStepsFailTheBuildDescription}">
+  <f:entry title="Skipped Steps Fail the Build" field="skippedFails" description="Tick this if you want skipped steps to cause the build to fail">
           <f:checkbox />
     </f:entry>
-     <f:entry title="${%PendingStepsFailTheBuild}" field="undefinedFails" description="${%PendingStepsFailTheBuildDescription}">
+     <f:entry title="Pending Steps Fail the Build" field="undefinedFails" description="Tick this if you want pending steps to cause the build to fail">
               <f:checkbox />
         </f:entry>
-        <f:entry title="${%TurnOffFlashCharts}" field="noFlashCharts" description="${%TurnOffFlashChartsDescription}">
+        <f:entry title="Turn Off Flash Charts" field="noFlashCharts" description="Tick this if you want to use javascript charts instead of flash charts">
                       <f:checkbox />
                 </f:entry>
         </f:advanced>
 </j:jelly>
+

From 1ee05a3cfa77211ce1c81c127c2b99c6e7d3b61d Mon Sep 17 00:00:00 2001
From: Chris Kozak <ckozak@gmail.com>
Date: Mon, 8 Oct 2012 16:29:42 -0500
Subject: [PATCH 2/2] Updated version to match newest cucumber-report.

Moved ReportBuilder constructor into try-catch because it now throws an Exception.
ReportBuilder constructor takes two new parameters that I'm not sure are relevant to our needs; disabling artifacts and passing in empty config.
---
 pom.xml                                             |  4 ++--
 .../jenkins/CucumberReportPublisher.java            | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 24b223e..8afe355 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>net.masterthought.jenkins</groupId>
     <artifactId>cucumber-reports</artifactId>
-    <version>0.0.14</version>
+    <version>0.0.18</version>
     <packaging>hpi</packaging>
 
     <scm>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>net.masterthought</groupId>
             <artifactId>cucumber-reporting</artifactId>
-            <version>0.0.14-SNAPSHOT</version>
+            <version>0.0.18-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/src/main/java/net/masterthought/jenkins/CucumberReportPublisher.java b/src/main/java/net/masterthought/jenkins/CucumberReportPublisher.java
index 4817ee7..103bb01 100644
--- a/src/main/java/net/masterthought/jenkins/CucumberReportPublisher.java
+++ b/src/main/java/net/masterthought/jenkins/CucumberReportPublisher.java
@@ -95,9 +95,20 @@ public class CucumberReportPublisher extends Recorder {
         String[] jsonReportFiles = findJsonFiles(targetBuildDirectory);
         if (jsonReportFiles.length != 0) {
             listener.getLogger().println("[CucumberReportPublisher] Generating HTML reports");
-            ReportBuilder reportBuilder = new ReportBuilder(fullPathToJsonFiles(jsonReportFiles, targetBuildDirectory), targetBuildDirectory, pluginUrlPath, buildNumber, buildProject, skippedFails, undefinedFails, !noFlashCharts, true);
 
             try {
+                ReportBuilder reportBuilder = new ReportBuilder(
+                        fullPathToJsonFiles(jsonReportFiles, targetBuildDirectory),
+                        targetBuildDirectory,
+                        pluginUrlPath,
+                        buildNumber,
+                        buildProject,
+                        skippedFails,
+                        undefinedFails,
+                        !noFlashCharts,
+                        true,
+                        false,
+                        "");
                 reportBuilder.generateReports();
                 buildResult = reportBuilder.getBuildStatus();
             } catch (Exception e) {