Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-22811

Folder loading can be broken by a NPE in a build wrapper in one job

      A user of the Artifactory plugin encountered an error which caused an entire folder to not load:

      ... SEVERE jenkins.InitReactorRunner$1 onTaskFailed 
      Failed Loading job <foldername>
      java.lang.NullPointerException 
      	at org.jfrog.hudson.generic.ArtifactoryGenericConfigurator.getProjectActions(ArtifactoryGenericConfigurator.java:210) 
      	at hudson.model.Project.createTransientActions(Project.java:221) 
      	at hudson.model.AbstractProject.updateTransientActions(AbstractProject.java:739) 
      	at hudson.model.AbstractProject.onLoad(AbstractProject.java:334) 
      	at hudson.model.Project.onLoad(Project.java:90) 
      	at hudson.model.Items.load(Items.java:276) 
      	at hudson.model.ItemGroupMixIn.loadChildren(ItemGroupMixIn.java:105) 
      	at com.cloudbees.hudson.plugins.folder.Folder.onLoad(Folder.java:238) 
      	at hudson.model.Items.load(Items.java:276) 
      	at hudson.model.ItemGroupMixIn.loadChildren(ItemGroupMixIn.java:105) 
      	at com.cloudbees.hudson.plugins.folder.Folder.onLoad(Folder.java:238) 
      	at hudson.model.Items.load(Items.java:276) 
      	at hudson.model.ItemGroupMixIn.loadChildren(ItemGroupMixIn.java:105) 
      	at com.cloudbees.hudson.plugins.folder.Folder.onLoad(Folder.java:238) 
      	at hudson.model.Items.load(Items.java:276) 
      	at jenkins.model.Jenkins$18.run(Jenkins.java:2593) 
      	at ...
      

      The bug is in the Artifactory plugin, yet Jenkins core ought to have caught this and reported it without breaking loading of the job, much less the whole (top-level) folder.

          [JENKINS-22811] Folder loading can be broken by a NPE in a build wrapper in one job

          Oleg Nenashev added a comment -

          @Jesse
          Have you submitted a bug to Artifactory plugin?

          Oleg Nenashev added a comment - @Jesse Have you submitted a bug to Artifactory plugin?

          Jesse Glick added a comment -

          @oleg_nenashev I believe the bug was filed (not by me).

          Jesse Glick added a comment - @oleg_nenashev I believe the bug was filed (not by me).

          @oleg_nenashev I filed a bug a bug about this a few weeks ago HAP-484.

          Steven Christou added a comment - @oleg_nenashev I filed a bug a bug about this a few weeks ago HAP-484 .

          Oleg Nenashev added a comment -

          Thanks a lot for the clarification.
          I have not checked the external JIRA.

          Oleg Nenashev added a comment - Thanks a lot for the clarification. I have not checked the external JIRA.

          Jesse Glick added a comment -

          As seen in JENKINS-25940, createTransientActions would seem to be a common point of failure. Besides catching RuntimeException in loadChildren I think createTransientActions needs to catch it for each TransientProjectActionFactory it invokes. (Actionable ought to do the same for TransientActionFactory.)

          Jesse Glick added a comment - As seen in JENKINS-25940 , createTransientActions would seem to be a common point of failure. Besides catching RuntimeException in loadChildren I think createTransientActions needs to catch it for each TransientProjectActionFactory it invokes. ( Actionable ought to do the same for TransientActionFactory .)

          Code changed in jenkins
          User: christ66
          Path:
          core/src/main/java/hudson/model/ItemGroupMixIn.java
          test/src/test/java/hudson/model/ItemGroupMixInTest.java
          test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip
          http://jenkins-ci.org/commit/jenkins/3e29bd7eff12d73a9b49c1d6039dc6d0699db15a
          Log:
          JENKINS-22811 Folder loading can break when an item inside the folder fails to load or throws an Exception.

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: christ66 Path: core/src/main/java/hudson/model/ItemGroupMixIn.java test/src/test/java/hudson/model/ItemGroupMixInTest.java test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip http://jenkins-ci.org/commit/jenkins/3e29bd7eff12d73a9b49c1d6039dc6d0699db15a Log: JENKINS-22811 Folder loading can break when an item inside the folder fails to load or throws an Exception.

          Code changed in jenkins
          User: christ66
          Path:
          .gitignore
          changelog.html
          cli/pom.xml
          core/pom.xml
          core/src/main/grammar/crontab.g
          core/src/main/java/hudson/EnvVars.java
          core/src/main/java/hudson/FilePath.java
          core/src/main/java/hudson/PluginManager.java
          core/src/main/java/hudson/model/AbstractProject.java
          core/src/main/java/hudson/model/Descriptor.java
          core/src/main/java/hudson/model/Job.java
          core/src/main/java/hudson/model/ParameterDefinition.java
          core/src/main/java/hudson/model/Run.java
          core/src/main/java/hudson/model/RunMap.java
          core/src/main/java/hudson/model/TopLevelItemDescriptor.java
          core/src/main/java/hudson/model/queue/FutureImpl.java
          core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
          core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java
          core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
          core/src/main/java/hudson/scheduler/BaseParser.java
          core/src/main/java/hudson/security/Permission.java
          core/src/main/java/hudson/security/PermissionGroup.java
          core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
          core/src/main/java/hudson/slaves/ComputerRetentionWork.java
          core/src/main/java/hudson/tasks/Fingerprinter.java
          core/src/main/java/hudson/tools/AbstractCommandInstaller.java
          core/src/main/java/hudson/tools/JDKInstaller.java
          core/src/main/java/hudson/triggers/SafeTimerTask.java
          core/src/main/java/hudson/triggers/Trigger.java
          core/src/main/java/hudson/util/PluginServletFilter.java
          core/src/main/java/jenkins/diagnostics/ooom/BuildPtr.java
          core/src/main/java/jenkins/diagnostics/ooom/OutOfOrderBuildDetector.java
          core/src/main/java/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor.java
          core/src/main/java/jenkins/diagnostics/ooom/Problem.java
          core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java
          core/src/main/java/jenkins/model/Jenkins.java
          core/src/main/java/jenkins/model/RunIdMigrator.java
          core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
          core/src/main/java/jenkins/model/lazy/BuildReference.java
          core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
          core/src/main/java/jenkins/security/DefaultConfidentialStore.java
          core/src/main/java/jenkins/util/AntClassLoader.java
          core/src/main/java/jenkins/util/ErrorLoggingScheduledThreadPoolExecutor.java
          core/src/main/java/jenkins/util/Timer.java
          core/src/main/resources/hudson/cli/CLIAction/command.jelly
          core/src/main/resources/hudson/model/AbstractBuild/index_hu.properties
          core/src/main/resources/hudson/model/Computer/index.jelly
          core/src/main/resources/hudson/model/Label/index.jelly
          core/src/main/resources/hudson/model/Messages.properties
          core/src/main/resources/hudson/model/Messages_ja.properties
          core/src/main/resources/hudson/model/RunParameterValue/value.jelly
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause.jelly
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause.properties
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_cs.properties
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_da.properties
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_de.properties
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_es.properties
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_fr.properties
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_ja.properties
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_nl.properties
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt_BR.properties
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_sv_SE.properties
          core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_zh_TW.properties
          core/src/main/resources/hudson/node_monitors/Messages.properties
          core/src/main/resources/hudson/node_monitors/Messages_cs.properties
          core/src/main/resources/hudson/node_monitors/Messages_da.properties
          core/src/main/resources/hudson/node_monitors/Messages_de.properties
          core/src/main/resources/hudson/node_monitors/Messages_es.properties
          core/src/main/resources/hudson/node_monitors/Messages_fr.properties
          core/src/main/resources/hudson/node_monitors/Messages_ja.properties
          core/src/main/resources/hudson/node_monitors/Messages_nl.properties
          core/src/main/resources/hudson/node_monitors/Messages_pt.properties
          core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties
          core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties
          core/src/main/resources/hudson/node_monitors/Messages_zh_TW.properties
          core/src/main/resources/hudson/security/SecurityRealm/signup.jelly
          core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
          core/src/main/resources/jenkins/diagnostics/ooom/Messages.properties
          core/src/main/resources/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor/message.groovy
          core/src/main/resources/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor/message.properties
          core/src/main/resources/jenkins/model/MasterBuildConfiguration/config.groovy
          core/src/main/resources/jenkins/model/RunIdMigrator/UnmigrationInstruction/index.jelly
          core/src/main/resources/lib/form/class-entry.jelly
          core/src/main/resources/lib/form/descriptorRadioList.jelly
          core/src/main/resources/lib/form/dropdownListBlock.jelly
          core/src/main/resources/lib/form/hetero-list.jelly
          core/src/main/resources/lib/form/hetero-radio.jelly
          core/src/main/resources/lib/layout/layout.jelly
          core/src/test/java/hudson/BulkChangeTest.java
          core/src/test/java/hudson/ChannelRule.java
          core/src/test/java/hudson/ChannelTestCase.java
          core/src/test/java/hudson/EnvVarsTest.java
          core/src/test/java/hudson/FilePathTest.java
          core/src/test/java/hudson/FunctionsTest.java
          core/src/test/java/hudson/LauncherTest.java
          core/src/test/java/hudson/MarkupTextTest.java
          core/src/test/java/hudson/PluginManagerTest.java
          core/src/test/java/hudson/ProxyConfigurationTest.java
          core/src/test/java/hudson/UtilTest.java
          core/src/test/java/hudson/cli/ListJobsCommandTest.java
          core/src/test/java/hudson/console/UrlAnnotatorTest.java
          core/src/test/java/hudson/logging/LogRecorderTest.java
          core/src/test/java/hudson/model/BallColorTest.java
          core/src/test/java/hudson/model/LoadStatisticsTest.java
          core/src/test/java/hudson/model/ParametersActionTest.java
          core/src/test/java/hudson/model/ResourceListTest.java
          core/src/test/java/hudson/model/RunTest.java
          core/src/test/java/hudson/model/TaskActionTest.java
          core/src/test/java/hudson/model/TimeSeriesTest.java
          core/src/test/java/hudson/scheduler/CronTabDayOfWeekLocaleTest.java
          core/src/test/java/hudson/scheduler/CronTabEventualityTest.java
          core/src/test/java/hudson/scheduler/CronTabTest.java
          core/src/test/java/hudson/search/SearchTest.java
          core/src/test/java/hudson/slaves/NodeListTest.java
          core/src/test/java/hudson/util/ConsistentHashTest.java
          core/src/test/java/hudson/util/CopyOnWriteListTest.java
          core/src/test/java/hudson/util/CyclicGraphDetectorTest.java
          core/src/test/java/hudson/util/DirScannerTest.java
          core/src/test/java/hudson/util/FormValidationTest.java
          core/src/test/java/hudson/util/IteratorsTest.java
          core/src/test/java/hudson/util/LineEndNormalizingWriterTest.java
          core/src/test/java/hudson/util/PackedMapTest.java
          core/src/test/java/hudson/util/ProcessTreeTest.java
          core/src/test/java/hudson/util/QuotedStringTokenizerTest.java
          core/src/test/java/hudson/util/RobustReflectionConverterTest.java
          core/src/test/java/hudson/util/RunListTest.java
          core/src/test/java/hudson/util/SubClassGeneratorTest.java
          core/src/test/java/hudson/util/XStream2Test.java
          core/src/test/java/hudson/util/io/ReopenableRotatingFileOutputStreamTest.java
          core/src/test/java/hudson/util/io/TarArchiverTest.java
          core/src/test/java/hudson/util/io/ZipArchiverTest.java
          core/src/test/java/jenkins/ResilientJsonObjectTest.java
          core/src/test/java/jenkins/model/CoreEnvironmentContributorTest.java
          core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java
          core/src/test/java/jenkins/model/PeepholePermalinkTest.java
          core/src/test/java/jenkins/model/RunIdMigratorTest.java
          core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java
          core/src/test/java/jenkins/model/lazy/FakeMap.java
          core/src/test/java/jenkins/model/lazy/FakeMapBuilder.java
          core/src/test/java/jenkins/model/lazy/SortedIntListTest.java
          core/src/test/java/jenkins/security/ConfidentialStoreRule.java
          core/src/test/java/jenkins/util/MarkFindingOutputStreamTest.java
          core/src/test/java/jenkins/util/TimerTest.java
          debian/debian/changelog
          plugins/pom.xml
          pom.xml
          test/pom.xml
          test/src/main/preset-data/simple-projects/pom.xml
          test/src/test/groovy/hudson/GroovyTest.groovy
          test/src/test/groovy/hudson/RelativePathTest.groovy
          test/src/test/groovy/hudson/cli/BuildCommandTest.groovy
          test/src/test/groovy/hudson/cli/EnableJobCommandTest.groovy
          test/src/test/groovy/hudson/model/AbstractBuildTest.groovy
          test/src/test/groovy/hudson/model/AbstractProjectTest.groovy
          test/src/test/groovy/hudson/model/RunMapTest.groovy
          test/src/test/groovy/hudson/model/SlaveTest.groovy
          test/src/test/groovy/hudson/widgets/HistoryWidgetTest.groovy
          test/src/test/groovy/jenkins/bugs/Jenkins19124Test.groovy
          test/src/test/groovy/jenkins/diagnostics/ooom/OutOfOrderBuildDetectorTest.groovy
          test/src/test/groovy/jenkins/model/BuildDiscarderTest.groovy
          test/src/test/groovy/jenkins/model/PeepholePermalinkTest.groovy
          test/src/test/groovy/lib/form/ApplyButtonTest.groovy
          test/src/test/groovy/lib/form/TextAreaTest.groovy
          test/src/test/java/hudson/ClassicPluginStrategyTest.java
          test/src/test/java/hudson/ExtensionListTest.java
          test/src/test/java/hudson/FileSystemProvisionerTest.java
          test/src/test/java/hudson/PluginManagerTest.java
          test/src/test/java/hudson/ProcStarterTest.java
          test/src/test/java/hudson/ProcTest.java
          test/src/test/java/hudson/bugs/DateConversionTest.java
          test/src/test/java/hudson/bugs/LoginRedirectTest.java
          test/src/test/java/hudson/cli/CopyJobCommandTest.java
          test/src/test/java/hudson/cli/CreateJobCommandTest.java
          test/src/test/java/hudson/cli/GetJobCommandTest.java
          test/src/test/java/hudson/cli/GroovyshCommandTest.java
          test/src/test/java/hudson/console/ConsoleAnnotatorTest.java
          test/src/test/java/hudson/console/ExceptionAnnotationTest.java
          test/src/test/java/hudson/console/UrlAnnotatorTest.java
          test/src/test/java/hudson/diagnosis/HudsonHomeDiskUsageMonitorTest.java
          test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
          test/src/test/java/hudson/init/impl/GroovyInitScriptTest.java
          test/src/test/java/hudson/logging/LogRecorderManagerTest.java
          test/src/test/java/hudson/markup/MarkupFormatterTest.java
          test/src/test/java/hudson/model/AbortedFreeStyleBuildTest.java
          test/src/test/java/hudson/model/ApiTest.java
          test/src/test/java/hudson/model/AsynchPeopleTest.java
          test/src/test/java/hudson/model/AutoCompletionCandidatesTest.java
          test/src/test/java/hudson/model/CauseTest.java
          test/src/test/java/hudson/model/ComputerSetTest.java
          test/src/test/java/hudson/model/DependencyGraphTest.java
          test/src/test/java/hudson/model/DescriptorTest.java
          test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java
          test/src/test/java/hudson/model/DisplayNameTest.java
          test/src/test/java/hudson/model/DownloadServiceTest.java
          test/src/test/java/hudson/model/ExecutorTest.java
          test/src/test/java/hudson/model/FreeStyleProjectTest.java
          test/src/test/java/hudson/model/GetEnvironmentOutsideBuildTest.java
          test/src/test/java/hudson/model/HelpLinkTest.java
          test/src/test/java/hudson/model/HudsonTest.java
          test/src/test/java/hudson/model/ItemGroupMixInTest.java
          test/src/test/java/hudson/model/ItemsTest.java
          test/src/test/java/hudson/model/JobPropertyTest.java
          test/src/test/java/hudson/model/JobQueueTest.java
          test/src/test/java/hudson/model/JobTest.java
          test/src/test/java/hudson/model/ListViewTest.java
          test/src/test/java/hudson/model/ManagementLinkTest.java
          test/src/test/java/hudson/model/ParametersTest.java
          test/src/test/java/hudson/model/ProjectTest.java
          test/src/test/java/hudson/model/QueueTest.java
          test/src/test/java/hudson/model/RunMapTest.java
          test/src/test/java/hudson/model/RunParameterDefinitionTest.java
          test/src/test/java/hudson/model/RunTest.java
          test/src/test/java/hudson/model/UsageStatisticsTest.java
          test/src/test/java/hudson/model/UserPropertyTest.java
          test/src/test/java/hudson/model/UserTest.java
          test/src/test/java/hudson/model/ViewJobTest.java
          test/src/test/java/hudson/model/ViewTest.java
          test/src/test/java/hudson/model/WorkspaceCleanupThreadTest.java
          test/src/test/java/hudson/model/labels/LabelAtomPropertyTest.java
          test/src/test/java/hudson/model/labels/LabelExpressionTest.java
          test/src/test/java/hudson/model/listeners/ItemListenerTest.java
          test/src/test/java/hudson/model/queue/LoadPredictorTest.java
          test/src/test/java/hudson/model/queue/WideExecutionTest.java
          test/src/test/java/hudson/node_monitors/DiskSpaceMonitorDescriptorTest.java
          test/src/test/java/hudson/pages/SystemConfigurationTestCase.java
          test/src/test/java/hudson/scm/ChangeLogSetTest.java
          test/src/test/java/hudson/scm/ScmTest.java
          test/src/test/java/hudson/search/SearchTest.java
          test/src/test/java/hudson/security/CliAuthenticationTest.java
          test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java
          test/src/test/java/hudson/security/LoginTest.java
          test/src/test/java/hudson/security/PermissionGroupTest.java
          test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java
          test/src/test/java/hudson/slaves/DummyCloudImpl.java
          test/src/test/java/hudson/slaves/NodePropertyTest.java
          test/src/test/java/hudson/slaves/NodeProvisionerRule.java
          test/src/test/java/hudson/slaves/NodeProvisionerTest.java
          test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
          test/src/test/java/hudson/tasks/FingerprinterTest.java
          test/src/test/java/hudson/tasks/LogRotatorTest.java
          test/src/test/java/hudson/tasks/MavenTest.java
          test/src/test/java/hudson/tasks/UserAvatarResolverTest.java
          test/src/test/java/hudson/tools/JDKInstallerTest.java
          test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java
          test/src/test/java/hudson/tools/ToolLocationTest.java
          test/src/test/java/hudson/triggers/SCMTriggerTest.java
          test/src/test/java/hudson/triggers/TriggerStartTest.java
          test/src/test/java/hudson/util/AlternativeUiTextProviderTest.java
          test/src/test/java/hudson/util/ArgumentListBuilder2Test.java
          test/src/test/java/hudson/util/FormFieldValidatorTest.java
          test/src/test/java/hudson/util/ProcessTreeKillerTest.java
          test/src/test/java/hudson/util/RingBufferLogHandlerTest.java
          test/src/test/java/hudson/util/RobustReflectionConverterTest.java
          test/src/test/java/hudson/views/ListViewColumnTest.java
          test/src/test/java/jenkins/ExtensionFilterTest.java
          test/src/test/java/jenkins/model/ContextMenuTest.java
          test/src/test/java/jenkins/model/ExtensionTypeHierarchyTest.java
          test/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java
          test/src/test/java/jenkins/model/JenkinsTest.java
          test/src/test/java/jenkins/model/MasterBuildConfigurationTest.java
          test/src/test/java/jenkins/model/lazy/LazyBuildMixInTest.java
          test/src/test/java/jenkins/scm/SCMCheckoutStrategyTest.java
          test/src/test/java/jenkins/security/ApiTokenPropertyTest.java
          test/src/test/java/lib/form/ComboBoxTest.java
          test/src/test/java/lib/form/ExpandableTextboxTest.java
          test/src/test/java/lib/form/NameRefTest.java
          test/src/test/java/lib/hudson/ActionsTest.java
          test/src/test/java/lib/hudson/ListScmBrowsersTest.java
          test/src/test/java/lib/layout/LayoutTest.java
          test/src/test/java/org/jvnet/hudson/main/AppTest.java
          test/src/test/java/org/jvnet/hudson/test/HudsonTestCaseShutdownSlaveTest.java
          test/src/test/java/scripts/BehaviorTest.java
          test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/config.xml
          test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/hudson.scm.CVSSCM.xml
          test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/hudson.tasks.Ant.xml
          test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/hudson.tasks.Mailer.xml
          test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/hudson.tasks.Maven.xml
          test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/hudson.tasks.Shell.xml
          test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/hudson.triggers.SCMTrigger.xml
          test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/queue.xml
          test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/secret.key
          test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/config.xml
          test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/hudson.scm.CVSSCM.xml
          test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/hudson.tasks.Ant.xml
          test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/hudson.tasks.Mailer.xml
          test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/hudson.tasks.Maven.xml
          test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/hudson.tasks.Shell.xml
          test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/hudson.triggers.SCMTrigger.xml
          test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/queue.xml
          test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/secret.key
          test/src/test/resources/hudson/security/HudsonPrivateSecurityRealmTest/dataCompatibilityWith1_282.zip
          test/src/test/resources/hudson/security/HudsonPrivateSecurityRealmTest/testDataCompatibilityWith1_282.zip
          test/src/test/resources/hudson/tools/ToolLocationTest/testToolCompatibility/config.xml
          test/src/test/resources/hudson/tools/ToolLocationTest/testToolCompatibility/hudson.tasks.Ant.xml
          test/src/test/resources/hudson/tools/ToolLocationTest/testToolCompatibility/hudson.tasks.Maven.xml
          test/src/test/resources/hudson/tools/ToolLocationTest/toolCompatibility/config.xml
          test/src/test/resources/hudson/tools/ToolLocationTest/toolCompatibility/hudson.tasks.Ant.xml
          test/src/test/resources/hudson/tools/ToolLocationTest/toolCompatibility/hudson.tasks.Maven.xml
          test/src/test/resources/jenkins/diagnostics/ooom/OutOfOrderBuildDetectorTest/buildNumberClash.zip
          test/src/test/resources/jenkins/diagnostics/ooom/OutOfOrderBuildDetectorTest/oneProblem.zip
          test/src/test/resources/jenkins/model/BuildDiscarderTest/compatibility/config.xml
          test/src/test/resources/jenkins/model/BuildDiscarderTest/compatibility/jobs/foo/config.xml
          test/src/test/resources/jenkins/model/BuildDiscarderTest/testCompatibility/config.xml
          test/src/test/resources/jenkins/model/BuildDiscarderTest/testCompatibility/jobs/foo/config.xml
          test/src/test/resources/lib/form/NameRefTest/JenkinsRuleWithJelly/test1.jelly
          test/src/test/resources/lib/form/NameRefTest/test1.jelly
          war/pom.xml
          war/src/main/webapp/WEB-INF/web.xml
          war/src/main/webapp/css/style.css
          war/src/main/webapp/images/24x24/document-properties.gif
          war/src/main/webapp/images/24x24/document-properties.png
          war/src/main/webapp/scripts/hudson-behavior.js
          http://jenkins-ci.org/commit/jenkins/cd0752432ed718e30281eb4e2732646550996868
          Log:
          Merge remote-tracking branch 'upstream/master' into JENKINS-22811

          Conflicts:
          test/src/test/java/hudson/model/ItemGroupMixInTest.java

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: christ66 Path: .gitignore changelog.html cli/pom.xml core/pom.xml core/src/main/grammar/crontab.g core/src/main/java/hudson/EnvVars.java core/src/main/java/hudson/FilePath.java core/src/main/java/hudson/PluginManager.java core/src/main/java/hudson/model/AbstractProject.java core/src/main/java/hudson/model/Descriptor.java core/src/main/java/hudson/model/Job.java core/src/main/java/hudson/model/ParameterDefinition.java core/src/main/java/hudson/model/Run.java core/src/main/java/hudson/model/RunMap.java core/src/main/java/hudson/model/TopLevelItemDescriptor.java core/src/main/java/hudson/model/queue/FutureImpl.java core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java core/src/main/java/hudson/scheduler/BaseParser.java core/src/main/java/hudson/security/Permission.java core/src/main/java/hudson/security/PermissionGroup.java core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java core/src/main/java/hudson/slaves/ComputerRetentionWork.java core/src/main/java/hudson/tasks/Fingerprinter.java core/src/main/java/hudson/tools/AbstractCommandInstaller.java core/src/main/java/hudson/tools/JDKInstaller.java core/src/main/java/hudson/triggers/SafeTimerTask.java core/src/main/java/hudson/triggers/Trigger.java core/src/main/java/hudson/util/PluginServletFilter.java core/src/main/java/jenkins/diagnostics/ooom/BuildPtr.java core/src/main/java/jenkins/diagnostics/ooom/OutOfOrderBuildDetector.java core/src/main/java/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor.java core/src/main/java/jenkins/diagnostics/ooom/Problem.java core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java core/src/main/java/jenkins/model/Jenkins.java core/src/main/java/jenkins/model/RunIdMigrator.java core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java core/src/main/java/jenkins/model/lazy/BuildReference.java core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java core/src/main/java/jenkins/security/DefaultConfidentialStore.java core/src/main/java/jenkins/util/AntClassLoader.java core/src/main/java/jenkins/util/ErrorLoggingScheduledThreadPoolExecutor.java core/src/main/java/jenkins/util/Timer.java core/src/main/resources/hudson/cli/CLIAction/command.jelly core/src/main/resources/hudson/model/AbstractBuild/index_hu.properties core/src/main/resources/hudson/model/Computer/index.jelly core/src/main/resources/hudson/model/Label/index.jelly core/src/main/resources/hudson/model/Messages.properties core/src/main/resources/hudson/model/Messages_ja.properties core/src/main/resources/hudson/model/RunParameterValue/value.jelly core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause.jelly core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause.properties core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_cs.properties core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_da.properties core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_de.properties core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_es.properties core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_fr.properties core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_ja.properties core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_nl.properties core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt_BR.properties core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_sv_SE.properties core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_zh_TW.properties core/src/main/resources/hudson/node_monitors/Messages.properties core/src/main/resources/hudson/node_monitors/Messages_cs.properties core/src/main/resources/hudson/node_monitors/Messages_da.properties core/src/main/resources/hudson/node_monitors/Messages_de.properties core/src/main/resources/hudson/node_monitors/Messages_es.properties core/src/main/resources/hudson/node_monitors/Messages_fr.properties core/src/main/resources/hudson/node_monitors/Messages_ja.properties core/src/main/resources/hudson/node_monitors/Messages_nl.properties core/src/main/resources/hudson/node_monitors/Messages_pt.properties core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties core/src/main/resources/hudson/node_monitors/Messages_zh_TW.properties core/src/main/resources/hudson/security/SecurityRealm/signup.jelly core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly core/src/main/resources/jenkins/diagnostics/ooom/Messages.properties core/src/main/resources/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor/message.groovy core/src/main/resources/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor/message.properties core/src/main/resources/jenkins/model/MasterBuildConfiguration/config.groovy core/src/main/resources/jenkins/model/RunIdMigrator/UnmigrationInstruction/index.jelly core/src/main/resources/lib/form/class-entry.jelly core/src/main/resources/lib/form/descriptorRadioList.jelly core/src/main/resources/lib/form/dropdownListBlock.jelly core/src/main/resources/lib/form/hetero-list.jelly core/src/main/resources/lib/form/hetero-radio.jelly core/src/main/resources/lib/layout/layout.jelly core/src/test/java/hudson/BulkChangeTest.java core/src/test/java/hudson/ChannelRule.java core/src/test/java/hudson/ChannelTestCase.java core/src/test/java/hudson/EnvVarsTest.java core/src/test/java/hudson/FilePathTest.java core/src/test/java/hudson/FunctionsTest.java core/src/test/java/hudson/LauncherTest.java core/src/test/java/hudson/MarkupTextTest.java core/src/test/java/hudson/PluginManagerTest.java core/src/test/java/hudson/ProxyConfigurationTest.java core/src/test/java/hudson/UtilTest.java core/src/test/java/hudson/cli/ListJobsCommandTest.java core/src/test/java/hudson/console/UrlAnnotatorTest.java core/src/test/java/hudson/logging/LogRecorderTest.java core/src/test/java/hudson/model/BallColorTest.java core/src/test/java/hudson/model/LoadStatisticsTest.java core/src/test/java/hudson/model/ParametersActionTest.java core/src/test/java/hudson/model/ResourceListTest.java core/src/test/java/hudson/model/RunTest.java core/src/test/java/hudson/model/TaskActionTest.java core/src/test/java/hudson/model/TimeSeriesTest.java core/src/test/java/hudson/scheduler/CronTabDayOfWeekLocaleTest.java core/src/test/java/hudson/scheduler/CronTabEventualityTest.java core/src/test/java/hudson/scheduler/CronTabTest.java core/src/test/java/hudson/search/SearchTest.java core/src/test/java/hudson/slaves/NodeListTest.java core/src/test/java/hudson/util/ConsistentHashTest.java core/src/test/java/hudson/util/CopyOnWriteListTest.java core/src/test/java/hudson/util/CyclicGraphDetectorTest.java core/src/test/java/hudson/util/DirScannerTest.java core/src/test/java/hudson/util/FormValidationTest.java core/src/test/java/hudson/util/IteratorsTest.java core/src/test/java/hudson/util/LineEndNormalizingWriterTest.java core/src/test/java/hudson/util/PackedMapTest.java core/src/test/java/hudson/util/ProcessTreeTest.java core/src/test/java/hudson/util/QuotedStringTokenizerTest.java core/src/test/java/hudson/util/RobustReflectionConverterTest.java core/src/test/java/hudson/util/RunListTest.java core/src/test/java/hudson/util/SubClassGeneratorTest.java core/src/test/java/hudson/util/XStream2Test.java core/src/test/java/hudson/util/io/ReopenableRotatingFileOutputStreamTest.java core/src/test/java/hudson/util/io/TarArchiverTest.java core/src/test/java/hudson/util/io/ZipArchiverTest.java core/src/test/java/jenkins/ResilientJsonObjectTest.java core/src/test/java/jenkins/model/CoreEnvironmentContributorTest.java core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java core/src/test/java/jenkins/model/PeepholePermalinkTest.java core/src/test/java/jenkins/model/RunIdMigratorTest.java core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java core/src/test/java/jenkins/model/lazy/FakeMap.java core/src/test/java/jenkins/model/lazy/FakeMapBuilder.java core/src/test/java/jenkins/model/lazy/SortedIntListTest.java core/src/test/java/jenkins/security/ConfidentialStoreRule.java core/src/test/java/jenkins/util/MarkFindingOutputStreamTest.java core/src/test/java/jenkins/util/TimerTest.java debian/debian/changelog plugins/pom.xml pom.xml test/pom.xml test/src/main/preset-data/simple-projects/pom.xml test/src/test/groovy/hudson/GroovyTest.groovy test/src/test/groovy/hudson/RelativePathTest.groovy test/src/test/groovy/hudson/cli/BuildCommandTest.groovy test/src/test/groovy/hudson/cli/EnableJobCommandTest.groovy test/src/test/groovy/hudson/model/AbstractBuildTest.groovy test/src/test/groovy/hudson/model/AbstractProjectTest.groovy test/src/test/groovy/hudson/model/RunMapTest.groovy test/src/test/groovy/hudson/model/SlaveTest.groovy test/src/test/groovy/hudson/widgets/HistoryWidgetTest.groovy test/src/test/groovy/jenkins/bugs/Jenkins19124Test.groovy test/src/test/groovy/jenkins/diagnostics/ooom/OutOfOrderBuildDetectorTest.groovy test/src/test/groovy/jenkins/model/BuildDiscarderTest.groovy test/src/test/groovy/jenkins/model/PeepholePermalinkTest.groovy test/src/test/groovy/lib/form/ApplyButtonTest.groovy test/src/test/groovy/lib/form/TextAreaTest.groovy test/src/test/java/hudson/ClassicPluginStrategyTest.java test/src/test/java/hudson/ExtensionListTest.java test/src/test/java/hudson/FileSystemProvisionerTest.java test/src/test/java/hudson/PluginManagerTest.java test/src/test/java/hudson/ProcStarterTest.java test/src/test/java/hudson/ProcTest.java test/src/test/java/hudson/bugs/DateConversionTest.java test/src/test/java/hudson/bugs/LoginRedirectTest.java test/src/test/java/hudson/cli/CopyJobCommandTest.java test/src/test/java/hudson/cli/CreateJobCommandTest.java test/src/test/java/hudson/cli/GetJobCommandTest.java test/src/test/java/hudson/cli/GroovyshCommandTest.java test/src/test/java/hudson/console/ConsoleAnnotatorTest.java test/src/test/java/hudson/console/ExceptionAnnotationTest.java test/src/test/java/hudson/console/UrlAnnotatorTest.java test/src/test/java/hudson/diagnosis/HudsonHomeDiskUsageMonitorTest.java test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java test/src/test/java/hudson/init/impl/GroovyInitScriptTest.java test/src/test/java/hudson/logging/LogRecorderManagerTest.java test/src/test/java/hudson/markup/MarkupFormatterTest.java test/src/test/java/hudson/model/AbortedFreeStyleBuildTest.java test/src/test/java/hudson/model/ApiTest.java test/src/test/java/hudson/model/AsynchPeopleTest.java test/src/test/java/hudson/model/AutoCompletionCandidatesTest.java test/src/test/java/hudson/model/CauseTest.java test/src/test/java/hudson/model/ComputerSetTest.java test/src/test/java/hudson/model/DependencyGraphTest.java test/src/test/java/hudson/model/DescriptorTest.java test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java test/src/test/java/hudson/model/DisplayNameTest.java test/src/test/java/hudson/model/DownloadServiceTest.java test/src/test/java/hudson/model/ExecutorTest.java test/src/test/java/hudson/model/FreeStyleProjectTest.java test/src/test/java/hudson/model/GetEnvironmentOutsideBuildTest.java test/src/test/java/hudson/model/HelpLinkTest.java test/src/test/java/hudson/model/HudsonTest.java test/src/test/java/hudson/model/ItemGroupMixInTest.java test/src/test/java/hudson/model/ItemsTest.java test/src/test/java/hudson/model/JobPropertyTest.java test/src/test/java/hudson/model/JobQueueTest.java test/src/test/java/hudson/model/JobTest.java test/src/test/java/hudson/model/ListViewTest.java test/src/test/java/hudson/model/ManagementLinkTest.java test/src/test/java/hudson/model/ParametersTest.java test/src/test/java/hudson/model/ProjectTest.java test/src/test/java/hudson/model/QueueTest.java test/src/test/java/hudson/model/RunMapTest.java test/src/test/java/hudson/model/RunParameterDefinitionTest.java test/src/test/java/hudson/model/RunTest.java test/src/test/java/hudson/model/UsageStatisticsTest.java test/src/test/java/hudson/model/UserPropertyTest.java test/src/test/java/hudson/model/UserTest.java test/src/test/java/hudson/model/ViewJobTest.java test/src/test/java/hudson/model/ViewTest.java test/src/test/java/hudson/model/WorkspaceCleanupThreadTest.java test/src/test/java/hudson/model/labels/LabelAtomPropertyTest.java test/src/test/java/hudson/model/labels/LabelExpressionTest.java test/src/test/java/hudson/model/listeners/ItemListenerTest.java test/src/test/java/hudson/model/queue/LoadPredictorTest.java test/src/test/java/hudson/model/queue/WideExecutionTest.java test/src/test/java/hudson/node_monitors/DiskSpaceMonitorDescriptorTest.java test/src/test/java/hudson/pages/SystemConfigurationTestCase.java test/src/test/java/hudson/scm/ChangeLogSetTest.java test/src/test/java/hudson/scm/ScmTest.java test/src/test/java/hudson/search/SearchTest.java test/src/test/java/hudson/security/CliAuthenticationTest.java test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java test/src/test/java/hudson/security/LoginTest.java test/src/test/java/hudson/security/PermissionGroupTest.java test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java test/src/test/java/hudson/slaves/DummyCloudImpl.java test/src/test/java/hudson/slaves/NodePropertyTest.java test/src/test/java/hudson/slaves/NodeProvisionerRule.java test/src/test/java/hudson/slaves/NodeProvisionerTest.java test/src/test/java/hudson/tasks/ArtifactArchiverTest.java test/src/test/java/hudson/tasks/FingerprinterTest.java test/src/test/java/hudson/tasks/LogRotatorTest.java test/src/test/java/hudson/tasks/MavenTest.java test/src/test/java/hudson/tasks/UserAvatarResolverTest.java test/src/test/java/hudson/tools/JDKInstallerTest.java test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java test/src/test/java/hudson/tools/ToolLocationTest.java test/src/test/java/hudson/triggers/SCMTriggerTest.java test/src/test/java/hudson/triggers/TriggerStartTest.java test/src/test/java/hudson/util/AlternativeUiTextProviderTest.java test/src/test/java/hudson/util/ArgumentListBuilder2Test.java test/src/test/java/hudson/util/FormFieldValidatorTest.java test/src/test/java/hudson/util/ProcessTreeKillerTest.java test/src/test/java/hudson/util/RingBufferLogHandlerTest.java test/src/test/java/hudson/util/RobustReflectionConverterTest.java test/src/test/java/hudson/views/ListViewColumnTest.java test/src/test/java/jenkins/ExtensionFilterTest.java test/src/test/java/jenkins/model/ContextMenuTest.java test/src/test/java/jenkins/model/ExtensionTypeHierarchyTest.java test/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java test/src/test/java/jenkins/model/JenkinsTest.java test/src/test/java/jenkins/model/MasterBuildConfigurationTest.java test/src/test/java/jenkins/model/lazy/LazyBuildMixInTest.java test/src/test/java/jenkins/scm/SCMCheckoutStrategyTest.java test/src/test/java/jenkins/security/ApiTokenPropertyTest.java test/src/test/java/lib/form/ComboBoxTest.java test/src/test/java/lib/form/ExpandableTextboxTest.java test/src/test/java/lib/form/NameRefTest.java test/src/test/java/lib/hudson/ActionsTest.java test/src/test/java/lib/hudson/ListScmBrowsersTest.java test/src/test/java/lib/layout/LayoutTest.java test/src/test/java/org/jvnet/hudson/main/AppTest.java test/src/test/java/org/jvnet/hudson/test/HudsonTestCaseShutdownSlaveTest.java test/src/test/java/scripts/BehaviorTest.java test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/config.xml test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/hudson.scm.CVSSCM.xml test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/hudson.tasks.Ant.xml test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/hudson.tasks.Mailer.xml test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/hudson.tasks.Maven.xml test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/hudson.tasks.Shell.xml test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/hudson.triggers.SCMTrigger.xml test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/queue.xml test/src/test/resources/hudson/model/HudsonTest/simpleConfigSubmit/secret.key test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/config.xml test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/hudson.scm.CVSSCM.xml test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/hudson.tasks.Ant.xml test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/hudson.tasks.Mailer.xml test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/hudson.tasks.Maven.xml test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/hudson.tasks.Shell.xml test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/hudson.triggers.SCMTrigger.xml test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/queue.xml test/src/test/resources/hudson/model/HudsonTest/testSimpleConfigSubmit/secret.key test/src/test/resources/hudson/security/HudsonPrivateSecurityRealmTest/dataCompatibilityWith1_282.zip test/src/test/resources/hudson/security/HudsonPrivateSecurityRealmTest/testDataCompatibilityWith1_282.zip test/src/test/resources/hudson/tools/ToolLocationTest/testToolCompatibility/config.xml test/src/test/resources/hudson/tools/ToolLocationTest/testToolCompatibility/hudson.tasks.Ant.xml test/src/test/resources/hudson/tools/ToolLocationTest/testToolCompatibility/hudson.tasks.Maven.xml test/src/test/resources/hudson/tools/ToolLocationTest/toolCompatibility/config.xml test/src/test/resources/hudson/tools/ToolLocationTest/toolCompatibility/hudson.tasks.Ant.xml test/src/test/resources/hudson/tools/ToolLocationTest/toolCompatibility/hudson.tasks.Maven.xml test/src/test/resources/jenkins/diagnostics/ooom/OutOfOrderBuildDetectorTest/buildNumberClash.zip test/src/test/resources/jenkins/diagnostics/ooom/OutOfOrderBuildDetectorTest/oneProblem.zip test/src/test/resources/jenkins/model/BuildDiscarderTest/compatibility/config.xml test/src/test/resources/jenkins/model/BuildDiscarderTest/compatibility/jobs/foo/config.xml test/src/test/resources/jenkins/model/BuildDiscarderTest/testCompatibility/config.xml test/src/test/resources/jenkins/model/BuildDiscarderTest/testCompatibility/jobs/foo/config.xml test/src/test/resources/lib/form/NameRefTest/JenkinsRuleWithJelly/test1.jelly test/src/test/resources/lib/form/NameRefTest/test1.jelly war/pom.xml war/src/main/webapp/WEB-INF/web.xml war/src/main/webapp/css/style.css war/src/main/webapp/images/24x24/document-properties.gif war/src/main/webapp/images/24x24/document-properties.png war/src/main/webapp/scripts/hudson-behavior.js http://jenkins-ci.org/commit/jenkins/cd0752432ed718e30281eb4e2732646550996868 Log: Merge remote-tracking branch 'upstream/master' into JENKINS-22811 Conflicts: test/src/test/java/hudson/model/ItemGroupMixInTest.java

          Code changed in jenkins
          User: Jesse Glick
          Path:
          changelog.html
          http://jenkins-ci.org/commit/jenkins/12251abe8fc46958a1ee931e9bd1ec6730f1efb0
          Log:
          [FIXED JENKINS-22811] Noting merge of #1517.

          Compare: https://github.com/jenkinsci/jenkins/compare/84575541491c...12251abe8fc4

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Jesse Glick Path: changelog.html http://jenkins-ci.org/commit/jenkins/12251abe8fc46958a1ee931e9bd1ec6730f1efb0 Log: [FIXED JENKINS-22811] Noting merge of #1517. Compare: https://github.com/jenkinsci/jenkins/compare/84575541491c...12251abe8fc4

          dogfood added a comment -

          Integrated in jenkins_main_trunk #3920
          JENKINS-22811 Folder loading can break when an item inside the folder fails to load or throws an Exception. (Revision 3e29bd7eff12d73a9b49c1d6039dc6d0699db15a)
          [FIXED JENKINS-22811] Noting merge of #1517. (Revision 12251abe8fc46958a1ee931e9bd1ec6730f1efb0)

          Result = SUCCESS
          schristou88 : 3e29bd7eff12d73a9b49c1d6039dc6d0699db15a
          Files :

          • test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip
          • test/src/test/java/hudson/model/ItemGroupMixInTest.java
          • core/src/main/java/hudson/model/ItemGroupMixIn.java

          jesse glick : 12251abe8fc46958a1ee931e9bd1ec6730f1efb0
          Files :

          • changelog.html

          dogfood added a comment - Integrated in jenkins_main_trunk #3920 JENKINS-22811 Folder loading can break when an item inside the folder fails to load or throws an Exception. (Revision 3e29bd7eff12d73a9b49c1d6039dc6d0699db15a) [FIXED JENKINS-22811] Noting merge of #1517. (Revision 12251abe8fc46958a1ee931e9bd1ec6730f1efb0) Result = SUCCESS schristou88 : 3e29bd7eff12d73a9b49c1d6039dc6d0699db15a Files : test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip test/src/test/java/hudson/model/ItemGroupMixInTest.java core/src/main/java/hudson/model/ItemGroupMixIn.java jesse glick : 12251abe8fc46958a1ee931e9bd1ec6730f1efb0 Files : changelog.html

          Code changed in jenkins
          User: christ66
          Path:
          core/src/main/java/hudson/model/ItemGroupMixIn.java
          test/src/test/java/hudson/model/ItemGroupMixInTest.java
          test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip
          http://jenkins-ci.org/commit/jenkins/3520042b1b4cdd11f07c4f4d5a80aeafa1a09377
          Log:
          JENKINS-22811 Folder loading can break when an item inside the folder fails to load or throws an Exception.

          (cherry picked from commit 3e29bd7eff12d73a9b49c1d6039dc6d0699db15a)

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: christ66 Path: core/src/main/java/hudson/model/ItemGroupMixIn.java test/src/test/java/hudson/model/ItemGroupMixInTest.java test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip http://jenkins-ci.org/commit/jenkins/3520042b1b4cdd11f07c4f4d5a80aeafa1a09377 Log: JENKINS-22811 Folder loading can break when an item inside the folder fails to load or throws an Exception. (cherry picked from commit 3e29bd7eff12d73a9b49c1d6039dc6d0699db15a)

          Code changed in jenkins
          User: christ66
          Path:
          test/src/test/java/hudson/model/ItemGroupMixInTest.java
          http://jenkins-ci.org/commit/jenkins/8b528efc49c2735fd3418b4fcb94832190339425
          Log:
          JENKINS-22811 Fixed compilation error

          (cherry picked from commit b5213b3815d3223f619113ebbccde4a8733df4c0)

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: christ66 Path: test/src/test/java/hudson/model/ItemGroupMixInTest.java http://jenkins-ci.org/commit/jenkins/8b528efc49c2735fd3418b4fcb94832190339425 Log: JENKINS-22811 Fixed compilation error (cherry picked from commit b5213b3815d3223f619113ebbccde4a8733df4c0)

          Code changed in jenkins
          User: christ66
          Path:
          test/src/test/java/hudson/model/ItemGroupMixInTest.java
          http://jenkins-ci.org/commit/jenkins/383223bc467d8e3b77dce0cdc4b542f154e1adc1
          Log:
          JENKINS-22811 Obtain folder from jenkins instead of using local variable.

          (cherry picked from commit 8f24c4aa5ccd944c4647e9f99077cad46cb24a2d)

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: christ66 Path: test/src/test/java/hudson/model/ItemGroupMixInTest.java http://jenkins-ci.org/commit/jenkins/383223bc467d8e3b77dce0cdc4b542f154e1adc1 Log: JENKINS-22811 Obtain folder from jenkins instead of using local variable. (cherry picked from commit 8f24c4aa5ccd944c4647e9f99077cad46cb24a2d)

          Code changed in jenkins
          User: christ66
          Path:
          test/src/test/java/hudson/model/ItemGroupMixInTest.java
          http://jenkins-ci.org/commit/jenkins/82adc7ff70438ef2484aecfa7d5f31a98b3d9783
          Log:
          JENKINS-22811 Mark test extension with the correct annotation

          (cherry picked from commit fa40c102f5dbd8b02470317d730a3778c9153b64)

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: christ66 Path: test/src/test/java/hudson/model/ItemGroupMixInTest.java http://jenkins-ci.org/commit/jenkins/82adc7ff70438ef2484aecfa7d5f31a98b3d9783 Log: JENKINS-22811 Mark test extension with the correct annotation (cherry picked from commit fa40c102f5dbd8b02470317d730a3778c9153b64)

          Code changed in jenkins
          User: christ66
          Path:
          core/src/main/java/hudson/model/AbstractProject.java
          core/src/main/java/hudson/model/Actionable.java
          core/src/main/java/hudson/model/Project.java
          test/src/test/java/hudson/model/ItemGroupMixInTest.java
          test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip
          http://jenkins-ci.org/commit/jenkins/758cb5be1eee8d600734c97a15666002d7c1d39a
          Log:
          JENKINS-22811 If a project action fails to load we should log the project action and continue to load the project.

          (cherry picked from commit c3eb1cac794e2cf8efcb26695e8eb27ed80ece5c)

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: christ66 Path: core/src/main/java/hudson/model/AbstractProject.java core/src/main/java/hudson/model/Actionable.java core/src/main/java/hudson/model/Project.java test/src/test/java/hudson/model/ItemGroupMixInTest.java test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip http://jenkins-ci.org/commit/jenkins/758cb5be1eee8d600734c97a15666002d7c1d39a Log: JENKINS-22811 If a project action fails to load we should log the project action and continue to load the project. (cherry picked from commit c3eb1cac794e2cf8efcb26695e8eb27ed80ece5c)

          Code changed in jenkins
          User: christ66
          Path:
          core/src/main/java/hudson/model/AbstractProject.java
          core/src/main/java/hudson/model/Actionable.java
          http://jenkins-ci.org/commit/jenkins/ee309ef92096610259b0ec01e82940ba022bed1a
          Log:
          JENKINS-22811 Fix log message to report more verbose message.

          (cherry picked from commit da1c74f619feea134aa887b1e5b1774307ea0e47)

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: christ66 Path: core/src/main/java/hudson/model/AbstractProject.java core/src/main/java/hudson/model/Actionable.java http://jenkins-ci.org/commit/jenkins/ee309ef92096610259b0ec01e82940ba022bed1a Log: JENKINS-22811 Fix log message to report more verbose message. (cherry picked from commit da1c74f619feea134aa887b1e5b1774307ea0e47)

          Code changed in jenkins
          User: christ66
          Path:
          core/src/main/java/hudson/model/ItemGroupMixIn.java
          http://jenkins-ci.org/commit/jenkins/937ed1b9ca6d43e8aed04ef8b3b1dd0a6c001256
          Log:
          JENKINS-22811 Remove redundant catch exception

          (cherry picked from commit d58c3cd5d6ac851f0a28b1c1bb6dbeb02fd2b1c9)

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: christ66 Path: core/src/main/java/hudson/model/ItemGroupMixIn.java http://jenkins-ci.org/commit/jenkins/937ed1b9ca6d43e8aed04ef8b3b1dd0a6c001256 Log: JENKINS-22811 Remove redundant catch exception (cherry picked from commit d58c3cd5d6ac851f0a28b1c1bb6dbeb02fd2b1c9)

          Code changed in jenkins
          User: christ66
          Path:
          test/src/test/java/hudson/model/ItemGroupMixInTest.java
          http://jenkins-ci.org/commit/jenkins/13774a105d6b750689afe67261f85c5fd949d371
          Log:
          JENKINS-22811 Remove unnecessary check in test unit. Fix misleading test unit comment.

          (cherry picked from commit 3661ed5093ee1f4dd508bbea8272de447fcc6996)

          Compare: https://github.com/jenkinsci/jenkins/compare/16ee133b4807...13774a105d6b

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: christ66 Path: test/src/test/java/hudson/model/ItemGroupMixInTest.java http://jenkins-ci.org/commit/jenkins/13774a105d6b750689afe67261f85c5fd949d371 Log: JENKINS-22811 Remove unnecessary check in test unit. Fix misleading test unit comment. (cherry picked from commit 3661ed5093ee1f4dd508bbea8272de447fcc6996) Compare: https://github.com/jenkinsci/jenkins/compare/16ee133b4807...13774a105d6b

          dogfood added a comment -

          Integrated in jenkins_main_trunk #4292
          JENKINS-22811 Folder loading can break when an item inside the folder fails to load or throws an Exception. (Revision 3520042b1b4cdd11f07c4f4d5a80aeafa1a09377)
          JENKINS-22811 Fixed compilation error (Revision 8b528efc49c2735fd3418b4fcb94832190339425)
          JENKINS-22811 Obtain folder from jenkins instead of using local variable. (Revision 383223bc467d8e3b77dce0cdc4b542f154e1adc1)
          JENKINS-22811 Mark test extension with the correct annotation (Revision 82adc7ff70438ef2484aecfa7d5f31a98b3d9783)
          JENKINS-22811 If a project action fails to load we should log the project action and continue to load the project. (Revision 758cb5be1eee8d600734c97a15666002d7c1d39a)
          JENKINS-22811 Fix log message to report more verbose message. (Revision ee309ef92096610259b0ec01e82940ba022bed1a)
          JENKINS-22811 Remove redundant catch exception (Revision 937ed1b9ca6d43e8aed04ef8b3b1dd0a6c001256)
          JENKINS-22811 Remove unnecessary check in test unit. Fix misleading test unit comment. (Revision 13774a105d6b750689afe67261f85c5fd949d371)

          Result = UNSTABLE
          ogondza : 3520042b1b4cdd11f07c4f4d5a80aeafa1a09377
          Files :

          • core/src/main/java/hudson/model/ItemGroupMixIn.java
          • test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip
          • test/src/test/java/hudson/model/ItemGroupMixInTest.java

          ogondza : 8b528efc49c2735fd3418b4fcb94832190339425
          Files :

          • test/src/test/java/hudson/model/ItemGroupMixInTest.java

          ogondza : 383223bc467d8e3b77dce0cdc4b542f154e1adc1
          Files :

          • test/src/test/java/hudson/model/ItemGroupMixInTest.java

          ogondza : 82adc7ff70438ef2484aecfa7d5f31a98b3d9783
          Files :

          • test/src/test/java/hudson/model/ItemGroupMixInTest.java

          ogondza : 758cb5be1eee8d600734c97a15666002d7c1d39a
          Files :

          • core/src/main/java/hudson/model/Project.java
          • test/src/test/java/hudson/model/ItemGroupMixInTest.java
          • core/src/main/java/hudson/model/AbstractProject.java
          • core/src/main/java/hudson/model/Actionable.java
          • test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip

          ogondza : ee309ef92096610259b0ec01e82940ba022bed1a
          Files :

          • core/src/main/java/hudson/model/AbstractProject.java
          • core/src/main/java/hudson/model/Actionable.java

          ogondza : 937ed1b9ca6d43e8aed04ef8b3b1dd0a6c001256
          Files :

          • core/src/main/java/hudson/model/ItemGroupMixIn.java

          ogondza : 13774a105d6b750689afe67261f85c5fd949d371
          Files :

          • test/src/test/java/hudson/model/ItemGroupMixInTest.java

          dogfood added a comment - Integrated in jenkins_main_trunk #4292 JENKINS-22811 Folder loading can break when an item inside the folder fails to load or throws an Exception. (Revision 3520042b1b4cdd11f07c4f4d5a80aeafa1a09377) JENKINS-22811 Fixed compilation error (Revision 8b528efc49c2735fd3418b4fcb94832190339425) JENKINS-22811 Obtain folder from jenkins instead of using local variable. (Revision 383223bc467d8e3b77dce0cdc4b542f154e1adc1) JENKINS-22811 Mark test extension with the correct annotation (Revision 82adc7ff70438ef2484aecfa7d5f31a98b3d9783) JENKINS-22811 If a project action fails to load we should log the project action and continue to load the project. (Revision 758cb5be1eee8d600734c97a15666002d7c1d39a) JENKINS-22811 Fix log message to report more verbose message. (Revision ee309ef92096610259b0ec01e82940ba022bed1a) JENKINS-22811 Remove redundant catch exception (Revision 937ed1b9ca6d43e8aed04ef8b3b1dd0a6c001256) JENKINS-22811 Remove unnecessary check in test unit. Fix misleading test unit comment. (Revision 13774a105d6b750689afe67261f85c5fd949d371) Result = UNSTABLE ogondza : 3520042b1b4cdd11f07c4f4d5a80aeafa1a09377 Files : core/src/main/java/hudson/model/ItemGroupMixIn.java test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip test/src/test/java/hudson/model/ItemGroupMixInTest.java ogondza : 8b528efc49c2735fd3418b4fcb94832190339425 Files : test/src/test/java/hudson/model/ItemGroupMixInTest.java ogondza : 383223bc467d8e3b77dce0cdc4b542f154e1adc1 Files : test/src/test/java/hudson/model/ItemGroupMixInTest.java ogondza : 82adc7ff70438ef2484aecfa7d5f31a98b3d9783 Files : test/src/test/java/hudson/model/ItemGroupMixInTest.java ogondza : 758cb5be1eee8d600734c97a15666002d7c1d39a Files : core/src/main/java/hudson/model/Project.java test/src/test/java/hudson/model/ItemGroupMixInTest.java core/src/main/java/hudson/model/AbstractProject.java core/src/main/java/hudson/model/Actionable.java test/src/test/resources/hudson/model/ItemGroupMixInTest/xmlFileReadExceptionOnLoad.zip ogondza : ee309ef92096610259b0ec01e82940ba022bed1a Files : core/src/main/java/hudson/model/AbstractProject.java core/src/main/java/hudson/model/Actionable.java ogondza : 937ed1b9ca6d43e8aed04ef8b3b1dd0a6c001256 Files : core/src/main/java/hudson/model/ItemGroupMixIn.java ogondza : 13774a105d6b750689afe67261f85c5fd949d371 Files : test/src/test/java/hudson/model/ItemGroupMixInTest.java

            schristou Steven Christou
            jglick Jesse Glick
            Votes:
            1 Vote for this issue
            Watchers:
            5 Start watching this issue

              Created:
              Updated:
              Resolved: