Merge branch 'roller-5.2.0' # Conflicts: # app/pom.xml # assembly-release/pom.xml # assembly-release/sign-release.sh # it-selenium/pom.xml # it-selenium/src/test/resources/roller-jettyrun.properties # pom.xml
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/40547d2f Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/40547d2f Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/40547d2f Branch: refs/heads/master Commit: 40547d2fd5f37657cc6b99fa6694130cb8129dc8 Parents: 947ddf3 30ca737 Author: Dave Johnson <[email protected]> Authored: Sat Sep 1 17:25:14 2018 -0400 Committer: Dave Johnson <[email protected]> Committed: Sat Sep 1 17:25:14 2018 -0400 ---------------------------------------------------------------------- app/pom.xml | 4 ++-- .../roller/planet/business/SingleThreadedFeedUpdaterTest.java | 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 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/app/pom.xml ---------------------------------------------------------------------- diff --cc app/pom.xml index 6d7df1c,ed8d4ad..44b7882 --- a/app/pom.xml +++ b/app/pom.xml @@@ -24,7 -24,7 +24,7 @@@ limitations under the License <parent> <groupId>org.apache.roller</groupId> <artifactId>roller-project</artifactId> - <version>5.3.0-SNAPSHOT</version> - <version>5.2.1</version> ++ <version>6.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/assembly-release/pom.xml ---------------------------------------------------------------------- diff --cc assembly-release/pom.xml index d7370f2,a041cb9..8cc413a --- a/assembly-release/pom.xml +++ b/assembly-release/pom.xml @@@ -22,7 -22,7 +22,7 @@@ <parent> <groupId>org.apache.roller</groupId> <artifactId>roller-project</artifactId> - <version>5.3.0-SNAPSHOT</version> - <version>5.2.1</version> ++ <version>6.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/assembly-release/sign-release.sh ---------------------------------------------------------------------- diff --cc assembly-release/sign-release.sh index 3ccc5d5,194121a..a36e210 --- a/assembly-release/sign-release.sh +++ b/assembly-release/sign-release.sh @@@ -1,7 -1,7 +1,7 @@@ #!/usr/bin/env bash -export rcstring="-rc-1" -export vstring="5.2.1" +export rcstring="" - export vstring="5.3.0" ++export vstring="6.0.0" # for rc releases we rename the release files if [ rcstring != "" ]; then http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/it-selenium/pom.xml ---------------------------------------------------------------------- diff --cc it-selenium/pom.xml index 6e21406,b699393..b155983 --- a/it-selenium/pom.xml +++ b/it-selenium/pom.xml @@@ -24,7 -24,7 +24,7 @@@ <parent> <groupId>org.apache.roller</groupId> <artifactId>roller-project</artifactId> - <version>5.3.0-SNAPSHOT</version> - <version>5.2.1</version> ++ <version>6.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/roller/blob/40547d2f/it-selenium/src/test/resources/roller-jettyrun.properties ---------------------------------------------------------------------- diff --cc it-selenium/src/test/resources/roller-jettyrun.properties index 9380aae,706dbae..e3fdd52 --- a/it-selenium/src/test/resources/roller-jettyrun.properties +++ b/it-selenium/src/test/resources/roller-jettyrun.properties @@@ -23,7 -23,7 +23,7 @@@ hibernate.transaction.factory_class=org passwds.encryption.enabled=false # use src copy of themes for read-only access - themes.dir=target/roller-selenium-tests-5.3.0-SNAPSHOT/themes -themes.dir=target/roller-selenium-tests-5.2.1/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/40547d2f/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 2919ae1,17695af..4e3d92f --- a/pom.xml +++ b/pom.xml @@@ -22,7 -22,7 +22,7 @@@ limitations under the License <modelVersion>4.0.0</modelVersion> <groupId>org.apache.roller</groupId> <artifactId>roller-project</artifactId> - <version>5.3.0-SNAPSHOT</version> - <version>5.2.1</version> ++ <version>6.0.0-SNAPSHOT</version> <packaging>pom</packaging> <prerequisites> @@@ -47,7 -47,7 +47,7 @@@ <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.3.0-SNAPSHOT</roller.version> - <roller.version>5.2.1</roller.version> ++ <roller.version>6.0.0-SNAPSHOT</roller.version> </properties> <modules>
