diff --git a/cli/pom.xml b/cli/pom.xml index bcc4468872..490ed3beae 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.376-SNAPSHOT + 1.377-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 8504cdc313..49cf473a4a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.376-SNAPSHOT + 1.377-SNAPSHOT ../pom.xml diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java index ab06614045..396ae5af4d 100644 --- a/core/src/main/java/hudson/model/Descriptor.java +++ b/core/src/main/java/hudson/model/Descriptor.java @@ -490,9 +490,11 @@ public abstract class Descriptor> implements Saveable { } catch (NoSuchMethodException e) { throw new AssertionError(e); // impossible } catch (InstantiationException e) { - throw new Error(e); + throw new Error("Failed to instantiate "+clazz+" from "+formData,e); } catch (IllegalAccessException e) { - throw new Error(e); + throw new Error("Failed to instantiate "+clazz+" from "+formData,e); + } catch (RuntimeException e) { + throw new RuntimeException("Failed to instantiate "+clazz+" from "+formData,e); } } diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/config.jelly b/core/src/main/resources/hudson/matrix/LabelAxis/config.jelly index 33d0069104..00be18429b 100644 --- a/core/src/main/resources/hudson/matrix/LabelAxis/config.jelly +++ b/core/src/main/resources/hudson/matrix/LabelAxis/config.jelly @@ -28,11 +28,8 @@ THE SOFTWARE.
- - diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index b4b51ad409..01366d91b6 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -105,6 +105,10 @@ THE SOFTWARE. + + + +