provisionr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From as...@apache.org
Subject git commit: PROVISIONR-25. Update release process to match Incubator guidelines
Date Mon, 17 Jun 2013 10:55:04 GMT
Updated Branches:
  refs/heads/master 8bffe881f -> 631033a47


PROVISIONR-25. Update release process to match Incubator guidelines

* Add Apache staging repository to distributionManagement
* Add GPG signing for binary artifacts
* Update release script to deploy to Apache Staging Nexus
* Add Maven Assembly config that builds source release


Project: http://git-wip-us.apache.org/repos/asf/incubator-provisionr/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-provisionr/commit/631033a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-provisionr/tree/631033a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-provisionr/diff/631033a4

Branch: refs/heads/master
Commit: 631033a478c873c7006451db7e3028d90ba29bad
Parents: 8bffe88
Author: Andrei Savu <asavu@apache.org>
Authored: Mon Jun 10 19:37:48 2013 +0300
Committer: Andrei Savu <asavu@apache.org>
Committed: Mon Jun 17 13:53:29 2013 +0300

----------------------------------------------------------------------
 karaf/assembly/pom.xml                    |  23 ++++-
 karaf/assembly/src/main/assembly/bin.xml  | 124 +++++++++++++++++++++++++
 karaf/assembly/src/main/assembly/src.xml  |  48 ++++++++++
 karaf/assembly/src/main/assembly/unix.xml | 122 ------------------------
 parent/pom.xml                            | 109 +++++++++++++++++++++-
 scripts/create_distribution.sh            |   1 +
 scripts/deploy.sh                         |  35 -------
 scripts/release.sh                        |  11 ++-
 8 files changed, 309 insertions(+), 164 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/631033a4/karaf/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/assembly/pom.xml b/karaf/assembly/pom.xml
index 5dfd5c5..437b4aa 100644
--- a/karaf/assembly/pom.xml
+++ b/karaf/assembly/pom.xml
@@ -28,7 +28,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <name>Apache Provisionr :: Custom Karaf Distribution</name>
-    <description>Install all the features as a custom Karaf distribution</description>
+    <description>Prepare a custom Karaf distribution and a source release</description>
     <artifactId>provisionr-assembly</artifactId>
 
     <dependencies>
@@ -149,16 +149,31 @@
                 <version>2.4</version>
                 <executions>
                     <execution>
-                        <id>unix-bin</id>
+                        <id>bin</id>
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>src/main/assembly/unix.xml</descriptor>
+                                <descriptor>src/main/assembly/bin.xml</descriptor>
                             </descriptors>
-                            <finalName>${project.groupId}-${project.version}</finalName>
+                            <finalName>provisionr-${project.version}</finalName>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>src</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/src.xml</descriptor>
+                            </descriptors>
+                            <finalName>provisionr-${project.version}-src</finalName>
                             <tarLongFileMode>gnu</tarLongFileMode>
                             <appendAssemblyId>false</appendAssemblyId>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/631033a4/karaf/assembly/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/karaf/assembly/src/main/assembly/bin.xml b/karaf/assembly/src/main/assembly/bin.xml
