From 3f1f29aee11396d56e85323a98f7a8d47cbbd012 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Sat, 21 Nov 2009 08:07:33 +0000
Subject: [PATCH] Merged revisions 23932-23934 via svnmerge from
 https://svn.dev.java.net/svn/hudson/branches/rc

........
  r23932 | kohsuke | 2009-11-20 23:58:03 -0800 (Fri, 20 Nov 2009) | 1 line

  gpg can take passphrase from a file by itself
........
  r23933 | kohsuke | 2009-11-21 00:01:53 -0800 (Sat, 21 Nov 2009) | 1 line

  merged the temporary change in the 1.335 tag
........
  r23934 | kohsuke | 2009-11-21 00:02:25 -0800 (Sat, 21 Nov 2009) | 1 line

  in case someone updates changelog.html while a release is in progress
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23936 71c3de6d-444a-0410-be80-ed276b4c234a
---
 opensuse/rsync.sh |  2 +-
 pom.xml           | 41 ++++++++++++++++++++++++++---------------
 release.sh        |  1 +
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/opensuse/rsync.sh b/opensuse/rsync.sh
index b92ea587cf..05565cce30 100755
--- a/opensuse/rsync.sh
+++ b/opensuse/rsync.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -ex
 createrepo .
-GPG_AGENT_INFO= ./repomd-sign $(cat ~/.gpg.passphrase) repodata/repomd.xml
+gpg -a --detach-sign --yes --no-use-agent --passphrase-file ~/.gpg.passphrase repodata/repomd.xml
 cp hudson-ci.org.key repodata/repomd.xml.key
 rsync -avz *.key readme.html RPMS repodata hudson-ci.org:~/www/hudson-ci.org/opensuse
diff --git a/pom.xml b/pom.xml
index fe0917529f..8955075c95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,11 +103,7 @@ THE SOFTWARE.
         <configuration>
           <!-- enable release profile during the release, create IPS package, and sign bits. -->
           <prepareVerifyArgs>-P release,ips,sign</prepareVerifyArgs>
-          <!--
-            also run assembly during the release.
-            http://www.nabble.com/Release-Plugin%3A-Include-assemblies-for-deploying-tf2642295s177.html#a7377938
-           -->
-          <goals>-DskipTests install javadoc:javadoc animal-sniffer:check assembly:attached deploy javadoc:aggregate</goals>
+          <goals>-DskipTests javadoc:javadoc animal-sniffer:check deploy javadoc:aggregate</goals>
           <remoteTagging>true</remoteTagging><!-- work around http://jira.codehaus.org/browse/SCM-406 -->
         </configuration>
       </plugin>
@@ -121,16 +117,6 @@ THE SOFTWARE.
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <inherited>false</inherited>
-        <configuration>
-          <finalName>hudson-${version}</finalName>
-          <descriptors>
-            <descriptor>assembly-src.xml</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
         <version>1.0</version>
@@ -260,6 +246,31 @@ THE SOFTWARE.
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <inherited>false</inherited>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>attached</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <finalName>hudson-${version}</finalName>
+                  <descriptors>
+                    <descriptor>assembly-src.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
   
   <repositories>
diff --git a/release.sh b/release.sh
index 4f6ae85945..b598aa46b1 100755
--- a/release.sh
+++ b/release.sh
@@ -99,6 +99,7 @@ cat war/target/hudson-war-$id.ipstgz | ssh wsinterop.sun.com "cd ips/repository;
 ssh wsinterop.sun.com "cd ips; ./start.sh"
 
 pushd $WWW
+svn update changelog.html 
 svn commit -m "Hudson $id released" changelog.html hudson.jnlp
 popd
 
-- 
GitLab