Preparing for rc-4.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/7105bb6a Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/7105bb6a Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/7105bb6a Branch: refs/heads/master Commit: 7105bb6a9f553cb57130f1e4457dfd710ed5c20e Parents: 7ddbff1 Author: Dave Johnson <[email protected]> Authored: Sat Oct 14 15:44:57 2017 -0400 Committer: Dave Johnson <[email protected]> Committed: Sat Oct 14 15:44:57 2017 -0400 ---------------------------------------------------------------------- assembly-release/sign-release.sh | 8 ++++---- assembly-release/src/main/assembly/source.xml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/7105bb6a/assembly-release/sign-release.sh ---------------------------------------------------------------------- diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh index 16502e5..a0b3aa6 100755 --- a/assembly-release/sign-release.sh +++ b/assembly-release/sign-release.sh @@ -11,8 +11,8 @@ if [ rcstring != "" ]; then mv target/roller-release-${vstring}-standard.zip target/roller-release-${vstring}${rcstring}-standard.zip fi -gpg --armor --detach-sig target/roller-release-${vstring}${rcstring}-standard.tar.gz -gpg --armor --detach-sig target/roller-release-${vstring}${rcstring}-standard.zip -gpg --armor --detach-sig target/roller-release-${vstring}${rcstring}-source.tar.gz -gpg --armor --detach-sig target/roller-release-${vstring}${rcstring}-source.zip +gpg --armor --detach-sig target/roller-release-${vstring}${rcstring}-standard.tar.gz \ +target/roller-release-${vstring}${rcstring}-standard.zip \ +target/roller-release-${vstring}${rcstring}-source.tar.gz \ +target/roller-release-${vstring}${rcstring}-source.zip http://git-wip-us.apache.org/repos/asf/roller/blob/7105bb6a/assembly-release/src/main/assembly/source.xml ---------------------------------------------------------------------- diff --git a/assembly-release/src/main/assembly/source.xml b/assembly-release/src/main/assembly/source.xml index 6b6b1a5..ea36aeb 100644 --- a/assembly-release/src/main/assembly/source.xml +++ b/assembly-release/src/main/assembly/source.xml @@ -30,10 +30,10 @@ </outputDirectory> <directory>${project.basedir}/../</directory> <includes> - <include>app</include> - <include>assembly-release</include> - <include>docs</include> - <include>it-selenium</include> + <include>app/**</include> + <include>assembly-release/**</include> + <include>docs/**</include> + <include>it-selenium/**</include> <include>LICENSE.txt</include> <include>NOTICE.txt</include> <include>pom.xml</include> @@ -41,14 +41,14 @@ </includes> <excludes> <exclude>**/target/**</exclude> - <exclude>**/derby.log</exclude> <exclude>**/.idea/**</exclude> - <exclude>**/._*</exclude> - <exclude>**/._*/**</exclude> + <exclude>**/.settings/**</exclude> <exclude>**/.repository/**</exclude> + <exclude>**/.git</exclude> <exclude>**/.classpath</exclude> <exclude>**/.project</exclude> - <exclude>**/.settings/**</exclude> + <exclude>**/*.log</exclude> + <exclude>**/*.iml</exclude> </excludes> </fileSet> </fileSets>
