X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-maven-maven-merge-master;h=5fafbace5ae02cbf72e755e9d0c032c69ae8b397;hb=refs%2Fchanges%2F89%2F8389%2F1;hp=f5e708cd0e91b0c9b942b747c0e6118d1bf64c26;hpb=89c7b0f2fa145a7016ba24955e8f57309e9295c8;p=releng%2Fglobal-jjb.git

diff --git a/.jjb-test/expected-xml/github-maven-maven-merge-master b/.jjb-test/expected-xml/github-maven-maven-merge-master
index f5e708cd..5fafbace 100644
--- a/.jjb-test/expected-xml/github-maven-maven-merge-master
+++ b/.jjb-test/expected-xml/github-maven-maven-merge-master
@@ -10,8 +10,9 @@
   <assignedNode>build-vm</assignedNode>
   <canRoam>false</canRoam>
   <properties>
-    <com.coravy.hudson.plugins.github.GithubProjectProperty>
+    <com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github">
       <projectUrl>$GIT_URL/$PROJECT/example-org/releng/ciman</projectUrl>
+      <displayName/>
     </com.coravy.hudson.plugins.github.GithubProjectProperty>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
@@ -120,28 +121,22 @@ For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
         <name>master</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
-    <excludedUsers/>
-    <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-    <authorOrCommitter>false</authorOrCommitter>
-    <wipeOutWorkspace>true</wipeOutWorkspace>
-    <pruneBranches>false</pruneBranches>
     <remotePoll>false</remotePoll>
     <gitTool>Default</gitTool>
     <submoduleCfg class="list"/>
-    <relativeTargetDir/>
     <reference/>
     <gitConfigName/>
     <gitConfigEmail/>
-    <skipTag>true</skipTag>
-    <scmName/>
-    <useShallowClone>false</useShallowClone>
-    <ignoreNotifyCommit>false</ignoreNotifyCommit>
     <extensions>
+      <hudson.plugins.git.extensions.impl.BuildChooserSetting>
+        <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+      </hudson.plugins.git.extensions.impl.BuildChooserSetting>
       <hudson.plugins.git.extensions.impl.SubmoduleOption>
         <disableSubmodules>false</disableSubmodules>
         <recursiveSubmodules>true</recursiveSubmodules>
         <trackingSubmodules>false</trackingSubmodules>
+        <parentCredentials>false</parentCredentials>
         <reference/>
         <timeout>10</timeout>
       </hudson.plugins.git.extensions.impl.SubmoduleOption>
@@ -155,8 +150,11 @@ For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
       <allowMembersOfWhitelistedOrgsAsAdmin>false</allowMembersOfWhitelistedOrgsAsAdmin>
       <whitelist/>
       <orgslist/>
+      <whiteListLabels/>
+      <blackListLabels/>
       <cron/>
       <triggerPhrase>^remerge$</triggerPhrase>
+      <skipBuildPhrase/>
       <onlyTriggerPhrase>false</onlyTriggerPhrase>
       <useGitHubHooks>true</useGitHubHooks>
       <permitAll>true</permitAll>
@@ -449,8 +447,9 @@ nexus_repo_url=&quot;$NEXUS_URL/content/repositories/$NEXUS_REPO&quot;
 
 # Remove metadata files that were not updated.
 set +e  # Temporarily disable to run diff command.
-metadata_files=($(diff -s -r &quot;$m2repo_dir&quot; &quot;$WORKSPACE/m2repo-backup&quot; \
-    | grep 'Files .* and .* are identical' | awk '{print $2}'))
+IFS=&quot; &quot; read -r -a metadata_files &lt;&lt;&lt; &quot;$(diff -s -r &quot;$m2repo_dir&quot; &quot;$WORKSPACE/m2repo-backup&quot; \
+    | grep 'Files .* and .* are identical' \
+    | awk '{print $2}')&quot;
 set -e  # Re-enable.
 
 set +u  # $metadata_files could be unbound if project is new.
@@ -511,11 +510,11 @@ exit 0
       <doNotResolveRelativePaths>false</doNotResolveRelativePaths>
       <pattern/>
     </hudson.plugins.findbugs.FindBugsPublisher>
-    <hudson.plugins.jacoco.JacocoPublisher>
+    <hudson.plugins.jacoco.JacocoPublisher plugin="jacoco">
       <execPattern>**/**.exec</execPattern>
       <classPattern>**/classes</classPattern>
       <sourcePattern>**/src/main/java</sourcePattern>
-      <changeBuildStatus/>
+      <changeBuildStatus>false</changeBuildStatus>
       <inclusionPattern/>
       <exclusionPattern>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</exclusionPattern>
       <maximumBranchCoverage>10</maximumBranchCoverage>