diff --git a/cli/pom.xml b/cli/pom.xml
index 59c411e6b0..958eaf349e 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -4,7 +4,7 @@
pom
org.jvnet.hudson.main
- 1.338-SNAPSHOT
+ 1.339-SNAPSHOT
cli
Hudson CLI
diff --git a/core/pom.xml b/core/pom.xml
index 421c675eef..41be046f92 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.338-SNAPSHOT
+ 1.339-SNAPSHOT
../pom.xml
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index be36cabdba..6b2e4fb9af 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -247,7 +247,7 @@ public class Queue extends ResourceController implements Saveable {
int maxId = 0;
for (Object o : list) {
if (o instanceof Task) {
- // backward compatiblity
+ // backward compatibility
schedule((Task)o, 0);
} else if (o instanceof Item) {
Item item = (Item)o;
@@ -477,7 +477,7 @@ public class Queue extends ResourceController implements Saveable {
/**
* @deprecated as of 1.311
- * Use {@link #schedule(Task, int, Action[])}
+ * Use {@link #schedule(Task, int, Action...)}
*/
public synchronized boolean add(Task p, int quietPeriod, Action... actions) {
return schedule(p, quietPeriod, actions)!=null;
@@ -838,10 +838,16 @@ public class Queue extends ResourceController implements Saveable {
* Make sure we don't queue two tasks of the same project to be built
* unless that project allows concurrent builds.
*/
- private boolean allowNewBuildableTask (Task t) {
- return t.isConcurrentBuild() || !buildables.containsKey(t);
+ private boolean allowNewBuildableTask(Task t) {
+ try {
+ if (t.isConcurrentBuild())
+ return true;
+ } catch (AbstractMethodError e) {
+ // earlier versions don't have the "isConcurrentBuild" method, so fall back gracefully
+ }
+ return !buildables.containsKey(t);
}
-
+
/**
* Queue maintenance.
*
@@ -1047,6 +1053,8 @@ public class Queue extends ResourceController implements Saveable {
/**
* True if the task allows concurrent builds
+ *
+ * @since 1.338
*/
boolean isConcurrentBuild();
}
diff --git a/core/src/main/java/hudson/util/AtomicFileWriter.java b/core/src/main/java/hudson/util/AtomicFileWriter.java
index b1cb7d03e5..01d295fd56 100644
--- a/core/src/main/java/hudson/util/AtomicFileWriter.java
+++ b/core/src/main/java/hudson/util/AtomicFileWriter.java
@@ -59,10 +59,12 @@ public class AtomicFileWriter extends Writer {
* File encoding to write. If null, platform default encoding is chosen.
*/
public AtomicFileWriter(File f, String encoding) throws IOException {
+ File dir = f.getParentFile();
try {
- tmpFile = File.createTempFile("atomic",null,f.getParentFile());
+ dir.mkdirs();
+ tmpFile = File.createTempFile("atomic",null, dir);
} catch (IOException e) {
- throw new IOException2("Failed to create a temporary file in "+f.getParentFile(),e);
+ throw new IOException2("Failed to create a temporary file in "+ dir,e);
}
destFile = f;
if (encoding==null)
diff --git a/core/src/main/resources/lib/form/hetero-list.jelly b/core/src/main/resources/lib/form/hetero-list.jelly
index c2fab2be17..8d8dc37e46 100644
--- a/core/src/main/resources/lib/form/hetero-list.jelly
+++ b/core/src/main/resources/lib/form/hetero-list.jelly
@@ -24,8 +24,10 @@ THE SOFTWARE.
- Outer most tag for creating a heterogeneous list, where the user can add different contents.
- See Descriptor.newInstancesFromHeteroList for how to parse the submission.
+ Outer most tag for creating a heterogeneous list, where the user can choose arbitrary number of
+ arbitrary items from the given list of descriptors, and configure them independently.
+
+ The submission can be data-bound into List<T> where T is the common base type for the describable instances.
form name that receives an array for all the items in the heterogeneous list.
diff --git a/debian/changelog b/debian/changelog
index 37d737f688..c31f923920 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hudson (1.338) unstable; urgency=low
+
+ * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi Fri, 18 Dec 2009 19:06:54 -0800
+
hudson (1.337) unstable; urgency=low
* See http://hudson.dev.java.net/changelog.html for more details.
diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml
index 1989ac08c3..b1b83a3309 100644
--- a/maven-agent/pom.xml
+++ b/maven-agent/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.338-SNAPSHOT
+ 1.339-SNAPSHOT
../pom.xml
diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml
index d7899c3cad..b3a6a25d41 100644
--- a/maven-interceptor/pom.xml
+++ b/maven-interceptor/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.338-SNAPSHOT
+ 1.339-SNAPSHOT
../pom.xml
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 6820292d45..9f8f55300e 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.338-SNAPSHOT
+ 1.339-SNAPSHOT
maven-plugin
diff --git a/pom.xml b/pom.xml
index 8a0c5aaef5..b9e7d58341 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.338-SNAPSHOT
+ 1.339-SNAPSHOT
pom
Hudson main module
diff --git a/remoting/pom.xml b/remoting/pom.xml
index d44a8a147d..fe964649d1 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.338-SNAPSHOT
+ 1.339-SNAPSHOT
../pom.xml
diff --git a/test/pom.xml b/test/pom.xml
index ffe0466c62..a372aea880 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
pom
org.jvnet.hudson.main
- 1.338-SNAPSHOT
+ 1.339-SNAPSHOT
4.0.0
org.jvnet.hudson.main
diff --git a/war/pom.xml b/war/pom.xml
index 9a0e40c2a1..bf126e31eb 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.338-SNAPSHOT
+ 1.339-SNAPSHOT
../pom.xml