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 2018/03/13 12:42:18 UTC
roller git commit: Set version in Bootstrap branch to 6.0.0-SNAPSHOT
Repository: roller
Updated Branches:
refs/heads/bootstrap-ui ff31349e5 -> f8ee9d7f2
Set version in Bootstrap branch to 6.0.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/f8ee9d7f
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/f8ee9d7f
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/f8ee9d7f
Branch: refs/heads/bootstrap-ui
Commit: f8ee9d7f2116f45cbfef8be25e9b2ecba40ec108
Parents: ff31349
Author: Dave Johnson <sn...@gmail.com>
Authored: Tue Mar 13 08:42:14 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Tue Mar 13 08:42:14 2018 -0400
----------------------------------------------------------------------
app/pom.xml | 2 +-
assembly-release/pom.xml | 2 +-
assembly-release/sign-release.sh | 2 +-
it-selenium/pom.xml | 2 +-
it-selenium/src/test/resources/roller-jettyrun.properties | 2 +-
pom.xml | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/f8ee9d7f/app/pom.xml
----------------------------------------------------------------------
diff --git a/app/pom.xml b/app/pom.xml
index bac2f4e..bad3b5d 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>5.2.0</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/f8ee9d7f/assembly-release/pom.xml
----------------------------------------------------------------------
diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
index 77dac0d..8cc413a 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</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/f8ee9d7f/assembly-release/sign-release.sh
----------------------------------------------------------------------
diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh
index 77fdd59..c2a3873 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="5.2.0"
+export vstring="6.0.0-SNAPSHOT"
# for rc releases we rename the release files
if [ rcstring != "" ]; then
http://git-wip-us.apache.org/repos/asf/roller/blob/f8ee9d7f/it-selenium/pom.xml
----------------------------------------------------------------------
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index 2854584..b155983 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</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/f8ee9d7f/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 643e0c5..e3fdd52 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/themes
+themes.dir=target/roller-selenium-tests-6.0.0-SNAPSHOT/themes
# put work in work dir
search.index.dir =target/work/search-index
http://git-wip-us.apache.org/repos/asf/roller/blob/f8ee9d7f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 408d530..4e3d92f 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>5.2.0</version>
+ <version>6.0.0-SNAPSHOT</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>5.2.0</roller.version>
+ <roller.version>6.0.0-SNAPSHOT</roller.version>
</properties>
<modules>