(jspwiki) branch master updated (e40b065bf -> 7d1b0754e)

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

alexoree pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


    from e40b065bf Merge pull request #412 from spyhunter99/bug/JSPWIKI-1216
     add 784d30488 JSPWIKI-1183 applies the suggestion change and patch file as submitted
     add 4523bfbdc JSPWIKI-1183 switches to commons-net to keep inline with apache guidance
     add 72a33aa27 JSPWIKI-1217 should resolve the maven parallel build failure on the ci server.
     add c22370070 JSPWIKI-1183 potential fix for the rss generator test failure when running in parallel
     add 471b66704 JSPWIKI-1183 potential fix for the rss generator test failure when running in parallel. adds JDK25 check for security manager related behavior change
     add ebffd26d1 JSPWIKI-1183 potential fix for the rss generator test failure when running in parallel. adds JDK25 check for security manager related behavior change
     add 1b963fcf7 temporarily turn on unit test output to diagnosis ci failures
     add d006fc706 temporarily turn on unit test output to diagnosis ci failures
     add 10b8a8be1 temporarily turn on unit test output to diagnosis ci failures
     add 575d8ede3 Merge branch 'master' into feature/JSPWIKI-1183-if-with-ip-check
     add a31f8b817 Merge branch 'master' into feature/JSPWIKI-1183-if-with-ip-check
     add 7d1b0754e Merge pull request #410 from spyhunter99/feature/JSPWIKI-1183-if-with-ip-check

No new revisions were added by this update.

Summary of changes:
 jspwiki-main/pom.xml                               |  3 ++
 .../wiki/auth/authorize/XMLGroupDatabase.java      |  7 ++-
 .../org/apache/wiki/auth/user/XMLUserDatabase.java |  9 ++--
 .../main/java/org/apache/wiki/plugin/IfPlugin.java | 18 +++----
 .../wiki/auth/authorize/XMLGroupDatabaseTest.java  | 63 ++++++++++++++--------
 .../wiki/auth/permissions/GroupPermissionTest.java |  8 +++
 .../java/org/apache/wiki/plugin/GroupsTest.java    |  2 +-
 .../java/org/apache/wiki/plugin/IfPluginTest.java  | 36 +++++++++++++
 .../java/org/apache/wiki/rss/RSSGeneratorTest.java | 13 +++--
 jspwiki-util/pom.xml                               |  7 ++-
 .../main/java/org/apache/wiki/util/HttpUtil.java   | 33 ++++++++++--
 pom.xml                                            | 10 +++-
 12 files changed, 161 insertions(+), 48 deletions(-)