merged the RC branch back. This time I saw a lot of strange merge failures. Is...

merged the RC branch back. This time I saw a lot of strange merge failures. Is svnmerge interfering with Subversion 1.6 somehow?

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

cli/pom.xml

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

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

@@ -123,7 +123,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
 		// String export = manifest.getMainAttributes().getValue("Export");
 
 		List<File> paths = new ArrayList<File>();
-        if (isLinked) {
+		if (isLinked) {
 			parseClassPath(manifest, archive, paths, "Libraries", ",");
 			parseClassPath(manifest, archive, paths, "Class-Path", " +"); // backward compatibility
 

debian/changelog

+hudson (1.315) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 10 Jul 2009 19:07:34 -0700
+
 hudson (1.314) 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.315-SNAPSHOT</version>
+    <version>1.316-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.315-SNAPSHOT</version>
+    <version>1.316-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.315-SNAPSHOT</version>
+    <version>1.316-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.315-SNAPSHOT</version>
+  <version>1.316-SNAPSHOT</version>
   <packaging>pom</packaging>
   
   <name>Hudson main module</name>

release.sh

@@ -83,7 +83,9 @@ chmod u+x publish-javadoc.sh
 ./publish-javadoc.sh
 
 # update index
-./javadocReverseIndex.groovy > .htaccess
+pushd target/checkout
+./javadocReverseIndex.groovy > ../../.htaccess
+popd
 scp .htaccess hudson-ci.org:~/www/hudson-ci.org/javadoc/byShortName
 
 # create and publish debian package

remoting/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.315-SNAPSHOT</version>
+    <version>1.316-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.315-SNAPSHOT</version>
+    <version>1.316-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.315-SNAPSHOT</version>
+    <version>1.316-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.5.2" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/ssh-slaves.hpi" />
-                <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="subversion" version="1.3" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/subversion.hpi" />
+                <resolveArtifact groupId="org.jvnet.hudson.plugins" artifactId="subversion" version="1.4" type="hpi" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/subversion.hpi" />
               </tasks>
             </configuration>
           </execution>