This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch roller-5.2.x in repository https://gitbox.apache.org/repos/asf/roller.git
The following commit(s) were added to refs/heads/roller-5.2.x by this push: new 48f60a5 [ROL-2127] add upgrade to allowed action names for Install action and prepare for 5.2.3 release 48f60a5 is described below commit 48f60a565b367ab334cecb04ad53e802f95e97e8 Author: Dave Johnson <snoopd...@gmail.com> AuthorDate: Sat Jan 19 10:33:33 2019 -0500 [ROL-2127] add upgrade to allowed action names for Install action and prepare for 5.2.3 release --- app/pom.xml | 2 +- app/src/main/resources/struts.xml | 1 + assembly-release/pom.xml | 2 +- assembly-release/sign-release.sh | 2 +- pom.xml | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/pom.xml b/app/pom.xml index 10115f3..e6357bd 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.2</version> + <version>5.2.3</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/app/src/main/resources/struts.xml b/app/src/main/resources/struts.xml index 3c9a4c6..a910901 100644 --- a/app/src/main/resources/struts.xml +++ b/app/src/main/resources/struts.xml @@ -155,6 +155,7 @@ execute, create, update, + upgrade, bootstrap </global-allowed-methods> diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml index 79e785b..7b6f7c7 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.2</version> + <version>5.2.3</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh index 7c6f2b5..d32d8ab 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.2" +export vstring="5.2.3" # for rc releases we rename the release files if [ rcstring != "" ]; then diff --git a/pom.xml b/pom.xml index 06e654e..1add2fd 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.2</version> + <version>5.2.3</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.2</roller.version> + <roller.version>5.2.3</roller.version> </properties> <modules>