Repository: roller Updated Branches: refs/heads/master 349276aa5 -> 25a9bc7fb
Prepare for Roller 5..2.0 release. Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/d80b7287 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/d80b7287 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/d80b7287 Branch: refs/heads/master Commit: d80b7287f8fc6c1aec6b14264154bfc3b9d8fbb3 Parents: 349276a Author: Dave Johnson <[email protected]> Authored: Fri Jul 21 18:11:20 2017 -0400 Committer: Dave Johnson <[email protected]> Committed: Fri Jul 21 18:11:20 2017 -0400 ---------------------------------------------------------------------- app/pom.xml | 2 +- assembly-release/pom.xml | 2 +- assembly-release/sign-release.sh | 12 +++++++++++- docs/roller-install-guide.odt | Bin 1623069 -> 1618019 bytes docs/roller-template-guide.odt | Bin 245040 -> 238805 bytes docs/roller-user-guide.odt | Bin 2744390 -> 2740075 bytes it-selenium/pom.xml | 2 +- .../test/resources/roller-jettyrun.properties | 2 +- pom.xml | 2 +- 9 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/d80b7287/app/pom.xml ---------------------------------------------------------------------- diff --git a/app/pom.xml b/app/pom.xml index eec883a..5efdd48 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.apache.roller</groupId> <artifactId>roller-project</artifactId> - <version>5.2.0-SNAPSHOT</version> + <version>5.2.0</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/roller/blob/d80b7287/assembly-release/pom.xml ---------------------------------------------------------------------- diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml index 5d4281a..9bb592b 100644 --- a/assembly-release/pom.xml +++ b/assembly-release/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.roller</groupId> <artifactId>roller-project</artifactId> - <version>5.2.0-SNAPSHOT</version> + <version>5.2.0</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/roller/blob/d80b7287/assembly-release/sign-release.sh ---------------------------------------------------------------------- diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh old mode 100644 new mode 100755 index a385590..7b6d9e2 --- a/assembly-release/sign-release.sh +++ b/assembly-release/sign-release.sh @@ -1,6 +1,16 @@ -export rcstring="" +#!/usr/bin/env bash + +export rcstring="-rc-1" export vstring="5.2.0" +# for rc releases we rename the release files +if [ rcstring != "" ]; then + mv target/roller-release-${vstring}-source.tar.gz target/roller-release-${vstring}${rcstring}-source.tar.gz + mv target/roller-release-${vstring}-source.zip target/roller-release-${vstring}${rcstring}-source.zip + mv target/roller-release-${vstring}-standard.tar.gz target/roller-release-${vstring}${rcstring}-standard.tar.gz + 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 http://git-wip-us.apache.org/repos/asf/roller/blob/d80b7287/docs/roller-install-guide.odt ---------------------------------------------------------------------- diff --git a/docs/roller-install-guide.odt b/docs/roller-install-guide.odt index 608c279..39054c4 100644 Binary files a/docs/roller-install-guide.odt and b/docs/roller-install-guide.odt differ http://git-wip-us.apache.org/repos/asf/roller/blob/d80b7287/docs/roller-template-guide.odt ---------------------------------------------------------------------- diff --git a/docs/roller-template-guide.odt b/docs/roller-template-guide.odt index 2f89f0a..56d8158 100644 Binary files a/docs/roller-template-guide.odt and b/docs/roller-template-guide.odt differ http://git-wip-us.apache.org/repos/asf/roller/blob/d80b7287/docs/roller-user-guide.odt ---------------------------------------------------------------------- diff --git a/docs/roller-user-guide.odt b/docs/roller-user-guide.odt index b323775..1bf7d45 100644 Binary files a/docs/roller-user-guide.odt and b/docs/roller-user-guide.odt differ http://git-wip-us.apache.org/repos/asf/roller/blob/d80b7287/it-selenium/pom.xml ---------------------------------------------------------------------- diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml index f4f28d2..2c98d58 100644 --- a/it-selenium/pom.xml +++ b/it-selenium/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.roller</groupId> <artifactId>roller-project</artifactId> - <version>5.2.0-SNAPSHOT</version> + <version>5.2.0</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/roller/blob/d80b7287/it-selenium/src/test/resources/roller-jettyrun.properties ---------------------------------------------------------------------- diff --git a/it-selenium/src/test/resources/roller-jettyrun.properties b/it-selenium/src/test/resources/roller-jettyrun.properties index 771de23..643e0c5 100644 --- a/it-selenium/src/test/resources/roller-jettyrun.properties +++ b/it-selenium/src/test/resources/roller-jettyrun.properties @@ -23,7 +23,7 @@ hibernate.transaction.factory_class=org.hibernate.transaction.JDBCTransactionFac passwds.encryption.enabled=false # use src copy of themes for read-only access -themes.dir=target/roller-selenium-tests-5.2.0-SNAPSHOT/themes +themes.dir=target/roller-selenium-tests-5.2.0/themes # put work in work dir search.index.dir =target/work/search-index http://git-wip-us.apache.org/repos/asf/roller/blob/d80b7287/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 475ec4e..5334269 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.roller</groupId> <artifactId>roller-project</artifactId> - <version>5.2.0-SNAPSHOT</version> + <version>5.2.0</version> <packaging>pom</packaging> <prerequisites>
