Merged revisions 21146,21189-21190,21192,21201 via svnmerge from

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

........
  r21146 | kohsuke | 2009-08-27 18:35:09 -0700 (Thu, 27 Aug 2009) | 1 line
  
  [FIXED HUDSON-4304] Using su instead of "daemon --user".In 1.322.
........
  r21189 | kohsuke | 2009-08-28 16:30:35 -0700 (Fri, 28 Aug 2009) | 1 line
  
  updated to 1.6
........
  r21190 | kohsuke | 2009-08-28 16:49:57 -0700 (Fri, 28 Aug 2009) | 1 line
  
  [maven-release-plugin] prepare release hudson-1_322
........
  r21192 | kohsuke | 2009-08-28 16:50:09 -0700 (Fri, 28 Aug 2009) | 1 line
  
  [maven-release-plugin] prepare for next development iteration
........
  r21201 | kohsuke | 2009-08-28 19:11:44 -0700 (Fri, 28 Aug 2009) | 1 line
  
  updated changelog as a part of the release
........


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

cli/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.322-SNAPSHOT</version>
+    <version>1.323-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.322-SNAPSHOT</version>
+    <version>1.323-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

debian/changelog

+hudson (1.322) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 28 Aug 2009 19:10:56 -0700
+
 hudson (1.321) unstable; urgency=low
 
   * See http://hudson.dev.java.net/changelog.html for more details.

debian/hudson.init

@@ -23,7 +23,9 @@ SCRIPTNAME=/etc/init.d/$NAME
 
 #DAEMON=$HUDSON_SH
 DAEMON=/usr/bin/daemon
-DAEMON_ARGS="--name=$NAME --inherit --env=HUDSON_HOME=$HUDSON_HOME --output=$HUDSON_LOG --user=$HUDSON_USER --pidfile=$PIDFILE" 
+DAEMON_ARGS="--name=$NAME --inherit --env=HUDSON_HOME=$HUDSON_HOME --output=$HUDSON_LOG --pidfile=$PIDFILE" 
+
+SU=/bin/su
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
@@ -61,10 +63,9 @@ do_start()
     #   2 if daemon could not be started
     $DAEMON $DAEMON_ARGS --running && return 1
     
-    # --user in daemon doesn't prepare these environment variables, so do so now
-    eval export HOME=~$HUDSON_USER
-    export USER=$HUDSON_USER
-    $DAEMON $DAEMON_ARGS -- $JAVA $JAVA_ARGS -jar $HUDSON_WAR $HUDSON_ARGS || return 2
+    # --user in daemon doesn't prepare environment variables like HOME, USER, LOGNAME or USERNAME,
+    # so we let su do so for us now
+    $SU $HUDSON_USER -c "$DAEMON $DAEMON_ARGS -- $JAVA $JAVA_ARGS -jar $HUDSON_WAR $HUDSON_ARGS" || return 2
 }
 
 #

maven-agent/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.322-SNAPSHOT</version>
+    <version>1.323-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.322-SNAPSHOT</version>
+    <version>1.323-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.322-SNAPSHOT</version>
+    <version>1.323-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.322-SNAPSHOT</version>
+  <version>1.323-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.322-SNAPSHOT</version>
+    <version>1.323-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.322-SNAPSHOT</version>
+    <version>1.323-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.322-SNAPSHOT</version>
+    <version>1.323-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
@@ -112,7 +112,7 @@ THE SOFTWARE.
                 <!-- bundled plugins -->
                 <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.5" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/subversion.hpi" />
+                <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="subversion" version="1.6" 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" />
               </tasks>
             </configuration>