new file mode 100644
index 0000000..b25ca70
--- /dev/null
+++ b/karaf/assembly/src/main/assembly/bin.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>provisionr-assembly-bin</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+
+    <fileSets>
+        <!-- Strip the Karaf distribution -->
+        <fileSet>
+            <directory>${project.basedir}/target/dependencies/unix/apache-karaf-${karaf.version}</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>**/demos/**</exclude>
+                <exclude>lib/karaf-version.jar</exclude>
+                <exclude>bin/**</exclude>
+                <exclude>etc/org.apache.karaf.features.cfg</exclude>
+                <exclude>etc/custom.properties</exclude>
+                <exclude>etc/startup.properties</exclude>
+                <!--<exclude>etc/jre.properties*</exclude>-->
+                <exclude>etc/org.apache.karaf.features.repos.cfg</exclude>
+                <exclude>readme.txt</exclude>
+                <exclude>LICENSE</exclude>
+                <exclude>NOTICE</exclude>
+                <exclude>README</exclude>
+                <exclude>RELEASE-NOTES</exclude>
+                <exclude>karaf-manual*</exclude>
+            </excludes>
+        </fileSet>
+
+        <!-- Copy over bin/* scripts separately to get the correct file mode -->
+        <fileSet>
+            <directory>${project.basedir}/target/dependencies/unix/apache-karaf-${karaf.version}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>bin/*</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </fileSet>
+
+        <!-- Copy over the README and the LICENSE -->
+        <fileSet>
+            <directory>${project.basedir}/../../</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>README.md</include>
+                <include>LICENSE</include>
+                <include>DISCLAIMER</include>
+                <include>NOTICE</include>
+            </includes>
+        </fileSet>
+
+        <!-- Copy over resources -->
+        <fileSet>
+            <directory>${project.basedir}/target/classes/etc</directory>
+            <outputDirectory>/etc/</outputDirectory>
+            <includes>
+                <include>*.*</include>
+            </includes>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0644</fileMode>
+        </fileSet>
+
+        <!-- Copy over templates -->
+        <fileSet>
+            <directory>${project.basedir}/target/classes/templates</directory>
+            <outputDirectory>/templates/</outputDirectory>
+            <includes>
+                <include>*.*</include>
+            </includes>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0644</fileMode>
+        </fileSet>
+
+
+        <!-- Add features to system repository -->
+        <fileSet>
+            <outputDirectory>system</outputDirectory>
+            <directory>${project.basedir}/target/features-repo</directory>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>${project.basedir}/target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
+            <outputDirectory>/bin/</outputDirectory>
+            <destName>provisionr</destName>
+            <fileMode>0755</fileMode>
+            <lineEnding>unix</lineEnding>
+        </file>
+    </files>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <outputFileNameMapping>provisionr-version.jar</outputFileNameMapping>
+            <fileMode>0644</fileMode>
+            <includes>
+                <include>org.apache.provisionr:provisionr-branding</include>
+            </includes>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/631033a4/karaf/assembly/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/karaf/assembly/src/main/assembly/src.xml b/karaf/assembly/src/main/assembly/src.xml
new file mode 100644
index 0000000..11da769
--- /dev/null
+++ b/karaf/assembly/src/main/assembly/src.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>provisionr-assembly-src</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <baseDirectory>provisionr-${project.version}-src</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/../../</directory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+            <excludes>
+                <exclude>**/.project</exclude>
+                <exclude>**/.gitignore</exclude>
+                <exclude>**/${project.build.directory}/**</exclude>
+                <exclude>**/dependency-reduced-pom.xml</exclude>
+                <exclude>**/*.log</exclude>
+                <exclude>**/*.log.*</exclude>
+                <exclude>**/*.rej</exclude>
+                <exclude>**/*.classpath</exclude>
+                <exclude>.idea/**</exclude>
+                <exclude>**/*.iml</exclude>
+                <exclude>**/*.ipr</exclude>
+                <exclude>**/*.iws</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/631033a4/karaf/assembly/src/main/assembly/unix.xml
----------------------------------------------------------------------
diff --git a/karaf/assembly/src/main/assembly/unix.xml b/karaf/assembly/src/main/assembly/unix.xml
deleted file mode 100644
index 384f8a6..0000000
--- a/karaf/assembly/src/main/assembly/unix.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<assembly>
-    <id>provisionr-assembly</id>
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-
-    <fileSets>
-        <!-- Strip the Karaf distribution -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
-            <outputDirectory>/</outputDirectory>
-            <excludes>
-                <exclude>**/demos/**</exclude>
-                <exclude>lib/karaf-version.jar</exclude>
-                <exclude>bin/**</exclude>
-                <exclude>etc/org.apache.karaf.features.cfg</exclude>
-                <exclude>etc/custom.properties</exclude>
-                <exclude>etc/startup.properties</exclude>
-                <!--<exclude>etc/jre.properties*</exclude>-->
-                <exclude>etc/org.apache.karaf.features.repos.cfg</exclude>
-                <exclude>readme.txt</exclude>
-                <exclude>LICENSE</exclude>
-                <exclude>NOTICE</exclude>
-                <exclude>README</exclude>
-                <exclude>RELEASE-NOTES</exclude>
-                <exclude>karaf-manual*</exclude>
-            </excludes>
-        </fileSet>
-
-        <!-- Copy over bin/* scripts separately to get the correct file mode -->
-        <fileSet>
-            <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>bin/*</include>
-            </includes>
-            <fileMode>0755</fileMode>
-        </fileSet>
-
-        <!-- Copy over the README and the LICENSE -->
-        <fileSet>
-            <directory>../../</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>README.md</include>
-                <include>LICENSE</include>
-                <include>DISCLAIMER</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-
-        <!-- Copy over resources -->
-        <fileSet>
-            <directory>target/classes/etc</directory>
-            <outputDirectory>/etc/</outputDirectory>
-            <includes>
-                <include>*.*</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-
-        <!-- Copy over templates -->
-        <fileSet>
-            <directory>target/classes/templates</directory>
-            <outputDirectory>/templates/</outputDirectory>
-            <includes>
-                <include>*.*</include>
-            </includes>
-            <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
-        </fileSet>
-
-
-        <!-- Add features to system repository -->
-        <fileSet>
-            <outputDirectory>system</outputDirectory>
-            <directory>target/features-repo</directory>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
-            <outputDirectory>/bin/</outputDirectory>
-            <destName>provisionr</destName>
-            <fileMode>0755</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-    </files>
-
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/lib</outputDirectory>
-            <outputFileNameMapping>provisionr-version.jar</outputFileNameMapping>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>org.apache.provisionr:provisionr-branding</include>
-            </includes>
-            <useTransitiveDependencies>false</useTransitiveDependencies>
-        </dependencySet>
-    </dependencySets>
-</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/631033a4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cfd88f3..4f019b8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -107,6 +107,15 @@
         <url>http://www.apache.org/</url>
     </organization>
 
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+            <comments>A business-friendly OSS license</comments>
+        </license>
+    </licenses>
+
     <scm>
         <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-provisionr.git</connection>
         <developerConnection>
@@ -116,6 +125,16 @@
         <tag>HEAD</tag>
     </scm>
 
+    <mailingLists>
+        <mailingList>
+            <name>Apache Provisionr Development Mailing List</name>
+            <post>dev@provisionr.incubator.apache.org</post>
+            <subscribe>dev-subscribe@provisionr.incubator.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@provisionr.incubator.apache.org</unsubscribe>
+            <archive>http://mail-archives.apache.org/mod_mbox/incubator-provisionr-dev/</archive>
+        </mailingList>
+    </mailingLists>
+
     <issueManagement>
         <system>jira</system>
         <url>https://issues.apache.org/jira/browse/PROVISIONR</url>
@@ -322,6 +341,14 @@
 
     <repositories>
         <repository>
+            <id>apache.snapshots</id>
+            <name>Apache Snapshot Repository</name>
+            <url>http://repository.apache.org/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+        <repository>
             <id>central</id>
             <url>http://repo1.maven.org/maven2/</url>
         </repository>
@@ -336,6 +363,22 @@
         </repository>
     </repositories>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache-snapshots</id>
+            <url>https://repository.apache.org/content/repositories/snapshots</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <distributionManagement>
+        <repository>
+            <id>apache.staging.https</id>
+            <name>Nexus Staging Repo</name>
+            <url>https://repository.apache.org/service/local/staging/deploy/maven2/
+            </url>
+        </repository>
+    </distributionManagement>
+
     <build>
         <plugins>
             <plugin>
@@ -348,6 +391,19 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- use mvn versions:display-dependency-updates versions:display-plugin-updates
-->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -393,15 +449,64 @@
 
     <profiles>
         <profile>
+            <!-- Used only when cutting a full release.  Configures the deploy plugin
to mark
+                each artifact as a release (especially important for the archetype). Signs
each
+                file deployed -->
+            <id>with-signing</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.4</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <properties>
+                <update-release-info>true</update-release-info>
+            </properties>
+        </profile>
+        <profile>
+            <!--  Only bind Javadoc JARs when the javadoc profile is active, since it
is slow. -->
+            <id>with-javadoc</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.9</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
             <id>with-live-tests</id>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>2.13</version>
+                        <version>2.15</version>
                         <inherited>true</inherited>
                         <configuration>
+                            <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
                             <includes>
                                 <include>**/*LiveTest.java</include>
                             </includes>
