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 2020/08/22 22:09:17 UTC
[roller] branch master updated (93c7526 -> 3f62d2c)
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git.
from 93c7526 Merge pull request #65 from apache/banned-words
add b610398 Removed notice for build time dependencies downloaded via Maven Refer https://markmail.org/message/o4fagzrjhbuqt2ce
add bd164d6 Implemented: validation using the jquery validation plugin (ROL-2156) Used validation on the Create weblog page
add 46abbd7 Implemented: logic to apply email validations (ROL-2156) Added method to apply regular expression and added rules to validate email Added error message with internationalised text instead of hard coded text Removed existing custom code to validate inputs
new 7ef338a Merge branch 'roller-6.0.x'
new 3f62d2c Merging 6.0.x into master.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
app/pom.xml | 2 +-
assembly-release/pom.xml | 2 +-
it-selenium/pom.xml | 2 +-
pom.xml | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
[roller] 01/02: Merge branch 'roller-6.0.x'
Posted by sn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
commit 7ef338af97f26404cc4be9be3edacf637ad90296
Merge: 93c7526 46abbd7
Author: David M. Johnson <sn...@apache.org>
AuthorDate: Sat Aug 22 18:04:59 2020 -0400
Merge branch 'roller-6.0.x'
[roller] 02/02: Merging 6.0.x into master.
Posted by sn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
commit 3f62d2c820fe5ff3677be3ae2b680d906339fc60
Author: David M. Johnson <sn...@apache.org>
AuthorDate: Sat Aug 22 18:09:01 2020 -0400
Merging 6.0.x into master.
---
app/pom.xml | 2 +-
assembly-release/pom.xml | 2 +-
it-selenium/pom.xml | 2 +-
pom.xml | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/pom.xml b/app/pom.xml
index dc813e2..3f9fde5 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.2-SNAPSHOT</version>
+ <version>6.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
index e84530c..a72bf95 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.2-SNAPSHOT</version>
+ <version>6.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index ea92031..7aee7f1 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.2-SNAPSHOT</version>
+ <version>6.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 62970bb..cd3db9b 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.2-SNAPSHOT</version>
+ <version>6.1.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>6.0.2-SNAPSHOT</roller.version>
+ <roller.version>6.1.0-SNAPSHOT</roller.version>
</properties>
<modules>