Merged revisions 28947-28949,28951,28956 via svnmerge from

https://www.dev.java.net/svn/hudson/branches/rc

........
  r28947 | kohsuke | 2010-03-19 18:10:26 -0700 (Fri, 19 Mar 2010) | 1 line
  
  fixed a test failure.
........
  r28948 | kohsuke | 2010-03-19 18:10:56 -0700 (Fri, 19 Mar 2010) | 1 line
  
  accidentally committed.
........
  r28949 | kohsuke | 2010-03-19 18:40:50 -0700 (Fri, 19 Mar 2010) | 1 line
  
  [maven-release-plugin] prepare release hudson-1_352
........
  r28951 | kohsuke | 2010-03-19 18:41:30 -0700 (Fri, 19 Mar 2010) | 1 line
  
  [maven-release-plugin] prepare for next development iteration
........
  r28956 | kohsuke | 2010-03-19 19:27:54 -0700 (Fri, 19 Mar 2010) | 1 line
  
  updated changelog as a part of the release
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@29176 71c3de6d-444a-0410-be80-ed276b4c234a

cli/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.352-SNAPSHOT</version>
+    <version>1.353-SNAPSHOT</version>
   </parent>
   <artifactId>cli</artifactId>
   <name>Hudson CLI</name>

core/pom.xml

@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.352-SNAPSHOT</version>
+    <version>1.353-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

debian/changelog

+hudson (1.352) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 19 Mar 2010 19:25:54 -0700
+
 hudson (1.351) unstable; urgency=low
 
   * See http://hudson.dev.java.net/changelog.html for more details.

maven-agent/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.352-SNAPSHOT</version>
+    <version>1.353-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   

maven-interceptor/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.352-SNAPSHOT</version>
+    <version>1.353-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   

maven-plugin/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.352-SNAPSHOT</version>
+    <version>1.353-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>

pom.xml

@@ -33,7 +33,7 @@ THE SOFTWARE.
   
   <groupId>org.jvnet.hudson.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.352-SNAPSHOT</version>
+  <version>1.353-SNAPSHOT</version>
   <packaging>pom</packaging>
   
   <name>Hudson main module</name>

remoting/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.352-SNAPSHOT</version>
+    <version>1.353-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   

test/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.352-SNAPSHOT</version>
+    <version>1.353-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jvnet.hudson.main</groupId>

test/src/main/java/org/jvnet/hudson/test/TestEnvironment.java

@@ -23,6 +23,9 @@
  */
 package org.jvnet.hudson.test;
 
+import hudson.model.Computer;
+import hudson.model.Hudson;
+
 /**
  * TODO: deprecate this, and just consolidate this to {@link HudsonTestCase}.
  * We can then pin down the current HudsonTestCase to the thread for easier access.
@@ -41,22 +44,26 @@ public class TestEnvironment {
         this.testCase = testCase;
     }
 
-    /**
-     * Associates (or pin down) this {@link TestEnvironment} to the current thread, so that
-     * from within the test you can access this object without referring to any context.
-     */
     public void pin() {
-        ENVIRONMENT.set(this);
+        CURRENT = this;
     }
 
     public void dispose() {
-        ENVIRONMENT.set(null);
-        temporaryDirectoryAllocator.disposeAsync();
+        CURRENT = null;
     }
 
-    public static final ThreadLocal<TestEnvironment> ENVIRONMENT = new InheritableThreadLocal<TestEnvironment>();
+    /**
+     * We used to use {@link InheritableThreadLocal} here, but it turns out this is not reliable,
+     * especially in the {@link Computer#threadPoolForRemoting}, where threads can inherit
+     * the wrong test environment depending on when it's created.
+     *
+     * <p>
+     * Since the rest of Hudson still relies on static {@link Hudson#theInstance}, changing this
+     * to a static field for now shouldn't cause any problem. 
+     */
+    private static TestEnvironment CURRENT;
 
     public static TestEnvironment get() {
-        return ENVIRONMENT.get();
+        return CURRENT;
     }
 }

ui-samples-plugin/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.352-SNAPSHOT</version>
+    <version>1.353-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-samples-plugin</artifactId>

war/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.352-SNAPSHOT</version>
+    <version>1.353-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>