Merged revisions 22140,22200,22202,22205,22237,22240,22242,22245 via svnmerge from

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

........
  r22140 | kohsuke | 2009-09-24 16:41:50 -0700 (Thu, 24 Sep 2009) | 1 line
  
  updating to a new version
........
  r22200 | kohsuke | 2009-09-25 16:33:50 -0700 (Fri, 25 Sep 2009) | 1 line
  
  [maven-release-plugin] prepare release hudson-1_325
........
  r22202 | kohsuke | 2009-09-25 16:34:05 -0700 (Fri, 25 Sep 2009) | 1 line
  
  [maven-release-plugin] prepare for next development iteration
........
  r22205 | kohsuke | 2009-09-25 17:09:38 -0700 (Fri, 25 Sep 2009) | 1 line
  
  updated changelog as a part of the release
........
  r22237 | kohsuke | 2009-09-28 09:51:38 -0700 (Mon, 28 Sep 2009) | 1 line
  
  [HUDSON-4353] My fix had a crucial bug that prevents plugin updates from failing.
........
  r22240 | kohsuke | 2009-09-28 10:37:51 -0700 (Mon, 28 Sep 2009) | 1 line
  
  [maven-release-plugin] prepare release hudson-1_326
........
  r22242 | kohsuke | 2009-09-28 10:39:05 -0700 (Mon, 28 Sep 2009) | 1 line
  
  [maven-release-plugin] prepare for next development iteration
........
  r22245 | kohsuke | 2009-09-28 11:24:40 -0700 (Mon, 28 Sep 2009) | 1 line
  
  updated changelog as a part of the release
........


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

cli/pom.xml

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

core/pom.xml

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

core/src/main/java/hudson/ClassicPluginStrategy.java

@@ -324,7 +324,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
 
         // timestamp check
         File explodeTime = new File(destDir,".timestamp");
-        if(explodeTime.exists() && explodeTime.lastModified()!=archive.lastModified())
+        if(explodeTime.exists() && explodeTime.lastModified()==archive.lastModified())
             return; // no need to expand
 
         LOGGER.info("Extracting "+archive);

debian/changelog

@@ -1,3 +1,15 @@
+hudson (1.326) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Mon, 28 Sep 2009 11:25:11 -0700
+
+hudson (1.325) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 25 Sep 2009 17:10:07 -0700
+
 hudson (1.324) 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.325-SNAPSHOT</version>
+    <version>1.327-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.325-SNAPSHOT</version>
+    <version>1.327-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.325-SNAPSHOT</version>
+    <version>1.327-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.325-SNAPSHOT</version>
+  <version>1.327-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.325-SNAPSHOT</version>
+    <version>1.327-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.325-SNAPSHOT</version>
+    <version>1.327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jvnet.hudson.main</groupId>

war/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.325-SNAPSHOT</version>
+    <version>1.327-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
@@ -113,7 +113,7 @@ THE SOFTWARE.
                 <resolveArtifact groupId="${project.groupId}" artifactId="maven-plugin" version="${project.version}" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/maven-plugin.hpi" />
                 <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="ssh-slaves" version="0.7" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/ssh-slaves.hpi" />
                 <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="subversion" version="1.7" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/subversion.hpi" />
-                <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="scis-ad" version="1.0" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/scis-ad.hpi" />
+                <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="scis-ad" version="1.1" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/scis-ad.hpi" />
               </tasks>
             </configuration>
           </execution>