You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2019/06/29 22:11:19 UTC
[roller] branch roller-6.0.x updated: Prepare for rc 1
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a commit to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git
The following commit(s) were added to refs/heads/roller-6.0.x by this push:
new 605797d Prepare for rc 1
605797d is described below
commit 605797dab5d2142a81ee40780f96894d701adb43
Author: David M. Johnson <sn...@apache.org>
AuthorDate: Sat Jun 29 18:11:13 2019 -0400
Prepare for rc 1
---
app/pom.xml | 2 +-
assembly-release/pom.xml | 2 +-
assembly-release/sign-release.sh | 4 ++--
it-selenium/pom.xml | 2 +-
it-selenium/src/test/resources/roller-jettyrun.properties | 2 +-
pom.xml | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/pom.xml b/app/pom.xml
index e382560..36a421b 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>6.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
index 8cc413a..06a5986 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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh
index 9342a35..8f322dd 100755
--- a/assembly-release/sign-release.sh
+++ b/assembly-release/sign-release.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
-export rcstring=""
-export vstring="6.0.0-SNAPSHOT"
+export rcstring="-rc-1"
+export vstring="6.0.0"
# for rc releases we rename the release files
if [ rcstring != "" ]; then
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index b155983..8c35ff6 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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/it-selenium/src/test/resources/roller-jettyrun.properties b/it-selenium/src/test/resources/roller-jettyrun.properties
index e3fdd52..4fe3b10 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-6.0.0-SNAPSHOT/themes
+themes.dir=target/roller-selenium-tests-6.0.0/themes
# put work in work dir
search.index.dir =target/work/search-index
diff --git a/pom.xml b/pom.xml
index 8a91432..32fbc84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>6.0.0</version>
<packaging>pom</packaging>
<prerequisites>
@@ -47,7 +47,7 @@ limitations under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<derby.version>10.11.1.1</derby.version>
- <roller.version>6.0.0-SNAPSHOT</roller.version>
+ <roller.version>6.0.0</roller.version>
</properties>
<modules>