summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-24 06:33:39 (EST)
committer Winston Prakash2011-12-01 20:47:24 (EST)
commit49c466730e851f9dc15ecf35ae195f96200ce957 (patch)
tree079ec498e5891f192cdca854d7aa7ca5335499c8
parentd618079507786499206aa9add7c13a2fa0d12d81 (diff)
downloadorg.eclipse.hudson.core-49c466730e851f9dc15ecf35ae195f96200ce957.zip
org.eclipse.hudson.core-49c466730e851f9dc15ecf35ae195f96200ce957.tar.gz
org.eclipse.hudson.core-49c466730e851f9dc15ecf35ae195f96200ce957.tar.bz2
A few fixes.
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
-rw-r--r--hudson-core/src/main/java/hudson/model/Job.java3
-rw-r--r--hudson-core/src/main/resources/hudson/model/Job/configure.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/Job/configure.properties2
-rw-r--r--hudson-plugin-parent/pom.xml1
-rw-r--r--pom.xml6
5 files changed, 5 insertions, 9 deletions
diff --git a/hudson-core/src/main/java/hudson/model/Job.java b/hudson-core/src/main/java/hudson/model/Job.java
index d579e21..4d8dcf9 100644
--- a/hudson-core/src/main/java/hudson/model/Job.java
+++ b/hudson-core/src/main/java/hudson/model/Job.java
@@ -1501,7 +1501,8 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
if (property instanceof ExternalProjectProperty) {
property.setOverridden(((ExternalProjectProperty) property).isModified());
} else {
- property.setOverridden(property.getValue() != property.getCascadingValue());
+ property.setOverridden(
+ property.allowOverrideValue(property.getCascadingValue(), property.getValue()));
}
}
}
diff --git a/hudson-core/src/main/resources/hudson/model/Job/configure.jelly b/hudson-core/src/main/resources/hudson/model/Job/configure.jelly
index 20c7cd1..fa0ec2b 100644
--- a/hudson-core/src/main/resources/hudson/model/Job/configure.jelly
+++ b/hudson-core/src/main/resources/hudson/model/Job/configure.jelly
@@ -37,7 +37,7 @@
<j:if test="${cascadingCandidates.size() gt 0}">
<f:entry title="${%cascadingProjectName}">
<select class="setting-input" name="cascadingProjectName">
- <f:option/>
+ <f:option value="">${%emptyCascadingProjectName}</f:option>
<j:forEach var="job" items="${cascadingCandidates}">
<f:option selected="${job.name==it.cascadingProjectName}" value="${job.name}">${job.name}</f:option>
</j:forEach>
diff --git a/hudson-core/src/main/resources/hudson/model/Job/configure.properties b/hudson-core/src/main/resources/hudson/model/Job/configure.properties
index 6ed175b..bdc3ede 100644
--- a/hudson-core/src/main/resources/hudson/model/Job/configure.properties
+++ b/hudson-core/src/main/resources/hudson/model/Job/configure.properties
@@ -16,3 +16,5 @@
name={0} name
cascadingProjectName=Cascading Project
+#value that will be shown for project without cascading parent
+emptyCascadingProjectName=None \ No newline at end of file
diff --git a/hudson-plugin-parent/pom.xml b/hudson-plugin-parent/pom.xml
index ad35e64..cbf0eef 100644
--- a/hudson-plugin-parent/pom.xml
+++ b/hudson-plugin-parent/pom.xml
@@ -36,7 +36,6 @@
<hudson-war.version>3.0.0-SNAPSHOT</hudson-war.version>
<hudson-core.version>3.0.0-SNAPSHOT</hudson-core.version>
<hudson-test-framework.version>3.0.0-SNAPSHOT</hudson-test-framework.version>
- <junit.version>4.8.1</junit.version>
<servlet-api.version>2.4</servlet-api.version>
</properties>
diff --git a/pom.xml b/pom.xml
index a0c62fe..51fb01d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,12 +88,6 @@
<sisuInjectVersion>${sisuInject.version}</sisuInjectVersion>
<jetty-version>${jetty.version}</jetty-version>
- <!--Test dependencies-->
- <junit.version>4.8.1</junit.version>
- <easymock.version>3.0</easymock.version>
- <mockito-core.version>1.8.5</mockito-core.version>
- <powermock.version>1.4.10</powermock.version>
-
<!--Plugins-->
<maven-antrun-extended-plugin.version>1.42</maven-antrun-extended-plugin.version>
<maven-hudson-dev-plugin.version>6.1.7-hudson-1</maven-hudson-dev-plugin.version>