@@ -450,11 +555,13 @@
                                 <exlude>**/*.md</exlude>
                                 <exclude>NOTICE</exclude>
                                 <exclude>.git/**</exclude>
+                                <exclude>.repository/**</exclude>
                                 <exclude>.gitignore</exclude>
                                 <exclude>.idea/**</exclude>
                                 <exclude>**/*.iml</exclude>
                                 <exclude>**/*.project</exclude>
                                 <exclude>**/*.classpath</exclude>
+                                <exclude>**/*.prefs</exclude>
                                 <exclude>**/id_rsa_test</exclude>
                                 <exclude>**/id_rsa_test.pub</exclude>
                                 <exclude>**/*.bpmn20.xml</exclude>

http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/631033a4/scripts/create_distribution.sh
----------------------------------------------------------------------
diff --git a/scripts/create_distribution.sh b/scripts/create_distribution.sh
index a0ec701..59504a7 100755
--- a/scripts/create_distribution.sh
+++ b/scripts/create_distribution.sh
@@ -18,3 +18,4 @@
 #
 
 mvn -DskipTests -DskipKarafTests -Pwith-assembly clean install
+

http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/631033a4/scripts/deploy.sh
----------------------------------------------------------------------
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
deleted file mode 100755
index d99406b..0000000
--- a/scripts/deploy.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-
-# utility script to automatically unzip and setup AWS credentails from Mavem for snapshot
builds
-if [ $# -ne 2 ]; then
-	echo "The script must take two parameters - the destination folder (must exist) and the
snapshot version you are trying to deploy."
-	exit 0
-fi
-rm -rf $1/provisionr
-archive=$(basename "../karaf/assembly/target/org.apache.provisionr-$2-SNAPSHOT.tar.gz") 
-cp karaf/assembly/target/$archive $1 && cd $1
-tar xvzf $archive && rm $archive
-mv "${archive%.*.*}" provisionr
-cd provisionr/
-for w in "secretKey" "accessKey"
-do
-        key=$(grep -E -m 1 -o "<.*amazon.*$w>(.*)</.*amazon.*$w>" ~/.m2/settings.xml
| sed -e 's,.*<*.>\([^<]*\)</.*>.*,\1,g')
-        sed -i -e "s/$w = .*$/$w = $key/g" ~/provisionr/system/org/apache/provisionr/provisionr-amazon/0.4.0-incubating-SNAPSHOT/provisionr-amazon-0.4.0-incubating-SNAPSHOT-defaults.cfg
-done

http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/631033a4/scripts/release.sh
----------------------------------------------------------------------
diff --git a/scripts/release.sh b/scripts/release.sh
index b1c7463..b068beb 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -24,7 +24,14 @@ mvn -Pwith-assembly release:clean release:prepare -DreleaseVersion=$RELEASE_VERS
     -Dtag=provisionr-$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION -DpushChanges=false
 
 mvn -Pwith-assembly clean release:perform -DconnectionUrl=scm:git:file://`pwd`/.git \
-    -Dtag=provisionr-$RELEASE_VERSION -Dgoals="package -DskipTests -DskipKarafTests" 
+    -Dtag=provisionr-$RELEASE_VERSION -Dgoals="package deploy -DskipTests"
 
-echo "Done. Please upload the artifact and git push && git push --tags"
+git checkout provisionr-$RELEASE_VERSION
+
+mvn -Pwith-assembly -DskipTests -DskipKarafTests clean package
+
+git checkout master
+
+echo "Done. Please upload the artifacts from karaf/assembly/target and call a vote"
+echo "If the vote is succesfull: git push && git push --tags"
 


Mime
View raw message