Fix external event tigger bug. Simplify UserCause. File commit before…

… tag.

pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jvnet.hudson.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.292</version>
+    <version>1.291</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

src/main/resources/hudson/ivy/IvyBuildTrigger/UserCause/description.jelly

@@ -22,5 +22,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-    <p>${%started_by_user(it.moduleRevisionId,it.userName,rootURL)}</p>
+    <p>${%started_by_user(it.ivylabel,it.userName,rootURL)}</p>
 </j:jelly>

src/main/resources/hudson/ivy/IvyBuildTrigger/config.jelly

@@ -1,11 +1,4 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <j:if test="${!descriptor.globalExtendedVersionMatching}">
-    <f:entry title="${%revision_matching_title}" field="revisionMatching">
-      <f:checkbox name="ivy_version_matching" checked="${instance.extendedVersionMatching}"
-          />
-      <label class="attach-previous">${%revision_matching_checkbox}</label>
-    </f:entry>
-  </j:if>
   <j:if test="${!empty(descriptor.configurations)}">
     <f:entry title="${%ivy_configuration_title}" field="settingsName">
       <select class="setting-input" name="ivy_conf_name">

src/main/resources/hudson/ivy/IvyBuildTrigger/config.properties

@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-revision_matching_title=Ivy Revision Matching
-revision_matching_checkbox=Use extended revision matching to filter upstream project dependencies
 ivy_configuration_title=Ivy Settings
 ivy_configuration_default=(Default)
 ivy_file_title=Ivy File

src/main/resources/hudson/ivy/IvyBuildTrigger/global.jelly

@@ -1,7 +1,7 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:section title="Ivy">
     <f:entry title="${%revision_matching_title}" field="revisionMatching">
-      <f:checkbox name="ivy_global_version_matching" checked="${descriptor.globalExtendedVersionMatching}"
+      <f:checkbox name="ivy_version_matching" checked="${descriptor.extendedVersionMatching}"
           />
       <label>${%revision_matching_checkbox}</label>
     </f:entry>

src/main/resources/hudson/ivy/IvyBuildTrigger/global.properties

@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 
 revision_matching_title=Ivy Revision Matching
-revision_matching_checkbox=Use extended revision matching to filter upstream project dependencies globally
+revision_matching_checkbox=Use extended revision matching to filter the project dependency graph
 ivy_configuration_title=Ivy Settings
 ivy_configuration_description=List of Ivy Settings
 ivy_configuration_name_title=name

src/main/resources/hudson/ivy/IvyBuildTrigger/help-revisionMatching.html

@@ -1,11 +1,12 @@
 <div>
     Select this checkbox if you want to allow the optional <i>trunk</i> and <i>revision</i> attributes
-    of the ivy.xml module descriptor to help identify upstream project dependencies within Hudson.
+    of the ivy.xml module descriptor to help calculate and filter the Hudson project dependency graph.
     Leaving this option unchecked means that only the mandatory <i>organisation</i> and <i>module</i> 
-    attributes will be used when matching against project module descriptors.  However it also means
+    attributes will be used when matching against the project ivy module descriptors.  However it also means
     that if you have two or more projects configured in Hudson using the same mandatory attribute
-    values in their module descriptors, and this project defines a dynamic revision dependency on one of the
-    modules, then all those projects will match and will be considered upstream dependencies.  This is usually
+    values in their module descriptors, and another project defines a dynamic revision dependency on one of the
+    modules, then all of the projects will match and will be considered upstream dependencies.  This is usually
     <b>not</b> what you want if you are using Hudson CI to build different versions (or different
-    source code branches) of the same module at the same time.
-</div>
+    source code branches) of the same module at the same time, and selecting this checkbox can help
+    avoid this problem.
+</div>

src/main/resources/hudson/ivy/IvyBuildTrigger/help.html

@@ -1,4 +1,4 @@
 <div>
     If configured, Hudson will use the information in Ivy module descriptors (project-level ivy.xml files)
-    when building its internal lists of upstream and downstream project dependencies. 
+    when building its internal project dependency graph. 
 </div>