From 3b7eb05e43077ca4abcad77322d38cdc4bd86a5c Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Mon, 13 Jul 2009 17:48:59 +0000
Subject: [PATCH] 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                                          | 2 +-
 core/pom.xml                                         | 2 +-
 core/src/main/java/hudson/ClassicPluginStrategy.java | 2 +-
 debian/changelog                                     | 6 ++++++
 maven-agent/pom.xml                                  | 2 +-
 maven-interceptor/pom.xml                            | 2 +-
 maven-plugin/pom.xml                                 | 2 +-
 pom.xml                                              | 2 +-
 release.sh                                           | 4 +++-
 remoting/pom.xml                                     | 2 +-
 test/pom.xml                                         | 2 +-
 war/pom.xml                                          | 4 ++--
 12 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index 6a92b9e050..4692ec9b1d 100644
--- a/cli/pom.xml
+++ b/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>
diff --git a/core/pom.xml b/core/pom.xml
index 3a718d372d..71b865348b 100644
--- a/core/pom.xml
+++ b/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>
 
diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index 52e2aa18e9..27cca2e403 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/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
 
diff --git a/debian/changelog b/debian/changelog
index 0a4ab2f55f..0c2c9867af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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.
diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml
index d23e1d9420..5733c5f468 100644
--- a/maven-agent/pom.xml
+++ b/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>
   
diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml
index e531c1e9ad..c90db4c182 100644
--- a/maven-interceptor/pom.xml
+++ b/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>
   
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index eae3f77759..4109dd0e48 100644
--- a/maven-plugin/pom.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index f26d24dd7d..676f922e5b 100644
--- a/pom.xml
+++ b/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>
diff --git a/release.sh b/release.sh
index c8f52b7369..ba0b1717cb 100755
--- a/release.sh
+++ b/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
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 110d37c066..325da7945d 100644
--- a/remoting/pom.xml
+++ b/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>
   
diff --git a/test/pom.xml b/test/pom.xml
index 28bdda0827..cfa86f6fa8 100644
--- a/test/pom.xml
+++ b/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>
diff --git a/war/pom.xml b/war/pom.xml
index 86a3be1a52..ce0c9cd0b3 100644
--- a/war/pom.xml
+++ b/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>
-- 
GitLab